添加interface接口

pkg/util/aliyun/disk.go

@@ -54,6 +54,16 @@ type SDisk struct {
 	ZoneId                        string
 }
 
+func (self *SDisk) GetMetadata() *jsonutils.JSONDict {
+	data := jsonutils.NewDict()
+
+	// The pricingInfo key structure is 'RegionId::DiskCategory::DiskType
+	priceKey := fmt.Sprintf("%s::%s::%s", self.RegionId, self.Category, self.Type)
+	data.Add(jsonutils.NewString(priceKey), "price_key")
+
+	return data
+}
+
 func (self *SRegion) GetDisks(instanceId string, zoneId string, category string, diskIds []string, offset int, limit int) ([]SDisk, int, error) {
 	if limit > 50 || limit <= 0 {
 		limit = 50

pkg/util/aliyun/host.go

@@ -19,6 +19,10 @@ type SHost struct {
 	zone *SZone
 }
 
+func (self *SHost) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SHost) GetIWires() ([]cloudprovider.ICloudWire, error) {
 	return self.zone.GetIWires()
 }

pkg/util/aliyun/image.go

@@ -55,6 +55,10 @@ type SImage struct {
 	Usage                string
 }
 
+func (self *SImage) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SImage) GetId() string {
 	return self.ImageId
 }

pkg/util/aliyun/instance.go

@@ -3,6 +3,7 @@ package aliyun
 import (
 	"fmt"
 	"time"
+
 	"yunion.io/x/onecloud/pkg/util/seclib2"
 
 	"yunion.io/x/jsonutils"
@@ -164,6 +165,20 @@ func (self *SRegion) GetInstances(zoneId string, ids []string, offset int, limit
 	return instances, int(total), nil
 }
 
+func (self *SInstance) GetMetadata() *jsonutils.JSONDict {
+	data := jsonutils.NewDict()
+
+	// The pricingInfo key structure is 'RegionId::InstanceType::NetworkType::OSType::IoOptimized'
+	optimized := "optimized"
+	if !self.IoOptimized {
+		optimized = "none"
+	}
+	priceKey := fmt.Sprintf("%s::%s::%s::%s::%s", self.RegionId, self.InstanceType, self.InstanceNetworkType, self.OSType, optimized)
+	data.Add(jsonutils.NewString(priceKey), "price_key")
+
+	return data
+}
+
 func (self *SInstance) GetCreateTime() time.Time {
 	return self.CreationTime
 }

pkg/util/aliyun/region.go

@@ -36,6 +36,10 @@ func (self *SRegion) GetClient() *SAliyunClient {
 	return self.client
 }
 
+func (self *SRegion) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SRegion) getEcsClient() (*sdk.Client, error) {
 	if self.ecsClient == nil {
 		cli, err := sdk.NewClientWithAccessKey(self.RegionId, self.client.accessKey, self.client.secret)

pkg/util/aliyun/securitygroup.go

@@ -77,6 +77,10 @@ func (v PermissionSet) Less(i, j int) bool {
 	return false
 }
 
+func (self *SSecurityGroup) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SSecurityGroup) GetId() string {
 	return self.SecurityGroupId
 }

pkg/util/aliyun/storage.go

@@ -15,6 +15,10 @@ type SStorage struct {
 	storageType string
 }
 
+func (self *SStorage) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SStorage) GetId() string {
 	return fmt.Sprintf("%s-%s-%s", self.zone.region.client.providerId, self.zone.GetId(), self.storageType)
 }

pkg/util/aliyun/storagecache.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 	"time"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/compute/options"
@@ -19,6 +20,10 @@ type SStoragecache struct {
 	iimages []cloudprovider.ICloudImage
 }
 
+func (self *SStoragecache) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SStoragecache) GetId() string {
 	return fmt.Sprintf("%s-%s", self.region.client.providerId, self.region.GetId())
 }

pkg/util/aliyun/vpc.go

@@ -45,6 +45,10 @@ type SVpc struct {
 	VpcName      string
 }
 
+func (self *SVpc) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SVpc) GetId() string {
 	return self.VpcId
 }

pkg/util/aliyun/vswitch.go

@@ -34,6 +34,10 @@ type SVSwitch struct {
 	ZoneId                  string
 }
 
+func (self *SVSwitch) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SVSwitch) GetId() string {
 	return self.VSwitchId
 }

pkg/util/aliyun/wire.go

@@ -3,6 +3,7 @@ package aliyun
 import (
 	"fmt"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 )
@@ -14,6 +15,10 @@ type SWire struct {
 	inetworks []cloudprovider.ICloudNetwork
 }
 
+func (self *SWire) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SWire) GetId() string {
 	return fmt.Sprintf("%s-%s", self.vpc.GetId(), self.zone.GetId())
 }

pkg/util/aliyun/zone.go

@@ -3,6 +3,7 @@ package aliyun
 import (
 	"fmt"
 
+	"yunion.io/x/jsonutils"
 	"yunion.io/x/log"
 	"yunion.io/x/onecloud/pkg/cloudprovider"
 	"yunion.io/x/onecloud/pkg/compute/models"
@@ -111,6 +112,10 @@ type SZone struct {
 	AvailableDedicatedHostTypes SDedicatedHostTypes
 }
 
+func (self *SZone) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SZone) GetId() string {
 	return self.ZoneId
 }

pkg/util/esxi/host.go

@@ -68,6 +68,10 @@ func NewHost(manager *SESXiClient, host *mo.HostSystem, dc *SDatacenter) *SHost
 	return &SHost{SManagedObject: newManagedObject(manager, host, dc)}
 }
 
+func (self *SHost) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SHost) getHostSystem() *mo.HostSystem {
 	return self.object.(*mo.HostSystem)
 }

pkg/util/esxi/storage.go

@@ -18,6 +18,10 @@ func NewDatastore(manager *SESXiClient, ds *mo.Datastore, dc *SDatacenter) *SDat
 	return &SDatastore{SManagedObject: newManagedObject(manager, ds, dc)}
 }
 
+func (self *SDatastore) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SDatastore) getDatastore() *mo.Datastore {
 	return self.object.(*mo.Datastore)
 }
@@ -89,4 +93,4 @@ func (self *SDatastore) GetManagerId() string {
 
 func (self *SDatastore) CreateIDisk(name string, sizeGb int, desc string) (cloudprovider.ICloudDisk, error) {
 	return nil, cloudprovider.ErrNotImplemented
-}
+}

pkg/util/esxi/virtualmachine.go

@@ -27,6 +27,10 @@ func NewVirtualMachine(manager *SESXiClient, vm *mo.VirtualMachine, dc *SDatacen
 	return &SVirtualMachine{SManagedObject: newManagedObject(manager, vm, dc), host: host}
 }
 
+func (self *SVirtualMachine) GetMetadata() *jsonutils.JSONDict {
+	return nil
+}
+
 func (self *SVirtualMachine) getVirtualMachine() *mo.VirtualMachine {
 	return self.object.(*mo.VirtualMachine)
 }
@@ -226,6 +230,6 @@ func (self *SVirtualMachine) acquireVmrcUrl() (jsonutils.JSONObject, error) {
 	return ret, nil
 }
 
-func (dc *SVirtualMachine) ChangeConfig(instanceId string,ncpu int, vmem int) error {
+func (dc *SVirtualMachine) ChangeConfig(instanceId string, ncpu int, vmem int) error {
 	return cloudprovider.ErrNotImplemented
-}
+}