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

Merge pull request #1486 from ioito/hotfix/qx-azure-set-secgroup

Browse Source 
fix azure set secgroup error
This commit is contained in:
yunion-ci-robot
2019-07-03 08:27:52 +08:00
committed by GitHub
parent e91a35fc0c 4ad3caa8a4
commit 5cfaf4eae2
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/util/azure/instance.go
+5 -2
View File
@@ -1097,11 +1097,14 @@ func (self *SInstance) GetIEIP() (cloudprovider.ICloudEIP, error) {
}
func (self *SInstance) AssignSecurityGroup(secgroupId string) error {
return self.host.zone.region.AssiginSecurityGroup(self.ID, secgroupId)
return self.host.zone.region.SetSecurityGroup(self.ID, secgroupId)
}
func (self *SInstance) SetSecurityGroups(secgroupIds []string) error {
return cloudprovider.ErrNotSupported
if len(secgroupIds) == 1 {
return self.host.zone.region.SetSecurityGroup(self.ID, secgroupIds[0])
}
return fmt.Errorf("Unexpect segroup count %d", len(secgroupIds))
}
func (self *SInstance) GetBillingType() string {
pkg/util/azure/securitygroup.go
+1 -1
View File
@@ -490,7 +490,7 @@ func (region *SRegion) AttachSecurityToInterfaces(secgroupId string, nicIds []st
return nil
}
func (region *SRegion) AssiginSecurityGroup(instanceId, secgroupId string) error {
func (region *SRegion) SetSecurityGroup(instanceId, secgroupId string) error {
instance, err := region.GetInstance(instanceId)
if err != nil {
return err
pkg/util/azure/shell/instance.go
+2 -2
View File
@@ -179,7 +179,7 @@ func init() {
SecurityGroup string `help:"Security Group ID or Name"`
}
shellutils.R(&InstanceSecurityGroupOptions{}, "instance-assign-secgrp", "Attach a disk to intance", func(cli *azure.SRegion, args *InstanceSecurityGroupOptions) error {
return cli.AssiginSecurityGroup(args.ID, args.SecurityGroup)
shellutils.R(&InstanceSecurityGroupOptions{}, "instance-set-secgrp", "Attach a disk to intance", func(cli *azure.SRegion, args *InstanceSecurityGroupOptions) error {
return cli.SetSecurityGroup(args.ID, args.SecurityGroup)
})
}