commit e00b7e410c38d0fec45925591de1711415aa408c
author Jon Hall <jhall@onlab.us> Fri May 23 12:00:33 2014 -0700
committer admin <jlee@onlab.us> Fri May 23 12:00:33 2014 -0700
tree 03c4ecaf543c1dd05bd237fe30d15f46d1460d78
parent 6c652340235d3b7f831211fd02a106236bd9ae3f

replace switch assignment scripts with Mininet commands

TestON/tests/RCOnosScale4nodes/RCOnosScale4nodes.topo

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>