Modifications on test case for robustness and addition of retry for cli connection
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 6b7a02e..d0c8d3a 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -160,6 +160,7 @@
return main.TRUE
else:
#If failed, send ctrl+c to process and try again
+ main.log.info("Starting CLI failed. Retrying...")
self.handle.sendline("\x03")
self.handle.sendline("onos -w "+str(ONOS_ip))
i = self.handle.expect(["onos>",pexpect.TIMEOUT],
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.py b/TestON/tests/TopoPerfNext/TopoPerfNext.py
index 5daa48e..842f6c4 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.py
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.py
@@ -328,12 +328,16 @@
float(delta_ofp_device_2)+\
float(delta_ofp_device_3)) / 3.0
- #NOTE: ofp - delta measurements are occasionally negative.
- # consider changing or purging the measurement
+ #NOTE: ofp - delta measurements are occasionally negative
+ # due to system time misalignment.
+ #TODO: Implement ptp across all clusters
+ #Just add the calculation to list for now
+ latency_ofp_to_device_list.append(avg_delta_ofp_device)
#TODO:
#Fetch logs upon threshold excess
+
main.log.info("ONOS1 delta end-to-end: "+
str(delta_graph_1))
main.log.info("ONOS2 delta end-to-end: "+
@@ -367,6 +371,8 @@
time.sleep(5)
+ #END for loop for iteration
+
#If there is at least 1 element in each list,
#pass the test case
if len(latency_end_to_end_list) > 0 and\
@@ -374,6 +380,21 @@
len(latency_ofp_to_device_list) > 0 and\
len(latency_t0_to_device_list) > 0:
assertion = main.TRUE
+ elif len(latency_end_to_end_list) == 0:
+ #The appending of 0 here is to prevent
+ #the min,max,sum functions from failing
+ #below
+ latency_end_to_end_list.append(0)
+ assertion = main.FALSE
+ elif len(latency_ofp_to_graph_list) == 0:
+ latency_ofp_to_graph_list.append(0)
+ assertion = main.FALSE
+ elif len(latency_ofp_to_device_list) == 0:
+ latency_ofp_to_device_list.append(0)
+ assertion = main.FALSE
+ elif len(latency_t0_to_device_list) == 0:
+ latency_t0_to_device_list.append(0)
+ assertion = main.FALSE
#Calculate min, max, avg of latency lists
latency_end_to_end_max = \