Tests- stable versions
diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
index a3e39fa..2b76662 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.params
@@ -1,8 +1,8 @@
<PARAMS>
- <testcases>1,2,1,2,1,2</testcases>
+ <testcases>1,2,1,2,1,2,1,2</testcases>
- <SCALE>3,5,7</SCALE>
+ <SCALE>1,3,5,7</SCALE>
<availableNodes>7</availableNodes>
<ENV>
@@ -13,8 +13,8 @@
<TEST>
<skipCleanInstall>yes</skipCleanInstall>
<switchCount>7</switchCount>
- <warmUp>4</warmUp>
- <sampleSize>2</sampleSize>
+ <warmUp>10</warmUp>
+ <sampleSize>20</sampleSize>
<wait></wait>
<intents>1,100,1000</intents> #list format, will be split on ','
<debug>True</debug> #"True" for true
@@ -28,36 +28,36 @@
<CTRL>
<USER>admin</USER>
- <ip1>10.128.5.51</ip1>
+ <ip1>10.254.1.201</ip1>
<port1>6633</port1>
- <ip2>10.128.5.52</ip2>
+ <ip2>10.254.1.202</ip2>
<port2>6633</port2>
- <ip3>10.128.5.53</ip3>
+ <ip3>10.254.1.203</ip3>
<port3>6633</port3>
- <ip4>10.128.5.54</ip4>
+ <ip4>10.254.1.204</ip4>
<port4>6633</port4>
- <ip5>10.128.5.65</ip5>
+ <ip5>10.254.1.205</ip5>
<port5>6633</port5>
- <ip6>10.128.5.66</ip6>
+ <ip6>10.254.1.206</ip6>
<port6>6633</port6>
- <ip7>10.128.5.67</ip7>
+ <ip7>10.254.1.207</ip7>
<port7>6633</port7>
</CTRL>
<MN>
- <ip1>10.128.5.55</ip1>
+ <ip1>10.254.1.200</ip1>
</MN>
<BENCH>
<user>admin</user>
- <ip1>10.128.5.55</ip1>
+ <ip1>10.254.1.200</ip1>
</BENCH>
<JSON>
diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
index 8092185..83dac2a 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
@@ -128,38 +128,21 @@
time.sleep(30)
+ main.ONOSbench.handle.sendline("""onos $OC1 "cfg setorg.onosproject.provider.nil.NullProviders enabled true" """)
+ main.ONOSbench.handle.expect(":~")
+ print main.ONOSbench.handle.before
main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders deviceCount """ + str(switchCount) + """ " """)
main.ONOSbench.handle.expect(":~")
print main.ONOSbench.handle.before
- time.sleep(3)
main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders topoShape linear" """)
main.ONOSbench.handle.expect(":~")
print main.ONOSbench.handle.before
- time.sleep(3)
main.ONOSbench.handle.sendline("""onos $OC1 "null-simulation start" """)
main.ONOSbench.handle.expect(":~")
print main.ONOSbench.handle.before
- time.sleep(3)
main.ONOSbench.handle.sendline("""onos $OC1 "balance-masters" """)
main.ONOSbench.handle.expect(":~")
print main.ONOSbench.handle.before
- time.sleep(3)
-
- for i in range(0,5):
- main.ONOSbench.handle.sendline("onos $OC1 summary")
- main.ONOSbench.handle.expect(":~")
- check = main.ONOSbench.handle.before
- if "devices=7," in check:
- main.log.info("startup successful")
- break
- else:
- main.log.error(check)
- main.ONOSbench.handle.sendline("""onos $OC1 "null-simulation stop" """)
- main.ONOSbench.handle.expect(":~")
- time.sleep(6)
- main.ONOSbench.handle.sendline("""onos $OC1 "null-simulation start" """)
- main.ONOSbench.handle.expect(":~")
- time.sleep(2)
def CASE2( self, main ):
@@ -171,18 +154,14 @@
intentsList = (main.params[ 'TEST' ][ 'intents' ]).split(",")
switchCount = int(main.params[ 'TEST' ][ 'switchCount' ])
debug = main.params[ 'TEST' ][ 'switchCount' ]
- print("0")
-
for i in range(0,len(intentsList)):
intentsList[i] = int(intentsList[i])
- main.log.info("Intents list: " + str(intentsList))
- print("1")
if debug == "True":
debug = True
else:
debug = False
-
+
linkCount = 0
for i in range(0,10):
main.ONOSbench.handle.sendline("onos $OC1 links|wc -l")
@@ -192,22 +171,18 @@
if str((switchCount*2)-2) in linkCount:
break
time.sleep(2)
+
links = "--"
- x = 0
- print("2")
while "=null:" not in links:
- if x >= 20:
- main.log.error("link check failure")
- break
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 debug: main.log.info(str(links))
time.sleep(1)
- x += 1
links = links.splitlines()
templinks = links
+
tempDevices = []
for line in links:
temp = line.split(" ")
@@ -215,8 +190,6 @@
temp[0] = (temp[0].split("/"))[0]
tempDevices.append(temp[0])
- print("3")
-
tempDevices.sort()
devices = []
for i in tempDevices:
@@ -224,44 +197,42 @@
devices.append(i.replace("src=", ""))
if debug: main.log.info(str(devices))
- print("4")
-
ingress = devices[0]
egress = devices.pop()
if debug: main.log.info(ingress)
if debug: main.log.info(egress)
- print("5")
-
for intentSize in intentsList:
cmd = "onos $OC1 push-test-intents "
cmd += ingress + "/6 "
cmd += egress + "/5 "
cmd += str(intentSize) + " 1"
- main.log.info("COMMAND: " + cmd)
installed = []
withdrawn = []
+
for run in range(0, (warmUp + sampleSize)):
if run > warmUp:
time.sleep(5)
+
myRawResult = "--"
while "ms" not in myRawResult:
main.ONOSbench.handle.sendline(cmd)
main.ONOSbench.handle.expect(":~")
myRawResult = main.ONOSbench.handle.before
- main.log.info(myRawResult)
+ if debug: main.log.info(myRawResult)
if debug: main.log.info(myRawResult)
+
if run >= warmUp:
myRawResult = myRawResult.splitlines()
for line in myRawResult:
if "install" in line:
- print(line)
installed.append(int(line.split(" ")[5]))
for line in myRawResult:
if "withdraw" in line:
withdrawn.append(int(line.split(" ")[5]))
+
print("installed: " + str(installed))
print("withraw: " + str(withdrawn) + "\n")
diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.topo b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.topo
index 30a1467..0e45e0f 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.topo
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.topo
@@ -3,7 +3,7 @@
<COMPONENT>
<ONOSbench>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosDriver</type>
@@ -12,7 +12,7 @@
</ONOSbench>
<ONOS1cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -21,7 +21,7 @@
</ONOS1cli>
<ONOS2cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -30,7 +30,7 @@
</ONOS2cli>
<ONOS3cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -39,7 +39,7 @@
</ONOS3cli>
<ONOS4cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -48,7 +48,7 @@
</ONOS4cli>
<ONOS5cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -57,7 +57,7 @@
</ONOS5cli>
<ONOS6cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -66,7 +66,7 @@
</ONOS6cli>
<ONOS7cli>
- <host>10.128.5.55</host>
+ <host>10.254.1.200</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -75,7 +75,7 @@
</ONOS7cli>
<ONOS1>
- <host>10.128.5.51</host>
+ <host>10.254.1.201</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -84,7 +84,7 @@
</ONOS1>
<ONOS2>
- <host>10.128.5.52</host>
+ <host>10.254.1.202</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -93,7 +93,7 @@
</ONOS2>
<ONOS3>
- <host>10.128.5.53</host>
+ <host>10.254.1.203</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -102,7 +102,7 @@
</ONOS3>
<ONOS4>
- <host>10.128.5.54</host>
+ <host>10.254.1.204</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -112,7 +112,7 @@
<ONOS5>
- <host>10.128.5.65</host>
+ <host>10.254.1.205</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -121,7 +121,7 @@
</ONOS5>
<ONOS6>
- <host>10.128.5.66</host>
+ <host>10.254.1.206</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -130,7 +130,7 @@
</ONOS6>
<ONOS7>
- <host>10.128.5.67</host>
+ <host>10.254.1.207</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>