diff --git a/go.mod b/go.mod index cf1e70398f3..bd4e66ecc03 100644 --- a/go.mod +++ b/go.mod @@ -89,7 +89,7 @@ require ( k8s.io/cluster-bootstrap v0.19.3 k8s.io/cri-api v0.22.17 moul.io/http2curl/v2 v2.3.0 - yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240412120252-eff82b109a8f + yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240414044505-f2da647a5300 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401 yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91 diff --git a/go.sum b/go.sum index b53e6a45ae4..5a29f4d858d 100644 --- a/go.sum +++ b/go.sum @@ -1210,8 +1210,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.20240412120252-eff82b109a8f h1:VTIcXWZ3O4iVI+9NLUo7vPb9MlH6FRUB42pIsHqnkS4= -yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240412120252-eff82b109a8f/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240414044505-f2da647a5300 h1:+Enkr8vGwKTKWtWlxMheWCXZDBMJ/b9BZ0uGURQtRH8= +yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240414044505-f2da647a5300/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug= yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/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 ce1164dc006..21ed883b114 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1476,7 +1476,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.20240412120252-eff82b109a8f +# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240414044505-f2da647a5300 ## 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/esxi/manager.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go index 41cca1243ed..853084c071a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/manager.go @@ -459,14 +459,14 @@ func (cli *SESXiClient) SearchTemplateVM(id string) (*SVirtualMachine, error) { var movms []mo.VirtualMachine err := cli.scanMObjectsWithFilter(cli.client.ServiceContent.RootFolder, VIRTUAL_MACHINE_PROPS, &movms, filter) if err != nil { - return nil, err + return nil, errors.Wrapf(err, "scanMObjectsWithFilter") } if len(movms) == 0 { - return nil, errors.ErrNotFound + return nil, errors.Wrapf(errors.ErrNotFound, "empty templates") } vm := NewVirtualMachine(cli, &movms[0], nil) if !vm.IsTemplate() { - return nil, errors.ErrNotFound + return nil, errors.Wrapf(errors.ErrNotFound, "%s is not template", vm.GetName()) } dc, err := vm.fetchDatacenter() if err != nil { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/wire.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/wire.go index 916f9a8fd81..cf53526869e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/wire.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ksyun/wire.go @@ -68,13 +68,12 @@ func (wire *SWire) GetINetworks() ([]cloudprovider.ICloudNetwork, error) { if err != nil { return nil, errors.Wrap(err, "GetNetworks") } - inetworks := []cloudprovider.ICloudNetwork{} + ret := []cloudprovider.ICloudNetwork{} for i := 0; i < len(networks); i++ { - if networks[i].AvailabilityZoneName == wire.zone.GetName() { - inetworks = append(inetworks, &networks[i]) - } + networks[i].wire = wire + ret = append(ret, &networks[i]) } - return inetworks, nil + return ret, nil } func (wire *SWire) GetBandwidth() int {