opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 14:19:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
TangBin
2018-10-15 18:36:32 +08:00
parent 7199f93bd6
commit dede034367
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/eip.go
+1 -1
View File
@@ -130,7 +130,7 @@ func (region *SRegion) AllocateEIP(bwMbps int) (*SEipAddress, error) {
return nil, nil
}
func (self *SRegion) CreateEIP(name string, bwMbps int) (cloudprovider.ICloudEIP, error) {
func (self *SRegion) CreateEIP(name string, bwMbps int, chargeType string) (cloudprovider.ICloudEIP, error) {
eip, err := self.ec2Client.AllocateAddress(&ec2.AllocateAddressInput{})
if err != nil {
log.Errorf("AllocateEipAddress fail %s", err)
pkg/util/aws/region.go
+6 -1
View File
@@ -73,9 +73,14 @@ func (self *SRegion) fetchIVpcs() error {
self.ivpcs = make([]cloudprovider.ICloudVpc, 0)
for _, vpc := range vpcs.Vpcs {
tags := make(map[string]string, 0)
for _, tag := range vpc.Tags {
tags[*tag.Key] = *tag.Value
}
self.ivpcs = append(self.ivpcs, &SVpc{region: self,
CidrBlock: *vpc.CidrBlock,
Tags: vpc.Tags,
Tags: tags,
IsDefault: *vpc.IsDefault,
RegionId: self.RegionId,
Status: *vpc.State,