diff --git a/go.mod b/go.mod index cb45391185..ef5bf21fe1 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.20221201121456-cf1db7634925 + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102319-7ea7ddff6228 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 ee127ff6b1..4ddb176572 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.20221201121456-cf1db7634925 h1:Su0puwQV2d/SBAdGz4MfY6NcQR6wXfo2Nwf0m+hC294= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221201121456-cf1db7634925/go.mod h1:drc/WDD65r6wI1tSejk19xcl9QwmzZlgJGXN7a9o2KQ= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102319-7ea7ddff6228 h1:5PmTGq8z707bk0GLSOnCqfrfSVufuENRJybcVS6ZJ30= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102319-7ea7ddff6228/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/vendor/modules.txt b/vendor/modules.txt index 2073153584..dec52dc8af 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.20221201121456-cf1db7634925 +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20221206102319-7ea7ddff6228 ## 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/apis/compute/cloudaccount_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go index 898aa09fd4..36e338376d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go +++ b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/cloudaccount_const.go @@ -26,6 +26,7 @@ const ( CLOUD_PROVIDER_HUAWEI = "Huawei" CLOUD_PROVIDER_HCSO = "HCSO" CLOUD_PROVIDER_HCS = "HCS" + CLOUD_PROVIDER_HCSOP = "HCSOP" CLOUD_PROVIDER_OPENSTACK = "OpenStack" CLOUD_PROVIDER_UCLOUD = "Ucloud" CLOUD_PROVIDER_ZSTACK = "ZStack" diff --git a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/guest_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/guest_const.go index c736cf727a..7e6b67ce4f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/guest_const.go +++ b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/guest_const.go @@ -57,6 +57,7 @@ const ( HYPERVISOR_AWS = "aws" HYPERVISOR_HUAWEI = "huawei" HYPERVISOR_HCS = "hcs" + HYPERVISOR_HCSOP = "hcsop" HYPERVISOR_HCSO = "hcso" HYPERVISOR_OPENSTACK = "openstack" HYPERVISOR_UCLOUD = "ucloud" diff --git a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/host_const.go b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/host_const.go index 49e014ad3e..c310549600 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/apis/compute/host_const.go +++ b/vendor/yunion.io/x/cloudmux/pkg/apis/compute/host_const.go @@ -25,6 +25,7 @@ const ( HOST_TYPE_HUAWEI = "huawei" HOST_TYPE_HCSO = "hcso" HOST_TYPE_HCS = "hcs" + HOST_TYPE_HCSOP = "hcsop" HOST_TYPE_OPENSTACK = "openstack" HOST_TYPE_UCLOUD = "ucloud" HOST_TYPE_ZSTACK = "zstack" diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/saml_provider.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/saml_provider.go index b424b8cf9c..0050d82376 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/saml_provider.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/saml_provider.go @@ -246,12 +246,12 @@ func (self *SHuaweiClient) CreateSAMLProvider(opts *cloudprovider.SAMLProviderCr if err != nil { return nil, errors.Wrapf(err, "saml provider create") } - ret := SAMLProvider{client: self, Id: opts.Name} - err = self.UpdateSAMLProviderMetadata(opts.Name, opts.Metadata.String()) + ret := SAMLProvider{client: self, Id: samlName} + err = self.UpdateSAMLProviderMetadata(samlName, opts.Metadata.String()) if err != nil { return nil, errors.Wrapf(err, "resp.Unmarshal") } - err = self.InitSAMLProviderMapping(opts.Name) + err = self.InitSAMLProviderMapping(samlName) if err != nil { return nil, errors.Wrapf(err, "InitSAMLProviderMapping") } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go index 83d388550e..8c63d1be93 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go @@ -43,6 +43,7 @@ type SHost struct { StorageType string AttachStorageTypes []string + Wires []SWire } func (self *SHost) CreateVM(desc *cloudprovider.SManagedVMCreateConfig) (cloudprovider.ICloudVM, error) { @@ -189,5 +190,9 @@ func (self *SHost) GetIVMById(id string) (cloudprovider.ICloudVM, error) { } func (self *SHost) GetIWires() ([]cloudprovider.ICloudWire, error) { - return nil, cloudprovider.ErrNotImplemented + wires := make([]cloudprovider.ICloudWire, len(self.Wires)) + for i := 0; i < len(self.Wires); i++ { + wires[i] = &self.Wires[i] + } + return wires, nil }