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(region): secgroup priority fix

Browse Source
This commit is contained in:
Qu Xuan
2021-01-28 14:20:21 +08:00
parent e5d79d1850
commit e7407d3687
4 changed files with 14 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cloudprovider/securitygroup.go
+6 -13
View File
@@ -96,7 +96,6 @@ type SecurityRule struct {
Name string
ExternalId string
Id string
SrcPrority int
}
func (r SecurityRule) String() string {
@@ -257,7 +256,7 @@ func CompareRules(src, dest SecRuleInfo, debug bool) (common, inAdds, outAdds, i
}
var _compare = func(srcRules SecurityRuleSet, destRules SecurityRuleSet) (common, add, del SecurityRuleSet) {
i, j, destPriority, srcPrority := 0, 0, (dest.MinPriority-1+dest.MaxPriority)/2, (src.MinPriority-1+src.MaxPriority)/2
i, j, priority := 0, 0, (dest.MinPriority-1+dest.MaxPriority)/2
for i < len(srcRules) || j < len(destRules) {
if i < len(srcRules) && j < len(destRules) {
destRuleStr := destRules[j].String()
@@ -269,34 +268,28 @@ func CompareRules(src, dest SecRuleInfo, debug bool) (common, inAdds, outAdds, i
}
cmp := strings.Compare(destRuleStr, srcRuleStr)
if cmp == 0 {
destRules[j].SrcPrority = srcRules[i].Priority
destRules[j].Id = srcRules[i].Id
common = append(common, destRules[j])
if srcRules[i].Id != DEFAULT_SRC_RULE_ID {
srcPrority = srcRules[i].Priority
}
if destRules[j].ExternalId != DEFAULT_DEST_RULE_ID {
destPriority = destRules[j].Priority
priority = destRules[j].Priority
}
i++
j++
} else if cmp < 0 {
destRules[j].SrcPrority = srcPrority
srcPrority = addPriority(srcPrority, src.MinPriority, src.MaxPriority, src.IsOnlySupportAllowRules)
del = append(del, destRules[j])
j++
} else {
srcRules[i].Priority = addPriority(destPriority, dest.MinPriority, dest.MaxPriority, dest.IsOnlySupportAllowRules)
priority = addPriority(priority, dest.MinPriority, dest.MaxPriority, dest.IsOnlySupportAllowRules)
srcRules[i].Priority = priority
add = append(add, srcRules[i])
i++
}
} else if i >= len(srcRules) {
destRules[j].SrcPrority = srcPrority
srcPrority = addPriority(srcPrority, src.MinPriority, src.MaxPriority, false)
del = append(del, destRules[j])
j++
} else if j >= len(destRules) {
srcRules[i].Priority = addPriority(destPriority, dest.MinPriority, dest.MaxPriority, dest.IsOnlySupportAllowRules)
priority = addPriority(priority, dest.MinPriority, dest.MaxPriority, dest.IsOnlySupportAllowRules)
srcRules[i].Priority = priority
add = append(add, srcRules[i])
i++
}
pkg/compute/models/secgrouprules.go
-2
View File
@@ -469,8 +469,6 @@ func (self *SSecurityGroup) newFromCloudSecurityGroupRule(ctx context.Context, u
cidr = rule.IPNet.String()
}
rule.Priority = rule.SrcPrority
err := rule.ValidateRule()
if err != nil {
return nil, errors.Wrapf(err, "ValidateRule")
pkg/compute/regiondrivers/secgroup_azure_test.go
+8 -8
View File
@@ -141,9 +141,9 @@ func TestAzureRuleSync(t *testing.T) {
ruleWithName("in_allow_udp_55_4014", "in:allow udp 55", 4014),
},
InAdds: []cloudprovider.SecurityRule{
ruleWithName("", "in:allow tcp 1011", 4014),
ruleWithName("", "in:allow tcp 1050", 4014),
ruleWithName("", "in:allow tcp 1002", 4014),
ruleWithName("", "in:allow tcp 1050", 4010),
ruleWithName("", "in:allow tcp 1011", 4011),
ruleWithName("", "in:allow tcp 1002", 4012),
},
OutAdds: []cloudprovider.SecurityRule{},
InDels: []cloudprovider.SecurityRule{
@@ -178,11 +178,11 @@ func TestAzureRuleSync(t *testing.T) {
ruleWithName("in_allow_udp_55_4014", "in:allow udp 55", 4014),
},
InAdds: []cloudprovider.SecurityRule{
ruleWithName("", "in:allow icmp", 2098),
ruleWithName("", "in:allow udp 1055", 4015),
ruleWithName("", "in:allow tcp 1050", 4014),
ruleWithName("", "in:allow tcp 1012", 4014),
ruleWithName("", "in:allow tcp 1002", 4014),
ruleWithName("", "in:allow icmp", 2096),
ruleWithName("", "in:allow tcp 1050", 4010),
ruleWithName("", "in:allow tcp 1012", 4011),
ruleWithName("", "in:allow tcp 1002", 4012),
ruleWithName("", "in:allow udp 1055", 4013),
},
OutAdds: []cloudprovider.SecurityRule{},
InDels: []cloudprovider.SecurityRule{
pkg/compute/regiondrivers/secgroup_test.go
-1
View File
@@ -101,7 +101,6 @@ var ruleWithPriority = func(ruleStr string, priority int) cloudprovider.Security
rule := secrules.MustParseSecurityRule(ruleStr)
if rule == nil {
panic(fmt.Sprintf("invalid rule str %s", ruleStr))
return cloudprovider.SecurityRule{}
}
rule.Priority = priority
return cloudprovider.SecurityRule{SecurityRule: *rule, Id: stringutils.UUID4()}