commit 2efa1e501ec63d34e560e7b0c364f66818acca8a
author Jon Hall <jhall@onlab.us> Fri Apr 18 16:30:45 2014 -0700
committer Jon Hall <jhall@onlab.us> Fri Apr 18 16:30:45 2014 -0700
tree f0d4dc7df3ce4c64b768b0df9d912892d856830f
parent 4a2b0487316165ebf3d9426e056f7bc989ce6056
parent 092ab8df56e181dc186fc998bed724f0f8635100

Merge branch 'master' of github.com:OPENNETWORKINGLAB/ONLabTest

TestON/logs/placeHolder.txt

diff --git a/TestON/logs/placeHolder.txt b/TestON/logs/placeHolder.txt
new file mode 100644
index 0000000..3b18e51
--- /dev/null
+++ b/TestON/logs/placeHolder.txt
@@ -0,0 +1 @@
+hello world

TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py

diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
index df7fcf5..f090d86 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
@@ -33,6 +33,7 @@
             main.ONOS2.git_compile()
             main.ONOS3.git_compile()
             main.ONOS4.git_compile()
+        main.ONOS1.print_version()    
        # main.RamCloud1.git_pull()
        # main.RamCloud2.git_pull()
        # main.RamCloud3.git_pull()

TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo

diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
index c7db047..0819d37 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.topo
@@ -2,7 +2,7 @@
 
     <COMPONENT>
         <Zookeeper1>
-            <host>10.128.100.1</host>
+            <host>10.128.4.151</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -12,7 +12,7 @@
         </Zookeeper1>
 
         <Zookeeper2>
-            <host>10.128.100.4</host>
+            <host>10.128.4.152</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -22,7 +22,7 @@
         </Zookeeper2>
 
         <Zookeeper3>
-            <host>10.128.100.5</host>
+            <host>10.128.4.153</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -32,7 +32,7 @@
         </Zookeeper3>
        
         <Zookeeper4>
-            <host>10.128.100.6</host>
+            <host>10.128.4.154</host>
             <user>admin</user>
             <password></password>
             <type>ZookeeperCliDriver</type>
@@ -42,7 +42,7 @@
         </Zookeeper4>
 
         <RamCloud1>
-            <host>10.128.100.1</host>
+            <host>10.128.4.151</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -52,7 +52,7 @@
         </RamCloud1>
 
         <RamCloud2>
-            <host>10.128.100.4</host>
+            <host>10.128.4.152</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -62,7 +62,7 @@
         </RamCloud2>
        
         <RamCloud3>
-            <host>10.128.100.5</host>
+            <host>10.128.4.153</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -72,7 +72,7 @@
         </RamCloud3>
        
         <RamCloud4>
-            <host>10.128.100.6</host>
+            <host>10.128.4.154</host>
             <user>admin</user>
             <password></password>
             <type>RamCloudCliDriver</type>
@@ -82,7 +82,7 @@
         </RamCloud4>
 
         <ONOS1>
-            <host>10.128.100.1</host>
+            <host>10.128.4.151</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -92,7 +92,7 @@
         </ONOS1>
 
         <ONOS2>
-            <host>10.128.100.4</host>
+            <host>10.128.4.152</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -102,7 +102,7 @@
         </ONOS2>
 
         <ONOS3>
-            <host>10.128.100.5</host>
+            <host>10.128.4.153</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -112,7 +112,7 @@
         </ONOS3>
        
         <ONOS4>
-            <host>10.128.100.6</host>
+            <host>10.128.4.154</host>
             <user>admin</user>
             <password></password>
             <type>OnosCliDriver</type>
@@ -122,7 +122,7 @@
         </ONOS4>
 
         <Mininet1>
-            <host>10.128.100.11</host>
+            <host>10.128.4.159</host>
             <user>admin</user>
             <password></password>
             <type>MininetCliDriver</type>