new startup
Change-Id: I0a60e89434cc5fcb9a2a3713d1d028aaf1d8f780
diff --git a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index 2e43679..896ef7f 100644
--- a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -3,7 +3,7 @@
<testcases>1,2,1,2,1,2,1,2</testcases>
<SCALE>1,3,5,7</SCALE>
- <availableNodes>7</availableNodes>
+ <max>7</max>
<ENV>
<cellName>intentRerouteCell</cellName>
@@ -65,12 +65,12 @@
</CTRL>
<MN>
- <ip1>OCN</ip1>
+ <ip1>localhost</ip1>
</MN>
<BENCH>
<user>admin</user>
- <ip1>OCN</ip1>
+ <ip1>localhost</ip1>
</BENCH>
<JSON>
diff --git a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index cc8892e..8bbf003 100644
--- a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -30,7 +30,9 @@
cellName = main.params[ 'ENV' ][ 'cellName' ]
Apps = main.params[ 'ENV' ][ 'cellApps' ]
BENCHUser = main.params[ 'BENCH' ][ 'user' ]
- maxNodes = int(main.params[ 'availableNodes' ])
+ BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
+ MN1Ip = main.params[ 'MN' ][ 'ip1' ]
+ main.maxNodes = int(main.params[ 'max' ])
skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
cellName = main.params[ 'ENV' ][ 'cellName' ]
@@ -78,18 +80,15 @@
clusterCount = int(scale[0])
scale.remove(scale[0])
- MN1Ip = ONOSIp[len(ONOSIp)-1]
- BENCHIp = ONOSIp[len(ONOSIp)-2]
-
#kill off all onos processes
main.log.step("Safety check, killing all ONOS processes")
main.log.step("before initiating enviornment setup")
- for node in range(1, maxNodes + 1):
+ for node in range(1, main.maxNodes + 1):
main.ONOSbench.onosDie(ONOSIp[node])
#Uninstall everywhere
main.log.step( "Cleaning Enviornment..." )
- for i in range(1, maxNodes + 1):
+ for i in range(1, main.maxNodes + 1):
main.log.info(" Uninstalling ONOS " + str(i) )
main.ONOSbench.onosUninstall( ONOSIp[i] )
@@ -98,8 +97,8 @@
cellIp = []
for node in range (1, clusterCount + 1):
cellIp.append(ONOSIp[node])
-
- main.ONOSbench.createCellFile(BENCHIp,cellName,MN1Ip,str(Apps), *cellIp)
+
+ main.ONOSbench.createCellFile(BENCHIp,cellName,MN1Ip,str(Apps), cellIp)
main.step( "Set Cell" )
main.ONOSbench.setCell(cellName)
@@ -342,8 +341,6 @@
main.ONOSbench.handle.sendline(cmd)
main.ONOSbench.handle.expect(":~")
-
-
#wait for intent withdraw
main.ONOSbench.handle.sendline(withdrawCmd)
main.log.info(withdrawCmd)
diff --git a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.topo b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
index d82f3fd..01370b6 100644
--- a/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
+++ b/TestON/tests/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
@@ -3,16 +3,19 @@
<COMPONENT>
<ONOSbench>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
- <COMPONENTS><home>~/onos</home></COMPONENTS>
+ <COMPONENTS>
+ <home>~/onos</home>
+ <nodes>7</nodes>
+ </COMPONENTS>
</ONOSbench>
<ONOS1cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -21,7 +24,7 @@
</ONOS1cli>
<ONOS2cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -30,7 +33,7 @@
</ONOS2cli>
<ONOS3cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -39,7 +42,7 @@
</ONOS3cli>
<ONOS4cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -48,7 +51,7 @@
</ONOS4cli>
<ONOS5cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -57,7 +60,7 @@
</ONOS5cli>
<ONOS6cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>
@@ -66,7 +69,7 @@
</ONOS6cli>
<ONOS7cli>
- <host>OCN</host>
+ <host>localhost</host>
<user>admin</user>
<password>onos_test</password>
<type>OnosCliDriver</type>