From 0f78dd1ffcb8c4fef3fd42324e5adf22eb8e911e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Fri, 30 Nov 2018 20:40:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E9=83=A8=E5=88=86=E5=85=AC=E6=9C=89?= =?UTF-8?q?=E4=BA=91=E4=B8=8D=E9=9C=80=E8=A6=81=E5=B0=86=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E7=BB=84=E6=8B=86=E5=88=86=E4=B8=BA=E5=8D=95=E4=B8=AA=E5=8D=95?= =?UTF-8?q?=E4=B8=AA=E7=9A=84=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/compute/models/secgrouprules.go | 4 ++++ pkg/compute/models/secgroups.go | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/secgrouprules.go b/pkg/compute/models/secgrouprules.go index fdb1f21fcc..86aaa19041 100644 --- a/pkg/compute/models/secgrouprules.go +++ b/pkg/compute/models/secgrouprules.go @@ -273,6 +273,10 @@ func (self *SSecurityGroupRule) String() string { return fields[0] + strings.Join(fields[1:], " ") } +func (self *SSecurityGroupRule) toRule() (*secrules.SecurityRule, error) { + return secrules.ParseSecurityRule(self.String()) +} + func (self *SSecurityGroupRule) SingleRules() ([]secrules.SecurityRule, error) { rules := make([]secrules.SecurityRule, 0) ruleStr := self.String() diff --git a/pkg/compute/models/secgroups.go b/pkg/compute/models/secgroups.go index 68fcd19623..003eab0727 100644 --- a/pkg/compute/models/secgroups.go +++ b/pkg/compute/models/secgroups.go @@ -116,11 +116,13 @@ func (self *SSecurityGroup) getSecurityRules(direction string) (rules []SSecurit func (self *SSecurityGroup) getSecRules(direction string) []secrules.SecurityRule { rules := make([]secrules.SecurityRule, 0) for _, _rule := range self.getSecurityRules(direction) { - singleRules, err := _rule.SingleRules() + //这里没必要拆分为单个单个的端口,到公有云那边适配 + rule, err := _rule.toRule() if err != nil { log.Errorf(err.Error()) + continue } - rules = append(rules, singleRules...) + rules = append(rules, *rule) } return rules }