Merge branch 'master' of https://github.com/OPENNETWORKINGLAB/ONLabTest into scale_out
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 7032dff..41d65a6 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -882,7 +882,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 50 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 50 )
main.cleanup()
main.exit()
@@ -1250,7 +1250,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 50 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 50 )
main.cleanup()
main.exit()
@@ -1269,7 +1269,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 50 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 50 )
main.cleanup()
main.exit()
diff --git a/TestON/drivers/common/cli/emulator/remotemininetdriver.py b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
index e2e00e1..f5982bf 100644
--- a/TestON/drivers/common/cli/emulator/remotemininetdriver.py
+++ b/TestON/drivers/common/cli/emulator/remotemininetdriver.py
@@ -326,7 +326,7 @@
except:
main.log.info(
self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 80 )
main.cleanup()
main.exit()
@@ -346,7 +346,7 @@
except:
main.log.info(
self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 80 )
main.cleanup()
main.exit()
@@ -577,7 +577,7 @@
self.name +
": Timeout exception in setIpTables function" )
except:
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.cleanup()
main.exit()
else:
@@ -620,7 +620,7 @@
self.name +
": Timeout exception in setIpTables function" )
except:
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.cleanup()
main.exit()
else:
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 983b874..b05a132 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -68,7 +68,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 30 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 30 )
main.cleanup()
main.exit()
@@ -215,7 +215,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 60 )
main.cleanup()
main.exit()
@@ -323,7 +323,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 80 )
main.cleanup()
main.exit()
@@ -438,7 +438,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 80 )
main.cleanup()
main.exit()
@@ -491,7 +491,7 @@
main.exit()
except:
main.log.info( self.name + ":" * 60 )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":" * 80 )
main.cleanup()
main.exit()
@@ -576,7 +576,7 @@
main.exit()
except:
main.log.info( self.name + ":::::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( ":::::::" )
main.cleanup()
main.exit()
@@ -615,7 +615,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -650,7 +650,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -711,7 +711,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -766,7 +766,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -804,7 +804,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -842,7 +842,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -871,7 +871,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -904,7 +904,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -950,7 +950,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -987,7 +987,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1026,7 +1026,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1060,7 +1060,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1124,7 +1124,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1172,7 +1172,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1242,7 +1242,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1367,7 +1367,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
@@ -1429,7 +1429,7 @@
except:
main.log.error( "Copying files failed" )
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
def checkLogs( self, onosIp ):
@@ -1451,7 +1451,7 @@
except:
main.log.error( "Some error in check_logs:" )
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
def onosStatus( self, node="" ):
@@ -1485,7 +1485,7 @@
main.exit()
except:
main.log.info( self.name + " ::::::" )
- main.log.error( traceback.printExc() )
+ main.log.error( traceback.print_exc() )
main.log.info( self.name + " ::::::" )
main.cleanup()
main.exit()
diff --git a/TestON/tests/LincOETest/LincOETest.topo b/TestON/tests/LincOETest/LincOETest.topo
index 9881845..5d572ca 100755
--- a/TestON/tests/LincOETest/LincOETest.topo
+++ b/TestON/tests/LincOETest/LincOETest.topo
@@ -20,7 +20,7 @@
</ONOScli>
<ONOS1>
- <host>10.128.174.1<</host>
+ <host>10.128.174.1</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
diff --git a/TestON/tests/PingallExample/PingallExample.params b/TestON/tests/PingallExample/PingallExample.params
index 8d0d10b..aecaab6 100644
--- a/TestON/tests/PingallExample/PingallExample.params
+++ b/TestON/tests/PingallExample/PingallExample.params
@@ -1,12 +1,12 @@
<PARAMS>
<testcases>1,2,3</testcases>
<ENV>
- <cellName>kelvin</cellName>
+ <cellName>HA</cellName>
</ENV>
<Git>True</Git>
<CTRL>
- <ip1>10.128.10.21</ip1>
+ <ip1>10.128.30.11</ip1>
<port1>6633</port1>
</CTRL>
</PARAMS>
diff --git a/TestON/tests/PingallExample/PingallExample.topo b/TestON/tests/PingallExample/PingallExample.topo
index dba7a5d..1712756 100644
--- a/TestON/tests/PingallExample/PingallExample.topo
+++ b/TestON/tests/PingallExample/PingallExample.topo
@@ -2,7 +2,7 @@
<COMPONENT>
<ONOSbench>
- <host>10.128.10.20</host>
+ <host>10.128.30.10</host>
<user>admin</user>
<password></password>
<type>OnosDriver</type>
@@ -11,7 +11,7 @@
</ONOSbench>
<ONOScli1>
- <host>10.128.10.20</host>
+ <host>10.128.30.10</host>
<user>admin</user>
<password></password>
<type>OnosCliDriver</type>
@@ -20,16 +20,16 @@
</ONOScli1>
<ONOS1>
- <host>10.128.10.21</host>
- <user>admin</user>
- <password></password>
+ <host>10.128.30.11</host>
+ <user>sdn</user>
+ <password>rocks</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1>
<Mininet1>
- <host>10.128.10.20</host>
+ <host>10.128.30.9</host>
<user>admin</user>
<password></password>
<type>MininetCliDriver</type>
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.params b/TestON/tests/TopoPerfNext/TopoPerfNext.params
index 08a3158..851522c 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.params
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.params
@@ -2,7 +2,7 @@
<testcases>1,2,3</testcases>
<ENV>
- <cellName>kelvin2</cellName>
+ <cellName>topo_perf_test</cellName>
</ENV>
<GIT>
@@ -13,21 +13,21 @@
<CTRL>
<user>admin</user>
- <ip1>10.128.10.21</ip1>
+ <ip1>10.128.174.1</ip1>
<port1>6633</port1>
- <ip2>10.128.10.22</ip2>
+ <ip2>10.128.174.2</ip2>
<port2>6633</port2>
- <ip3>10.128.10.23</ip3>
+ <ip3>10.128.174.3</ip3>
<port3>6633</port3>
</CTRL>
<MN>
- <ip1>10.128.10.24</ip1>
- <ip2>10.128.10.24</ip2>
+ <ip1>10.128.10.90</ip1>
+ <ip2>10.128.10.91</ip2>
</MN>
<BENCH>
- <ip>10.128.10.20</ip>
+ <ip>10.128.174.10</ip>
</BENCH>
<TEST>
diff --git a/TestON/tests/TopoPerfNext/TopoPerfNext.topo b/TestON/tests/TopoPerfNext/TopoPerfNext.topo
index 896e991..4ee44e2 100644
--- a/TestON/tests/TopoPerfNext/TopoPerfNext.topo
+++ b/TestON/tests/TopoPerfNext/TopoPerfNext.topo
@@ -2,72 +2,72 @@
<COMPONENT>
<ONOSbench>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOSbench>
<ONOS1cli>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1cli>
<ONOS2cli>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS2cli>
<ONOS3cli>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS3cli>
<ONOS1>
- <host>10.128.10.21</host>
+ <host>10.128.174.1</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1>
<ONOS2>
- <host>10.128.10.22</host>
+ <host>10.128.174.2</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS2>
<ONOS3>
- <host>10.128.10.23</host>
+ <host>10.128.174.3</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS3>
<Mininet1>
- <host>10.128.10.24</host>
+ <host>10.128.10.90</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>MininetCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -79,9 +79,9 @@
</Mininet1>
<Mininet2>
- <host>10.128.10.24</host>
+ <host>10.128.10.90</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>RemoteMininetDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
diff --git a/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.params b/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.params
index 0db0459..f797706 100644
--- a/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.params
+++ b/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.params
@@ -2,7 +2,7 @@
<testcases>1,2,3,4,5</testcases>
<ENV>
- <cellName>kelvin2</cellName>
+ <cellName>topo_perf_test</cellName>
</ENV>
<GIT>
@@ -13,21 +13,21 @@
<CTRL>
<user>admin</user>
- <ip1>10.128.10.21</ip1>
+ <ip1>10.128.174.1</ip1>
<port1>6633</port1>
- <ip2>10.128.10.22</ip2>
+ <ip2>10.128.174.2</ip2>
<port2>6633</port2>
- <ip3>10.128.10.23</ip3>
+ <ip3>10.128.174.3</ip3>
<port3>6633</port3>
</CTRL>
<MN>
- <ip1>10.128.10.20</ip1>
- <ip2>10.128.10.25</ip2>
+ <ip1>10.128.10.90</ip1>
+ <ip2>10.128.10.91</ip2>
</MN>
<BENCH>
- <ip>10.128.10.20</ip>
+ <ip>10.128.174.10</ip>
</BENCH>
<TEST>
diff --git a/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.topo b/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.topo
index ecf46d3..3fc7bdc 100644
--- a/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.topo
+++ b/TestON/tests/TopoPerfNextSingleNode/TopoPerfNextSingleNode.topo
@@ -2,36 +2,36 @@
<COMPONENT>
<ONOSbench>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>1</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOSbench>
<ONOS1cli>
- <host>10.128.10.20</host>
+ <host>10.128.174.10</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1cli>
<ONOS1>
- <host>10.128.20.21</host>
+ <host>10.128.174.1</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>OnosDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
</ONOS1>
<Mininet1>
- <host>10.128.10.20</host>
+ <host>10.128.10.90</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>MininetCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS>
@@ -43,9 +43,9 @@
</Mininet1>
<Mininet2>
- <host>10.128.10.25</host>
+ <host>10.128.10.90</host>
<user>admin</user>
- <password></password>
+ <password>onos_test</password>
<type>RemoteMininetDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>