commit a0c1fe30be4b532a891156b7c26507f3dc50f952
author admin <jlee@onlab.us> Mon Aug 11 10:08:22 2014 -0700
committer admin <jlee@onlab.us> Mon Aug 11 10:08:22 2014 -0700
tree 17a1833349af3fb44cc433d4bfd4cb7d185a1410
parent ff18761ea11a92a5f1d22c10a9a062da4b20e31c

Change onos.properties -> onos.'hostname'.properties

TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py

diff --git a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
index d177f8b..c96ab77 100644
--- a/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
+++ b/TestON/tests/RCOnosSanity4nodesJ/RCOnosSanity4nodesJ.py
@@ -21,10 +21,10 @@
 #        main.print_hello_world()
         main.ONOS4.stop_all()
         main.ONOS2.stop_rest()
-        main.ONOS1.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.properties")
-        main.ONOS2.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.properties")
-        main.ONOS3.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.properties")
-        main.ONOS4.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.properties")        
+        main.ONOS1.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.sanity-rc-onos1.properties")
+        main.ONOS2.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.sanity-rc-onos2.properties")
+        main.ONOS3.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.sanity-rc-onos3.properties")
+        main.ONOS4.handle.sendline("cp ~/onos.properties.proactive ~/ONOS/conf/onos.sanity-rc-onos4.properties")        
         main.step("Start tcpdump on mn")
         main.Mininet2.start_tcpdump(main.params['tcpdump']['filename'], intf = main.params['tcpdump']['intf'], port = main.params['tcpdump']['port'])
         main.step("Start ONOS")
@@ -154,7 +154,6 @@
         main.Mininet1.get_sw_controller("s1")       
         time.sleep(30)
 
-        main.Zookeeper1.findMaster(switchDPID="00:00:00:00:00:00:10:00")
  
 # **********************************************************************************************************************************************************************************************
 #Add Flows
@@ -170,8 +169,7 @@
         strtTime = time.time()
         main.ONOS1.rm_intents()
         print("world")
-        main.ONOS1.add_intents()
-        time.sleep(2)
+        time.sleep(5)
         main.ONOS1.add_intents()
         print("hello")
        # main.ONOS1.add_flow(main.params['FLOWDEF']['testONip'],main.params['FLOWDEF']['user'],main.params['FLOWDEF']['password'],main.params['FLOWDEF']['flowDef'])

TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py

diff --git a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
index bebdf4b..2abd7df 100644
--- a/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
+++ b/TestON/tests/RRCOnosSanity4nodesJ/RRCOnosSanity4nodesJ.py
@@ -11,10 +11,10 @@
         import time
         main.case("Initial Setup")
         main.step("stop onos")
-        main.ONOS1.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
-        main.ONOS2.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
-        main.ONOS3.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
-        main.ONOS4.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.properties")
+        main.ONOS1.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.sanity-rc-onos1.properties")
+        main.ONOS2.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.sanity-rc-onos2.properties")
+        main.ONOS3.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.sanity-rc-onos3.properties")
+        main.ONOS4.handle.sendline("cp ~/onos.properties.reactive ~/ONOS/conf/onos.sanity-rc-onos4.properties")
         main.ONOS1.stop_all()        
         main.ONOS2.stop_all()        
         main.ONOS3.stop_all()