From 66753ce8e432422a0fe775b3c1add487b577bf55 Mon Sep 17 00:00:00 2001 From: mhf Date: Wed, 21 Dec 2022 16:05:49 +0800 Subject: [PATCH] fix(region): fixModelartsCidrDiffBetweenHuaweiAndHCSO --- go.mod | 2 +- go.sum | 4 ++-- pkg/compute/models/modelarts_pools.go | 3 --- vendor/modules.txt | 2 +- vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/modelarts.go | 3 +++ .../x/cloudmux/pkg/multicloud/huawei/modelarts_pool.go | 3 +++ 6 files changed, 10 insertions(+), 7 deletions(-) diff --git a/go.mod b/go.mod index efd9f45b77..ebe6cb5417 100644 --- a/go.mod +++ b/go.mod @@ -84,7 +84,7 @@ require ( k8s.io/client-go v0.19.3 k8s.io/cluster-bootstrap v0.19.3 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221219062801-7d65989751c3 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221221074003-215a6ca48a2a yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd yunion.io/x/log v1.0.0 diff --git a/go.sum b/go.sum index 5943296136..b9b09e8ede 100644 --- a/go.sum +++ b/go.sum @@ -1176,8 +1176,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q= sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221219062801-7d65989751c3 h1:cZ+qHIlkzHsRtoXL3DZsLEjyE09+sAGPfPH+gQwOvHA= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221219062801-7d65989751c3/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221221074003-215a6ca48a2a h1:Bb9jP8uWbWDpJBLbHnT/6QPE/wGE1HgfriCrsfxr6V8= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221221074003-215a6ca48a2a/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII= yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws= yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634= diff --git a/pkg/compute/models/modelarts_pools.go b/pkg/compute/models/modelarts_pools.go index cc1b82c2c2..00c94394d3 100644 --- a/pkg/compute/models/modelarts_pools.go +++ b/pkg/compute/models/modelarts_pools.go @@ -158,9 +158,6 @@ func (man *SModelartsPoolManager) ValidateCreateData(ctx context.Context, userCr if input.NodeCount > 200 { return input, errors.Wrap(errors.ErrNotSupported, "node count must between 1 and 200") } - if len(input.Cidr) == 0 { - input.Cidr = "192.168.128.0/17" - } _, err = netutils.NewIPV4Prefix(input.Cidr) if err != nil { return input, httperrors.NewInputParameterError("invalid cidr: %s", input.Cidr) diff --git a/vendor/modules.txt b/vendor/modules.txt index 8f7a1c3a8d..979a56cfa8 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1439,7 +1439,7 @@ sigs.k8s.io/structured-merge-diff/v4/value # sigs.k8s.io/yaml v1.2.0 ## explicit; go 1.12 sigs.k8s.io/yaml -# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221219062801-7d65989751c3 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221221074003-215a6ca48a2a ## explicit; go 1.18 yunion.io/x/cloudmux/pkg/apis yunion.io/x/cloudmux/pkg/apis/billing diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/modelarts.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/modelarts.go index 91056b8060..ef47feac45 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/modelarts.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/modelarts.go @@ -131,6 +131,9 @@ func (self *SRegion) GetIModelartsPools() ([]cloudprovider.ICloudModelartsPool, } func (self *SRegion) CreateIModelartsPool(args *cloudprovider.ModelartsPoolCreateOption) (cloudprovider.ICloudModelartsPool, error) { + if len(args.Cidr) == 0 { + args.Cidr = "192.168.128.0/17" + } netObj, err := self.client.modelartsPoolNetworkList(nil) if err != nil { return nil, errors.Wrap(err, "SHuaweiClient.GetPools") diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/modelarts_pool.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/modelarts_pool.go index 8757108cba..e5d4b3b316 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/modelarts_pool.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/modelarts_pool.go @@ -130,6 +130,9 @@ func (self *SRegion) GetIModelartsPools() ([]cloudprovider.ICloudModelartsPool, } func (self *SRegion) CreateIModelartsPool(args *cloudprovider.ModelartsPoolCreateOption) (cloudprovider.ICloudModelartsPool, error) { + if len(args.Cidr) == 0 { + args.Cidr = "192.168.20.0/24" + } netObj, err := self.client.modelartsPoolNetworkList("network", nil) if err != nil { return nil, errors.Wrap(err, "SHuaweiClient.GetPools")