Skip to content

Commit

Permalink
Fixed the flaky test in the ProtectedPathSpec
Browse files Browse the repository at this point in the history
Implements #5390
Related to #5608

* Fixed the test "Flow swaps to protected path when main path gets
  broken, becomes DEGRADED if protected path is unable to
  reroute(no bw)"
* Earlier in some cases when the switchPair was set to 2-3 or 8-9,
  the protected path had only 1 ISL and it had enough BW, so the
  test failed because the BW was not reduced for some protected
  path ISLs.
* Now this test passes even when the swPair is 2-3 or 8-9, and
  other switches. So the temporary fix to skip 8-9 switches
  is removed.
* Removed skip 8-9 switches workaround from the test "Flow swaps
  to protected path when main path gets broken, becomes DEGRADED
  if protected path is unable to reroute(no path)"
  • Loading branch information
izadorozhna committed Apr 25, 2024
1 parent 6dc8a1e commit b058639
Showing 1 changed file with 1 addition and 8 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -430,14 +430,7 @@ Failed to find path with requested bandwidth=$flow.maximumBandwidth/
@Tags(ISL_RECOVER_ON_FAIL)
def "Flow swaps to protected path when main path gets broken, becomes DEGRADED if protected path is unable to reroute(no path)"() {
given: "Two switches with 2 diverse paths at least"
//def switchPair = switchPairs.all().withAtLeastNNonOverlappingPaths(2).random()
//https://github.com/telstra/open-kilda/issues/5608
def switchesWhere5608IsReproducible = topology.activeSwitches.findAll {it.dpId.toString().endsWith("08")
||it.dpId.toString().endsWith("09")}
def switchPair = switchPairs.all()
.excludeSwitches(switchesWhere5608IsReproducible)
.withAtLeastNNonOverlappingPaths(2).random()
def switchPair = switchPairs.all().withAtLeastNNonOverlappingPaths(2).random()
when: "Create flow with protected path"
def flow = flowHelperV2.randomFlow(switchPair).tap { allocateProtectedPath = true }
Expand Down

0 comments on commit b058639

Please sign in to comment.