opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-10-30 18:23:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

rebase master

Browse Source
This commit is contained in:
ioito
2019-05-21 22:36:52 +08:00
parent 746a7d424e
commit ff2cca8611
82 changed files with 2247 additions and 717 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/aws/eip.go
+7 -3
View File
@@ -124,6 +124,10 @@ func (self *SEipAddress) GetBandwidth() int {
return self.Bandwidth
}
func (self *SEipAddress) GetINetworkId() string {
return ""
}
func (self *SEipAddress) GetInternetChargeType() string {
// todo : implement me
return api.EIP_CHARGE_TYPE_BY_TRAFFIC
@@ -250,14 +254,14 @@ func (self *SRegion) AllocateEIP(domainType string) (*SEipAddress, error) {
return self.GetEip(*eip.AllocationId)
}
func (self *SRegion) CreateEIP(name string, bwMbps int, chargeType string, bgpType string) (cloudprovider.ICloudEIP, error) {
func (self *SRegion) CreateEIP(eip *cloudprovider.SEip) (cloudprovider.ICloudEIP, error) {
// todo: aws 不支持指定bwMbps, chargeType ？
log.Debugf("CreateEip: aws not support specific params name/bwMbps/chargeType.")
ieip, err := self.AllocateEIP("vpc")
if err == nil && len(name) > 0 {
if err == nil && len(eip.Name) > 0 {
eipId := ieip.GetId()
k := "Name"
nameTag := &ec2.Tag{Key: &k, Value: &name}
nameTag := &ec2.Tag{Key: &k, Value: &eip.Name}
params := &ec2.CreateTagsInput{}
params.SetResources([]*string{&eipId})
params.SetTags([]*ec2.Tag{nameTag})