[TEST]: Improvement: Path Manipulation: Complex Flow(switch triplet)

telstra · Jan 30, 2025 · 7209a8e · 7209a8e
1 parent 3fd4d21
commit 7209a8e
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 260 deletions.
diff --git a/.../functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/PathHelper.groovy b/.../functional-tests/src/main/groovy/org/openkilda/functionaltests/helpers/PathHelper.groovy
diff --git a/...onal-tests/src/main/groovy/org/openkilda/functionaltests/helpers/model/SwitchPairs.groovy b/...onal-tests/src/main/groovy/org/openkilda/functionaltests/helpers/model/SwitchPairs.groovy
@@ -79,6 +79,11 @@ class SwitchPairs {
         return this
     }
 
+    SwitchPairs withoutOf12Switches() {
+        switchPairs = switchPairs.findAll { it.src.ofVersion != "OF_12" && it.dst.ofVersion != "OF_12" }
+        return this
+    }
+
     SwitchPairs withTraffgensOnBothEnds() {
         switchPairs = switchPairs.findAll { [it.src, it.dst].every { !it.traffGens.isEmpty() } }
         return this

diff --git a/...l-tests/src/main/groovy/org/openkilda/functionaltests/helpers/model/SwitchTriplets.groovy b/...l-tests/src/main/groovy/org/openkilda/functionaltests/helpers/model/SwitchTriplets.groovy
@@ -46,8 +46,8 @@ class SwitchTriplets {
    SwitchTriplets nonNeighbouring() {
         switchTriplets = switchTriplets.findAll {
             it.shared != it.ep1 && it.ep1 != it.ep2 && it.ep2 != it.shared &&
-                    it.getPathsEp1().every {it.size() > 2} &&
-                    it.getPathsEp2().every {it.size() > 2}}
+                    it.pathsEp1.every {it.size() > 2} &&
+                    it.pathsEp2.every {it.size() > 2}}
 
        return this
     }
@@ -149,7 +149,7 @@ class SwitchTriplets {
                     .unique(false) { a, b -> a.intersect(b) == [] ? 1 : 0 }
             def yPoints = topologyHelper.findPotentialYPoints(it)
 
-            yPoints.size() == 1 && (isYPointOnSharedEp ? yPoints[0] == it.shared : yPoints[0] != it.shared) && yPoints[0] != it.ep1 && yPoints[0] != it.ep2 &&
+            yPoints.size() == 1 && (isYPointOnSharedEp ? yPoints[0] == it.shared.dpId : yPoints[0] != it.shared.dpId) && yPoints[0] != it.ep1.dpId && yPoints[0] != it.ep2.dpId &&
                     ep1paths.size() >= 2 && ep2paths.size() >= 2
         }
     }
@@ -184,7 +184,7 @@ class SwitchTriplets {
 
     SwitchTriplet findSwitchTripletWithYPointOnSharedEp() {
         return switchTriplets.find {
-            topologyHelper.findPotentialYPoints(it).size() == 1 && it.getShared().getDpId() == topologyHelper.findPotentialYPoints(it).get(0).getDpId()
+            topologyHelper.findPotentialYPoints(it).size() == 1 && it.getShared().getDpId() == topologyHelper.findPotentialYPoints(it).get(0)
         }
     }
 
@@ -226,7 +226,8 @@ class SwitchTriplets {
                             ep1: ep1,
                             ep2: ep2,
                             pathsEp1: retrievePairPathNode(shared.dpId, ep1.dpId),
-                            pathsEp2: retrievePairPathNode(shared.dpId, ep2.dpId))
+                            pathsEp2: retrievePairPathNode(shared.dpId, ep2.dpId),
+                            topologyDefinition: topology)
                 }
     }