commit d39571223067979babbb567f9b42c059daef4d04
author santhosh <santhosh@onlab.us> Thu Aug 21 19:33:58 2014 -0700
committer santhosh <santhosh@onlab.us> Thu Aug 21 19:33:58 2014 -0700
tree 812b9d173046ca8e7c102f0d261b3645311fbc94
parent 483a41645eec956b38b13ea1df53055cfc0f7864

Changes to NB tests: Added sleep time untill intents are removed after delete intent operation.

TestON/tests/scaleONOS7nodes/scaleONOS7nodes.py

diff --git a/TestON/tests/scaleONOS7nodes/scaleONOS7nodes.py b/TestON/tests/scaleONOS7nodes/scaleONOS7nodes.py
index 075f9b3..2dbe03c 100644
--- a/TestON/tests/scaleONOS7nodes/scaleONOS7nodes.py
+++ b/TestON/tests/scaleONOS7nodes/scaleONOS7nodes.py
@@ -326,7 +326,7 @@
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s5 tcp:10.128.10.3:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s6 tcp:10.128.10.3:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s7 tcp:10.128.10.3:6633")
-
+        
         main.ONOS3.handle.sendline("cd ~admin/suibin-dev")
         main.ONOS3.handle.expect("\$")
 
@@ -713,7 +713,7 @@
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s5 tcp:10.128.10.1:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s6 tcp:10.128.10.2:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s7 tcp:10.128.10.4:6633")
-
+        
         main.ONOS3.handle.sendline("cd ~admin/suibin-dev")
         main.ONOS3.handle.expect("\$")
 
@@ -786,7 +786,7 @@
         
 
         main.ONOS3.handle.expect("\$", timeout=900)
-        time.sleep(120)
+        time.sleep(180)
     
     def CASE51(self,main):
         main.case("Starting SB test for 5 nodes")
@@ -977,7 +977,7 @@
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s5 tcp:10.128.10.5:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s6 tcp:10.128.10.3:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s7 tcp:10.128.10.5:6633")
-
+        
         main.ONOS3.handle.sendline("cd ~admin/suibin-dev")
         main.ONOS3.handle.expect("\$")
 
@@ -1054,8 +1054,8 @@
         
 
         main.ONOS3.handle.expect("\$", timeout=900)
-        time.sleep(120)
-
+        time.sleep(180)
+    
     def CASE61(self,main):
         main.case("Starting SB test for 5 nodes")
         ip1 = main.params['CTRL']['ip1']
@@ -1254,7 +1254,7 @@
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s5 tcp:10.128.10.5:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s6 tcp:10.128.10.6:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s7 tcp:10.128.10.6:6633")
-
+        
         main.ONOS3.handle.sendline("cd ~admin/suibin-dev")
         main.ONOS3.handle.expect("\$")
 
@@ -1335,7 +1335,8 @@
         
 
         main.ONOS3.handle.expect("\$", timeout=900)
-
+        time.sleep(180)
+    
     def CASE71(self,main):
         main.case("Starting SB test for 7 nodes")
         ip1 = main.params['CTRL']['ip1']
@@ -1544,7 +1545,7 @@
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s5 tcp:10.128.10.5:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s6 tcp:10.128.10.6:6633")
         main.Mininet4.handle.sendline("sudo ovs-vsctl set-controller s7 tcp:10.128.10.7:6633")
-
+        
         main.ONOS3.handle.sendline("cd ~admin/suibin-dev")
         main.ONOS3.handle.expect("\$")
 
@@ -1627,8 +1628,8 @@
         
 
         main.ONOS3.handle.expect("\$", timeout=900)
-        time.sleep(120)
-
+        time.sleep(180)
+    
     def CASE8(self,main):
         import time
         main.case("Scaling ONOS down to 6 ONOS instances")
@@ -1771,7 +1772,7 @@
         import time
         main.case("Posting the results to http://10.128.5.54/scale.html ....")
         db_script = main.params['db_script']
-        os.system(db_script + " -n='1000IntentsScaleDown" + "' -rate3='" + str(nbtpavg7n) + "' -rate4='" + str(nbtpavg6n) + "' -rate5='" + str(nbtpavg5n) + "' -rate6='" + str(nbtpavg4n) + "' -rate7='" + str(nbtpavg3n) + "' -table='onos_scale'")
+        os.system(db_script + " -n='1000IntentsScaleDown" + "' -rate3='" + str(nbtpavg3n) + "' -rate4='" + str(nbtpavg4n) + "' -rate5='" + str(nbtpavg5n) + "' -rate6='" + str(nbtpavg6n) + "' -rate7='" + str(nbtpavg7n) + "' -table='onos_scale'")