From 4ad3caa8a4d1909e8be94596a5d1631a34a9f168 Mon Sep 17 00:00:00 2001 From: ioito Date: Tue, 2 Jul 2019 20:26:28 +0800 Subject: [PATCH] fix azure set secgroup error --- pkg/util/azure/instance.go | 7 +++++-- pkg/util/azure/securitygroup.go | 2 +- pkg/util/azure/shell/instance.go | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/util/azure/instance.go b/pkg/util/azure/instance.go index 8a39182c66..18d07b1e98 100644 --- a/pkg/util/azure/instance.go +++ b/pkg/util/azure/instance.go @@ -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 { diff --git a/pkg/util/azure/securitygroup.go b/pkg/util/azure/securitygroup.go index fb59e22e24..c2b8628df1 100644 --- a/pkg/util/azure/securitygroup.go +++ b/pkg/util/azure/securitygroup.go @@ -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 diff --git a/pkg/util/azure/shell/instance.go b/pkg/util/azure/shell/instance.go index 610a64f090..55de64ef45 100644 --- a/pkg/util/azure/shell/instance.go +++ b/pkg/util/azure/shell/instance.go @@ -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) }) }