Merge "Kill and Recover tests in SRRouting"
diff --git a/TestON/JenkinsFile/dependencies/branches.json b/TestON/JenkinsFile/dependencies/branches.json
index e03ba04..84e6a72 100644
--- a/TestON/JenkinsFile/dependencies/branches.json
+++ b/TestON/JenkinsFile/dependencies/branches.json
@@ -1,6 +1,6 @@
{
"latest_branches": {
- "onos-LTS1": "2.5",
+ "onos-LTS1": "2.7",
"onos-LTS2": "2.5"
},
"support_branches": {
diff --git a/TestON/drivers/common/api/controller/trexclientdriver.py b/TestON/drivers/common/api/controller/trexclientdriver.py
index 1150d4c..f6dfffe 100644
--- a/TestON/drivers/common/api/controller/trexclientdriver.py
+++ b/TestON/drivers/common/api/controller/trexclientdriver.py
@@ -322,8 +322,7 @@
trex_daemon_client.start_stateless(cfg=trex_config_file_on_server)
except ConnectionRefusedError:
main.log.error(
- "Unable to connect to server %s.\n" +
- "Did you start the Trex daemon?" % trex_address)
+ "Unable to connect to server %s.\nDid you start the Trex daemon?" % trex_address)
return False
return True
diff --git a/TestON/tests/USECASE/SegmentRouting/INT/INT.py b/TestON/tests/USECASE/SegmentRouting/INT/INT.py
index 4942d44..3da88d4 100644
--- a/TestON/tests/USECASE/SegmentRouting/INT/INT.py
+++ b/TestON/tests/USECASE/SegmentRouting/INT/INT.py
@@ -135,8 +135,13 @@
)
main.step("Checking drop reason from the report")
- dropAnomaly = dropAnomalies[0]
- dropReason = dropAnomaly["DropReason"]
+ try:
+ dropAnomaly = dropAnomalies[0]
+ dropReason = dropAnomaly["DropReason"]
+ except IndexError:
+ main.log.warn( "No drop report was found" )
+ dropAnomaly = None
+ dropReason = None
# DROP_REASON_PORT_VLAN_MAPPING_MISS = 55
utilities.assert_equals(
@@ -211,8 +216,13 @@
)
main.step("Checking drop reason from report")
- dropAnomaly = dropAnomalies[0]
- dropReason = dropAnomaly["DropReason"]
+ try:
+ dropAnomaly = dropAnomalies[0]
+ dropReason = dropAnomaly["DropReason"]
+ except IndexError:
+ main.log.warn( "No drop report was found" )
+ dropAnomaly = None
+ dropReason = None
# DROP_REASON_IP_TTL_ZERO = 26
utilities.assert_equals(
expect=26, actual=dropReason,