SR test fixes
- Skip rest of the test case on host IP verification failure
- Fix incorrect packet filter for capturing ping6
Change-Id: I39d7b446b35feeb9606f16a3d62bfc8214b7e701
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 243ff39..2e93406 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -1078,7 +1078,7 @@
onfail="Verify network host IP failed" )
@staticmethod
- def verifyOnosHostIp( main, attempts=10, sleep=10 ):
+ def verifyOnosHostIp( main, attempts=10, sleep=10, skipOnFail=True ):
"""
Verifies host IP address assignment from ONOS
"""
@@ -1106,6 +1106,10 @@
utilities.assert_equals( expect=main.TRUE, actual=ipResult,
onpass="Verify ONOS host IP succeded",
onfail="Verify ONOS host IP failed" )
+ if not ipResult and skipOnFail:
+ Testcaselib.saveOnosDiagnostics( main )
+ Testcaselib.cleanup( main, copyKarafLog=False, removeHostComponent=True )
+ main.skipCase()
@staticmethod
def updateIntfCfg( main, connectPoint, ips=[], untagged=0, tagged=[], native=0 ):