Merge "Debug failing regex matching"
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index 86b9f53..6c12a4f 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -897,41 +897,6 @@
onpass=main.assertReturnString,
onfail=main.assertReturnString )
- main.step( "Protected: Add point intents between h1 and h9" )
- main.assertReturnString = "Assertion Result for protected point intent\n"
- senders = [
- { "name": "h1", "device": "of:0000000000000005/1", "mac": "00:00:00:00:00:01" }
- ]
- recipients = [
- { "name": "h9", "device": "of:0000000000000006/1", "mac": "00:00:00:00:00:09" }
- ]
- testResult = main.FALSE
- installResult = main.intents.installPointIntent(
- main,
- name="Protected",
- senders=senders,
- recipients=recipients,
- protected=True )
-
- if installResult:
- testResult = main.intents.testPointIntent(
- main,
- name="Protected",
- intentId=installResult,
- senders=senders,
- recipients=recipients,
- sw1="s5",
- sw2="s2",
- protected=True,
- expectedLink=18 )
- else:
- main.intents.removeAllExistIntents( main )
-
- utilities.assert_equals( expect=main.TRUE,
- actual=testResult,
- onpass=main.assertReturnString,
- onfail=main.assertReturnString )
-
main.step( "IPV4_2: Add point intents between h1 and h9" )
main.assertReturnString = "Assertion Result for IPV4 no mac address point intents\n"
senders = [
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index 8b798bd..f4c1c8e 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -202,7 +202,7 @@
continue
try:
- latency = int( installResult.split()[ 5 ] )
+ latency = int( installResult.split()[ -2 ] )
main.log.info( installResult )
except:
main.log.error( "Failed to get latency, ignore this iteration." )
@@ -245,7 +245,7 @@
continue
try:
- latency = int( withdrawResult.split()[ 5 ] )
+ latency = int( withdrawResult.split()[ -2 ] )
main.log.info( withdrawResult )
except:
main.log.error( "Failed to get latency, ignore this iteration." )
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 0b32c5a..e5433f9 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -321,13 +321,8 @@
"""
Adds an ONOS static route with the use route-add command.
"""
- main.step("Add static route for subnet {0} towards router interface {1}".format(subnet, intf))
routeResult = main.Cluster.active( 0 ).addStaticRoute(subnet, intf)
- utilities.assert_equals( expect=True, actual=( not routeResult ),
- onpass="route-add command succeeded",
- onfail="route-add command failed")
-
@staticmethod
def checkGroupsForBuckets( main, deviceId, subnetDict, routingTable=30 ):
"""
@@ -898,7 +893,7 @@
main.log.debug( "{} components not ACTIVE: \n{}".format(
ctrl.name,
ctrl.CLI.sendline( "onos:scr-list | grep -v ACTIVE" ) ) )
- main.log.error( "Failed to kill ONOS, stopping test" )
+ main.log.error( "Failed to verify nodes, stopping test" )
main.cleanAndExit()
@staticmethod