diff --git a/pkg/compute/service/service.go b/pkg/compute/service/service.go index 8f4f46834a..f59d448f19 100644 --- a/pkg/compute/service/service.go +++ b/pkg/compute/service/service.go @@ -14,6 +14,7 @@ import ( _ "yunion.io/x/onecloud/pkg/util/aliyun/provider" _ "yunion.io/x/onecloud/pkg/util/azure/provider" _ "yunion.io/x/onecloud/pkg/util/esxi/provider" + _ "yunion.io/x/onecloud/pkg/util/aws/provider" "yunion.io/x/onecloud/pkg/cloudcommon" "yunion.io/x/onecloud/pkg/cloudcommon/cronman" diff --git a/pkg/util/aws/disk.go b/pkg/util/aws/disk.go index 1289f6a6eb..0f607dea09 100644 --- a/pkg/util/aws/disk.go +++ b/pkg/util/aws/disk.go @@ -53,7 +53,6 @@ type SDisk struct { ExpiredTime time.Time ImageId string MountInstances SMountInstances - OperationLocks SOperationLocks Portable bool ProductCode string ResourceGroupId string diff --git a/pkg/util/aws/instancenic.go b/pkg/util/aws/instancenic.go index f10262fea2..c9fa061745 100644 --- a/pkg/util/aws/instancenic.go +++ b/pkg/util/aws/instancenic.go @@ -24,14 +24,14 @@ func (self *SInstanceNic) GetDriver() string { } func (self *SInstanceNic) GetINetwork() cloudprovider.ICloudNetwork { - vswitchId := self.instance.VpcAttributes.VSwitchId + networkId := self.instance.VpcAttributes.NetworkId wires, err := self.instance.host.GetIWires() if err != nil { return nil } for i := 0; i < len(wires); i += 1 { wire := wires[i].(*SWire) - net := wire.getNetworkById(vswitchId) + net := wire.getNetworkById(networkId) if net != nil { return net }