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

fix: 修复阿里云同步安全组规则异常问题

Browse Source
This commit is contained in:
Qu Xuan
2020-07-13 20:43:29 +08:00
parent 421a294ab8
commit 367c59117e
10 changed files with 39 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/multicloud/openstack/securitygroup.go
+3 -7
View File
@@ -16,7 +16,6 @@ package openstack
import (
"fmt"
"net"
"time"
"yunion.io/x/jsonutils"
@@ -176,11 +175,8 @@ func (secgrouprule *SSecurityGroupRule) toRules() ([]cloudprovider.SecurityRule,
if len(secgrouprule.RemoteIpPrefix) == 0 {
secgrouprule.RemoteIpPrefix = "0.0.0.0/0"
}
_, ipnet, err := net.ParseCIDR(secgrouprule.RemoteIpPrefix)
if err != nil {
return rules, errors.Wrapf(err, "net.ParseCIDR(%s)", secgrouprule.RemoteIpPrefix)
}
rule.IPNet = ipnet
rule.ParseCIDR(secgrouprule.RemoteIpPrefix)
if secgrouprule.PortRangeMax > 0 && secgrouprule.PortRangeMin > 0 {
if secgrouprule.PortRangeMax == secgrouprule.PortRangeMin {
rule.Ports = []int{secgrouprule.PortRangeMax}
@@ -189,7 +185,7 @@ func (secgrouprule *SSecurityGroupRule) toRules() ([]cloudprovider.SecurityRule,
rule.PortEnd = secgrouprule.PortRangeMax
}
}
err = rule.ValidateRule()
err := rule.ValidateRule()
if err != nil && err != secrules.ErrInvalidPriority {
return rules, errors.Wrap(err, "rule.ValidateRule")
}