commit f33b45cd68ede4fbd76a999edc7242fe9ab76402
author cameron@onlab.us <cameron@onlab.us> Wed May 06 13:54:46 2015 -0700
committer cameron@onlab.us <cameron@onlab.us> Wed May 06 13:54:46 2015 -0700
tree e5be1c434912e1e7811f9f76ccaa475c8280032d
parent 88fed17665952c5f454df2e88d74a49796f8eec0

updates

TestON/tests/IntentEventTP/IntentEventTP.params

diff --git a/TestON/tests/IntentEventTP/IntentEventTP.params b/TestON/tests/IntentEventTP/IntentEventTP.params
index fb2e625..9cfae7f 100644
--- a/TestON/tests/IntentEventTP/IntentEventTP.params
+++ b/TestON/tests/IntentEventTP/IntentEventTP.params
@@ -6,10 +6,10 @@
 
     <ENV>
     <cellName>intentTP</cellName>
-    <cellApps>null,intentperf</cellApps>
+    <cellApps>drivers,null,intentperf</cellApps>
     </ENV>
 
-    <SCALE>1,3,5,7</SCALE>
+    <SCALE>5,7</SCALE>
     <availableNodes>7</availableNodes>
 
     <GIT>
@@ -53,11 +53,11 @@
         <loadFrom>1,1,1,1,1,1,1</loadFrom>                                     #generate load on server, 1 = generator on 
         <numSwitches>10,10,10,10,10,10,10</numSwitches>
         <skipCleanInstall>yes</skipCleanInstall>
-        <duration>30</duration>
+        <duration>900</duration>
         <log_interval>20</log_interval>
         <numKeys>5000</numKeys>
         <cyclePeriod>1000</cyclePeriod>
-        <neighbors>0,a</neighbors>           #a == all nodes (-1)
+        <neighbors>a</neighbors>           #a == all nodes (-1)
     </TEST>
 
     <METRICS>

TestON/tests/IntentEventTP/IntentEventTP.py

diff --git a/TestON/tests/IntentEventTP/IntentEventTP.py b/TestON/tests/IntentEventTP/IntentEventTP.py
index 0e8af7d..6aea7b0 100644
--- a/TestON/tests/IntentEventTP/IntentEventTP.py
+++ b/TestON/tests/IntentEventTP/IntentEventTP.py
@@ -133,17 +133,38 @@
 
         time.sleep(20)
 
-        #main.ONOSbench.handle.sendline("""onos $OC1 "cfg setorg.onosproject.provider.nil.NullProviders enabled true" """)
-        #main.ONOSbench.handle.expect(":~")
-        #print main.ONOSbench.handle.before
+
+        for i in range (0,5): 
+            main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders deviceCount """ + str(clusterCount*10) + """ " """)
+            main.ONOSbench.handle.expect(":~")
+            main.ONOSbench.handle.sendline("""onos $OC1 "cfg get org.onosproject.provider.nil.NullProviders" """)
+            main.ONOSbench.handle.expect(":~")
+            if ("value=" + str(clusterCount*10)) in main.ONOSbench.handle.before:
+                main.log.info("Device count set")
+                main.log.info("before" + main.ONOSbench.handle.before)
+                break
+            time.sleep(10)
+            main.log.info("cfg set failure, retrying")
+            main.log.info("before" + main.ONOSbench.handle.before)
         
-        main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders deviceCount """ + str(clusterCount*10) + """ " """)
-        main.ONOSbench.handle.expect(":~")
-        print main.ONOSbench.handle.before
-        time.sleep(10)
-        main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders topoShape linear" """)
-        main.ONOSbench.handle.expect(":~")
-        print main.ONOSbench.handle.before
+        x = 1
+        while True:
+            if x >= 6:
+                main.log.error("Null provider start failure, TEST INVALID")
+                break
+            main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders topoShape linear" """)
+            main.ONOSbench.handle.expect(":~")
+            main.ONOSbench.handle.sendline("""onos $OC1 "cfg get org.onosproject.provider.nil.NullProviders" """)
+            main.ONOSbench.handle.expect(":~")
+            if ("value=linear") in main.ONOSbench.handle.before:
+                main.log.info("Device count set")
+                main.log.info("before" + main.ONOSbench.handle.before)
+                break
+            time.sleep(10)
+            main.log.info("cfg set failure, retrying")
+            main.log.info("before" + main.ONOSbench.handle.before)
+            x += 1
+
         time.sleep(10)
         main.ONOSbench.handle.sendline("""onos $OC1 "null-simulation start" """)
         main.ONOSbench.handle.expect(":~")
@@ -156,9 +177,10 @@
         lastOutput = "--"
         origin = time.time()
         clockStarted = False
-        while True:
+        for i in range (0,8):
             main.ONOSbench.handle.sendline("onos $OC1 summary")
             main.ONOSbench.handle.expect(":~")
+            main.log.info("before" + main.ONOSbench.handle.before)
             clusterCheck = ((main.ONOSbench.handle.before).splitlines())[3]
             print("\nBefore: " + str(clusterCheck))
             if ("SCC(s)=1,") in clusterCheck:
@@ -205,7 +227,7 @@
         for n in neighbors:
             main.log.info("Run with " + n + " neighbors") 
             time.sleep(5)
-            main.ONOSbench.handle.sendline("onos $OC1 cfg set org.onosproject.intentperf.IntentPerfInstaller numKeys " + numKeys )
+            main.ONOSbench.handle.sendline("onos $OC1 cfg set org.onosproject.intentperf.IntentPerfInstaller numKeys " + numKeysn)
             main.ONOSbench.handle.expect(":~")
             main.ONOSbench.handle.sendline("onos $OC1 cfg set org.onosproject.intentperf.IntentPerfInstaller numNeighbors " + n ) 
             main.ONOSbench.handle.expect(":~")