Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest
diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
index 6abfb0b..dc3dec9 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
@@ -1,8 +1,8 @@
<PARAMS>
- <testcases>1,2</testcases>
+ <testcases>1,2,1,2,1,2,1,2</testcases>
- <SCALE>7</SCALE>
+ <SCALE>1,3,5,7</SCALE>
<availableNodes>7</availableNodes>
<ENV>
diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
index 789f518..762b617 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
@@ -170,11 +170,9 @@
for i in range(0,len(intentsList)):
intentsList[i] = int(intentsList[i])
- #if debug == "True":
- # debug = True
- #else:
- # debug = False
+ ######################
debug = True
+ ######################
linkCount = 0
for i in range(0,10):
@@ -187,13 +185,20 @@
time.sleep(2)
links = "--"
- while "=null:" not in links:
+ for i in range(8):
if debug: main.log.info("top of loop")
main.ONOSbench.handle.sendline("onos $OC1 links")
main.ONOSbench.handle.expect(":~")
links = main.ONOSbench.handle.before
+ if "=null:" in links:
+ break
if debug: main.log.info(str(links))
- time.sleep(1)
+ if i > 3:
+ main.ONOSbench.logReport(ONOSIp[1], ["ERROR", "WARNING", "EXCEPT"], "d")
+ if i == 7:
+ main.log.error("link data missing")
+ time.sleep(3)
+
links = links.splitlines()
templinks = links
@@ -283,3 +288,4 @@
resultsDB.close()
main.ONOSbench.logReport(ONOSIp[1], ["ERROR", "WARNING", "EXCEPT"])
+ time.sleep(20)
diff --git a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
index d4fa651..4e3ffdb 100644
--- a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
+++ b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.params
@@ -15,43 +15,43 @@
</TEST>
<GIT>
- <autopull>on</autopull>
+ <autopull>off</autopull>
<checkout>master</checkout>
</GIT>
<CTRL>
<USER>admin</USER>
- <ip1>10.128.5.51</ip1>
+ <ip1>OC1</ip1>
<port1>6633</port1>
- <ip2>10.128.5.52</ip2>
+ <ip2>OC2</ip2>
<port2>6633</port2>
- <ip3>10.128.5.53</ip3>
+ <ip3>OC3</ip3>
<port3>6633</port3>
- <ip4>10.128.5.54</ip4>
+ <ip4>OC4</ip4>
<port4>6633</port4>
- <ip5>10.128.5.65</ip5>
+ <ip5>OC5</ip5>
<port5>6633</port5>
- <ip6>10.128.5.66</ip6>
+ <ip6>OC6</ip6>
<port6>6633</port6>
- <ip7>10.128.5.67</ip7>
+ <ip7>OC7</ip7>
<port7>6633</port7>
</CTRL>
<MN>
- <ip1>10.128.5.55</ip1>
+ <ip1>OCN</ip1>
</MN>
<BENCH>
<user>admin</user>
- <ip1>10.128.5.55</ip1>
+ <ip1>OCN</ip1>
</BENCH>
<JSON>
diff --git a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
index 0802eca..f3f3cb9 100644
--- a/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
+++ b/TestON/tests/ScaleOutTemplate/ScaleOutTemplate.topo
@@ -3,7 +3,7 @@
<COMPONENT>
<ONOSbench>
- <host>10.128.5.55</host>
+ <host>OCN</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosDriver</type>
@@ -12,7 +12,7 @@
</ONOSbench>
<ONOS1cli>
- <host>10.128.5.55</host>
+ <host>OCN</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -21,7 +21,7 @@
</ONOS1cli>
<ONOS2cli>
- <host>10.128.5.55</host>
+ <host>OCN</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -30,7 +30,7 @@
</ONOS2cli>
<ONOS3cli>
- <host>10.128.5.55</host>
+ <host>OCN</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -39,7 +39,7 @@
</ONOS3cli>
<ONOS1>
- <host>10.128.5.51</host>
+ <host>OC1</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -48,7 +48,7 @@
</ONOS1>
<ONOS2>
- <host>10.128.5.52</host>
+ <host>OC2</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -57,7 +57,7 @@
</ONOS2>
<ONOS3>
- <host>10.128.5.53</host>
+ <host>OC3</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -66,7 +66,7 @@
</ONOS3>
<Mininet1>
- <host>10.128.5.55</host>
+ <host>OCN</host>
<user>admin</user>
<password>onos_test</password>
<type>MininetCliDriver</type>