replace switch assignment scripts with Mininet commands
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
index 04a4142..819c584 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.params
@@ -6,4 +6,14 @@
<RestIP>10.128.4.151</RestIP>
<NR_Switches>100</NR_Switches>
<NR_Links>198</NR_Links>
+ <CTRL>
+ <ip1>10.128.4.151</ip1>
+ <port1>6633</port1>
+ <ip2>10.128.4.152</ip2>
+ <port2>6633</port2>
+ <ip3>10.128.4.153</ip3>
+ <port3>6633</port3>
+ <ip4>10.128.4.154</ip4>
+ <port4>6633</port4>
+ </CTRL>
</PARAMS>
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
index 9e6cb7b..c9c83de 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.py
@@ -30,7 +30,6 @@
main.RamCloud2.del_db()
main.RamCloud3.del_db()
main.RamCloud4.del_db()
- time.sleep(10)
main.RamCloud1.start_coor()
time.sleep(10)
@@ -63,6 +62,10 @@
main.RamCloud2.stop_serv()
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
time.sleep(5)
@@ -104,7 +107,8 @@
main.case("Timing Onos Convergence for switch -> a single ONOS node in the cluster")
main.step("Bringing ONOS down...")
main.log.info("all switch no controllers")
- main.Mininet1.ctrl_none()
+ for i in range(1,int(main.params['NR_Switches'])+1):
+ main.Mininet1.delete_sw_controller("s"+i)
main.log.info("bringing ONOS down")
main.ONOS1.stop()
main.ONOS2.stop()
@@ -115,6 +119,10 @@
main.RamCloud2.stop_serv()
main.RamCloud3.stop_serv()
main.RamCloud4.stop_serv()
+ main.RamCloud1.del_db()
+ main.RamCloud2.del_db()
+ main.RamCloud3.del_db()
+ main.RamCloud4.del_db()
time.sleep(5)
@@ -130,14 +138,20 @@
main.ONOS2.start()
main.ONOS3.start()
main.ONOS4.start()
+ time.sleep(10)
main.ONOS1.isup()
main.ONOS2.isup()
main.ONOS3.isup()
main.ONOS4.isup()
main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
+
main.log.info("Pointing the Switches at ONE controller... then BEGIN time")
- main.Mininet1.ctrl_local()
- t1 = time.time()
+ for i in range(1,int(main.params['NR_Switches'])+1):
+ main.Mininet1.assign_sw_controller(sw=str(i),ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'])
+
+
+
+ t1 = time.time()
for i in range(15) :
result = main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
if result == 1 :
@@ -172,7 +186,8 @@
main.case("Timing Onos Convergence for switch -> all ONOS nodes in cluster")
main.step("Bringing ONOS down...")
main.log.info("all switch no controllers")
- main.Mininet1.ctrl_none()
+ for i in range(1,int(main.params['NR_Switches'])+1):
+ main.Mininet1.delete_sw_controller("s"+i)
main.log.info("bringing ONOS down")
main.ONOS1.stop()
main.ONOS2.stop()
@@ -194,7 +209,8 @@
main.ONOS4.isup()
main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
main.log.info("Pointing the Switches at ALL controllers... then BEGIN time")
- main.Mininet1.ctrl_all()
+ for i in range(1,int(main.params['NR_Switches'])+1):
+ main.Mininet1.assign_sw_controller(sw=str(i),count=4,ip1=main.params['CTRL']['ip1'],port1=main.params['CTRL']['port1'],ip2=main.params['CTRL']['ip2'],port2=main.params['CTRL']['port2'],ip3=main.params['CTRL']['ip3'],port3=main.params['CTRL']['port3'],ip4=main.params['CTRL']['ip4'],port4=main.params['CTRL']['port4'])
t1 = time.time()
for i in range(15) :
result = main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
@@ -230,7 +246,8 @@
main.case("Timing Onos Convergence for even single controller distribution")
main.step("Bringing ONOS down...")
main.log.info("all switch no controllers")
- main.Mininet1.ctrl_none()
+ for i in range(1,):
+ main.Mininet1.delete_sw_controller("s"+i)
main.log.info("bringing ONOS down")
main.ONOS1.stop()
main.ONOS2.stop()
@@ -251,8 +268,17 @@
main.ONOS3.isup()
main.ONOS4.isup()
main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
+
+
main.log.info("Pointing the Switches to alternating controllers... then BEGIN time")
- main.Mininet1.ctrl_divide()
+ count = 0
+ for i in range(1,int(main.params['NR_Switches'])+1):
+ num = count % len(4)
+ #num = count % len(controllers) #TODO: check number of controllers in cluster
+ main.Mininet1.assign_sw_controller(sw=str(i),ip1=main.params['CTRL']['ip'+str(num)],port1=main.params['CTRL']['port'+str(num)])
+ count = count + 1
+
+
t1 = time.time()
for i in range(15) :
result = main.ONOS1.check_status(main.params['RestIP'],main.params['NR_Switches'],main.params['NR_Links'])
diff --git a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.topo b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.topo
index bedf671..5c97a42 100644
--- a/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.topo
+++ b/TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.topo
@@ -6,28 +6,28 @@
<user>admin</user>
<password></password>
<type>OnosCliDriver</type>
- <connect_order>6</connect_order>
+ <connect_order>9</connect_order>
</ONOS1>
<ONOS2>
<host>10.128.4.152</host>
<user>admin</user>
<password></password>
<type>OnosCliDriver</type>
- <connect_order>7</connect_order>
+ <connect_order>10</connect_order>
</ONOS2>
<ONOS3>
<host>10.128.4.153</host>
<user>admin</user>
<password></password>
<type>OnosCliDriver</type>
- <connect_order>8</connect_order>
+ <connect_order>11</connect_order>
</ONOS3>
<ONOS4>
<host>10.128.4.154</host>
<user>admin</user>
<password></password>
<type>OnosCliDriver</type>
- <connect_order>9</connect_order>
+ <connect_order>12</connect_order>
</ONOS4>
<Zookeeper1>
@@ -40,33 +40,66 @@
</COMPONENTS>
</Zookeeper1>
+ <Zookeeper2>
+ <host>10.128.4.152</host>
+ <user>admin</user>
+ <password></password>
+ <type>ZookeeperCliDriver</type>
+ <connect_order>2</connect_order>
+ <COMPONENTS>
+ </COMPONENTS>
+ </Zookeeper2>
+
+
+ <Zookeeper3>
+ <host>10.128.4.153</host>
+ <user>admin</user>
+ <password></password>
+ <type>ZookeeperCliDriver</type>
+ <connect_order>3</connect_order>
+ <COMPONENTS>
+ </COMPONENTS>
+ </Zookeeper3>
+
+
+ <Zookeeper4>
+ <host>10.128.4.154</host>
+ <user>admin</user>
+ <password></password>
+ <type>ZookeeperCliDriver</type>
+ <connect_order>4</connect_order>
+ <COMPONENTS>
+ </COMPONENTS>
+ </Zookeeper4>
+
+
<RamCloud1>
<host>10.128.4.151</host>
<user>admin</user>
<password></password>
<type>RamCloudCliDriver</type>
- <connect_order>2</connect_order>
+ <connect_order>5</connect_order>
</RamCloud1>
<RamCloud2>
<host>10.128.4.152</host>
<user>admin</user>
<password></password>
<type>RamCloudCliDriver</type>
- <connect_order>3</connect_order>
+ <connect_order>6</connect_order>
</RamCloud2>
<RamCloud3>
<host>10.128.4.153</host>
<user>admin</user>
<password></password>
<type>RamCloudCliDriver</type>
- <connect_order>4</connect_order>
+ <connect_order>7</connect_order>
</RamCloud3>
<RamCloud4>
<host>10.128.4.154</host>
<user>admin</user>
<password></password>
<type>RamCloudCliDriver</type>
- <connect_order>5</connect_order>
+ <connect_order>8</connect_order>
</RamCloud4>
<Mininet1>
@@ -74,7 +107,7 @@
<user>admin</user>
<password></password>
<type>MininetCliDriver</type>
- <connect_order>10</connect_order>
+ <connect_order>13</connect_order>
<COMPONENTS>
# Specify the Option for mininet
<arg1> </arg1>