diff --git a/pkg/util/aws/disk.go b/pkg/util/aws/disk.go index 243d7c6a63..1289f6a6eb 100644 --- a/pkg/util/aws/disk.go +++ b/pkg/util/aws/disk.go @@ -319,4 +319,8 @@ func (self *SRegion) resetDisk(diskId, snapshotId string) error { func (self *SRegion) CreateSnapshot(diskId, name, desc string) (string, error) { return "", nil +} + +func (self *SRegion) CreateDisk(zoneId string, category string, name string, sizeGb int, desc string) (string, error) { + return "", nil } \ No newline at end of file diff --git a/pkg/util/aws/storage.go b/pkg/util/aws/storage.go index f404a17e3d..0a191e89b3 100644 --- a/pkg/util/aws/storage.go +++ b/pkg/util/aws/storage.go @@ -3,6 +3,9 @@ package aws import ( "yunion.io/x/jsonutils" "yunion.io/x/onecloud/pkg/cloudprovider" + "fmt" + "yunion.io/x/onecloud/pkg/compute/models" + "yunion.io/x/log" ) type SStorage struct { @@ -11,73 +14,111 @@ type SStorage struct { } func (self *SStorage) GetId() string { - panic("implement me") + return fmt.Sprintf("%s-%s-%s", self.zone.region.client.providerId, self.zone.GetId(), self.storageType) } func (self *SStorage) GetName() string { - panic("implement me") + return fmt.Sprintf("%s-%s-%s", self.zone.region.client.providerName, self.zone.GetId(), self.storageType) } func (self *SStorage) GetGlobalId() string { - panic("implement me") + return fmt.Sprintf("%s-%s-%s", self.zone.region.client.providerId, self.zone.GetGlobalId(), self.storageType) } func (self *SStorage) GetStatus() string { - panic("implement me") + return models.STORAGE_ONLINE } func (self *SStorage) Refresh() error { - panic("implement me") + return nil } func (self *SStorage) IsEmulated() bool { - panic("implement me") + return true } func (self *SStorage) GetMetadata() *jsonutils.JSONDict { - panic("implement me") + return nil } func (self *SStorage) GetIStoragecache() cloudprovider.ICloudStoragecache { - panic("implement me") + return self.zone.region.getStoragecache() } func (self *SStorage) GetIZone() cloudprovider.ICloudZone { - panic("implement me") + return self.zone } func (self *SStorage) GetIDisks() ([]cloudprovider.ICloudDisk, error) { - panic("implement me") + disks := make([]SDisk, 0) + for { + parts, total, err := self.zone.region.GetDisks("", self.zone.GetId(), self.storageType, nil, len(disks), 50) + if err != nil { + log.Errorf("GetDisks fail %s", err) + return nil, err + } + disks = append(disks, parts...) + if len(disks) >= total { + break + } + } + idisks := make([]cloudprovider.ICloudDisk, len(disks)) + for i := 0; i < len(disks); i += 1 { + disks[i].storage = self + idisks[i] = &disks[i] + } + return idisks, nil } func (self *SStorage) GetStorageType() string { - panic("implement me") + return self.storageType } func (self *SStorage) GetMediumType() string { - panic("implement me") + if self.storageType == models.STORAGE_GP2_SSD || self.storageType == models.STORAGE_IO1_SSD { + return models.DISK_TYPE_SSD + } else { + return models.DISK_TYPE_ROTATE + } } func (self *SStorage) GetCapacityMB() int { - panic("implement me") + return 0 // unlimited } func (self *SStorage) GetStorageConf() jsonutils.JSONObject { - panic("implement me") + conf := jsonutils.NewDict() + return conf } func (self *SStorage) GetEnabled() bool { - panic("implement me") + return true } func (self *SStorage) GetManagerId() string { - panic("implement me") + return self.zone.region.client.providerId } func (self *SStorage) CreateIDisk(name string, sizeGb int, desc string) (cloudprovider.ICloudDisk, error) { - panic("implement me") + diskId, err := self.zone.region.CreateDisk(self.zone.ZoneId, self.storageType, name, sizeGb, desc) + if err != nil { + log.Errorf("createDisk fail %s", err) + return nil, err + } + disk, err := self.zone.region.GetDisk(diskId) + if err != nil { + log.Errorf("getDisk fail %s", err) + return nil, err + } + disk.storage = self + return disk, nil } func (self *SStorage) GetIDisk(idStr string) (cloudprovider.ICloudDisk, error) { - panic("implement me") + if disk, err := self.zone.region.GetDisk(idStr); err != nil { + return nil, err + } else { + disk.storage = self + return disk, nil + } } diff --git a/pkg/util/aws/storagecache.go b/pkg/util/aws/storagecache.go index 1c196d3614..81c385bd84 100644 --- a/pkg/util/aws/storagecache.go +++ b/pkg/util/aws/storagecache.go @@ -71,4 +71,11 @@ func (self *SRegion) checkBucket(bucketName string) (*oss.Bucket, error) { func (self *SRegion) createIImage(snapshoutId, imageName, imageDesc string) (string, error) { return "", nil +} + +func (self *SRegion) getStoragecache() *SStoragecache { + if self.storageCache == nil { + self.storageCache = &SStoragecache{region: self} + } + return self.storageCache } \ No newline at end of file