commit c80a8c8685723f7f41b85ec8f8929faaa38faf54
author cameron@onlab.us <cameron@onlab.us> Wed Apr 15 14:57:37 2015 -0700
committer cameron@onlab.us <cameron@onlab.us> Wed Apr 15 14:57:37 2015 -0700
tree 556dc2514a6ce88ad328ea95f5c664f000ce6ebb
parent 1656279bd45ee4ae54920d627a64a103dd1fa77b

Updates for new null provider and some test renaming

TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py

diff --git a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
index 6d0e2b3..be8f38c 100644
--- a/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
+++ b/TestON/tests/IntentInstallWithdrawLat/IntentInstallWithdrawLat.py
@@ -42,7 +42,8 @@
             global clusterCount             #number of nodes running
             global ONOSIp                   #list of ONOS IP addresses
             global scale 
-            
+            global commit            
+    
             clusterCount = 0
             ONOSIp = [ 0 ]
             scale = (main.params[ 'SCALE' ]).split(",")            
@@ -67,7 +68,13 @@
                 checkoutResult = main.TRUE
                 pullResult = main.TRUE
                 main.log.info( "Skipped git checkout and pull" )
-        
+       
+            commit = main.ONOSbench.getVersion()
+            commit = (commit.split(" "))[1]
+
+            resultsDB = open("IntentInstallWithdrawLatDB", "w+")
+            resultsDB.close()
+
         # -- END OF INIT SECTION --#
          
         clusterCount = int(scale[0])
@@ -96,8 +103,6 @@
         main.step( "Set Cell" )
         main.ONOSbench.setCell(cellName)
         
-        main.ONOSbench.createLinkGraphFile(BENCHIp, cellIp, switchCount)        
-
         main.step( "Creating ONOS package" )
         packageResult = main.ONOSbench.onosPackage()  
 
@@ -120,8 +125,24 @@
 
         main.ONOS1cli.startOnosCli( ONOSIp[1] )
         main.log.info("Startup sequence complete")
+        
+        time.sleep(30)
 
-        main.ONOSbench.configNullDev(cellIp, switchCount) 
+        main.ONOSbench.handle.sendline("""onos $OC1 "cfg setorg.onosproject.provider.nil.NullProviders enabled true" """)
+        main.ONOSbench.handle.expect(":~")
+        print main.ONOSbench.handle.before
+        main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders deviceCount """ + str(switchCount) + """ " """)
+        main.ONOSbench.handle.expect(":~")
+        print main.ONOSbench.handle.before
+        main.ONOSbench.handle.sendline("""onos $OC1 "cfg set org.onosproject.provider.nil.NullProviders topoShape linear" """)
+        main.ONOSbench.handle.expect(":~")
+        print main.ONOSbench.handle.before
+        main.ONOSbench.handle.sendline("""onos $OC1 "null-simulation start" """)
+        main.ONOSbench.handle.expect(":~")
+        print main.ONOSbench.handle.before
+        main.ONOSbench.handle.sendline("""onos $OC1 "balance-masters" """)
+        main.ONOSbench.handle.expect(":~")
+        print main.ONOSbench.handle.before
 
     def CASE2( self, main ):
          
@@ -224,3 +245,13 @@
             main.log.report("Withdraw standard deviation: " + str(numpy.std(withdrawn)))
             main.log.report("     ")
 
+            resultString = "'" + commit + "',"
+            resultString += str(clusterCount) + ","
+            resultString += str(intentSize) + ","
+            resultString += str(numpy.mean(installed)) + ","
+            resultString += str(numpy.std(installed)) + ","
+            resultString += str(numpy.mean(withdrawn)) + ","
+            resultString += str(numpy.std(withdrawn)) + "\n"
+            resultsDB = open("IntentInstallWithdrawLatDB", "w+")
+            resultsDB.write(resultString)
+            resultsDB.close()