<fix>[test]: fix SG test cases: relax priority consecutive constraints to match new validation

Resolves: ZSTAC-79067

Change-Id: I6f134853bf7e16834a3d38df34334ebafd589167

Author: AlanJager

test/src/test/groovy/org/zstack/test/integration/networkservice/provider/flat/securitygroup/AddSecurityGroupRuleOptimizedCase.groovy

@@ -540,7 +540,7 @@ class AddSecurityGroupRuleOptimizedCase extends SubCase {
             addSecurityGroupRule {
                 securityGroupUuid = sg3.uuid
                 rules = [rule_82]
-                priority = 82
+                priority = 101
             }
         }
     }
@@ -591,13 +591,12 @@ class AddSecurityGroupRuleOptimizedCase extends SubCase {
         rule_13.protocol = "ALL"
         rule_13.startPort = -1
         rule_13.endPort = -1
-        expect(AssertionError) {
-            addSecurityGroupRule {
-                securityGroupUuid = sg3.uuid
-                rules = [rule_13]
-                priority = 13
-            }
+        sg3 = addSecurityGroupRule {
+            securityGroupUuid = sg3.uuid
+            rules = [rule_13]
+            priority = 13
         }
+        assert sg3.rules.find { it.allowedCidr == rule_13.allowedCidr && it.priority == 13 } != null
 
         SecurityGroupRuleAO rule_12 = new SecurityGroupRuleAO()
         rule_12.dstIpRange = "2.2.2.2-2.2.2.10"
@@ -609,12 +608,10 @@ class AddSecurityGroupRuleOptimizedCase extends SubCase {
         ingressRule.protocol = "TCP"
         ingressRule.dstPortRange = "12-13"
 
-        expect(AssertionError) {
-            addSecurityGroupRule {
-                securityGroupUuid = sg3.uuid
-                rules = [rule_12, ingressRule]
-                priority = 12
-            }
+        sg3 = addSecurityGroupRule {
+            securityGroupUuid = sg3.uuid
+            rules = [rule_12, ingressRule]
+            priority = 12
         }
 
     }

test/src/test/groovy/org/zstack/test/integration/networkservice/provider/flat/securitygroup/ChangeSecurityGroupRuleCase.groovy

@@ -231,17 +231,15 @@ class ChangeSecurityGroupRuleCase extends SubCase {
         assert sg3 != null
         SecurityGroupRuleInventory rule_1 = sg3.rules.find { it.type == "Ingress" && it.priority == 1 && it.ipVersion == 4 }
 
-        expect(AssertionError) {
-            changeSecurityGroupRule {
-                uuid = rule_1.uuid
-                priority = 6
-            }
+        changeSecurityGroupRule {
+            uuid = rule_1.uuid
+            priority = 6
         }
 
         expect(AssertionError) {
             changeSecurityGroupRule {
                 uuid = rule_1.uuid
-                priority = 7
+                priority = 101
             }
         }
     }
@@ -307,11 +305,9 @@ class ChangeSecurityGroupRuleCase extends SubCase {
             }
         }
 
-        expect(AssertionError) {
-            changeSecurityGroupRule {
-                uuid = rule1.uuid
-                priority = 3
-            }
+        changeSecurityGroupRule {
+            uuid = rule1.uuid
+            priority = 3
         }
 
         expect(AssertionError) {