commit 90d439507c13ffb7ce2e388afbd209bb3270a23b
author GlennRC <glenn@onlab.us> Tue Oct 27 11:36:15 2015 -0700
committer GlennRC <glenn@onlab.us> Tue Oct 27 11:36:15 2015 -0700
tree 915b9680efbd0b68e16ee9708b525bb1b70cf911
parent 384447f3e75c6bbac8d80a9afc364fc453552053

Printing out correct scale in each case

Change-Id: Ie813cb806c2794e2da55d2e331dd9281e08e9972

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
index e0f2f1a..4e29115 100644
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
@@ -247,15 +247,15 @@
             main.log.info( "Mininet was not running" )
 
         if main.topoScale:
-            scale = main.topoScale.pop(0)
+            main.currScale = main.topoScale.pop(0)
         else: main.log.error( "topology scale is empty" )
 
 
-        main.step( "Starting up TORUS %sx%s topology" % (scale, scale) )
+        main.step( "Starting up TORUS %sx%s topology" % (main.currScale, main.currScale) )
 
         main.log.info( "Constructing Mininet command" )
         mnCmd = " mn --custom " + main.Mininet1.home + main.multiovs +\
-                " --switch ovsm --topo " + main.topoName + ","+ scale + "," + scale
+                " --switch ovsm --topo " + main.topoName + ","+ main.currScale + "," + main.currScale
 
         for i in range( main.numCtrls ):
                 mnCmd += " --controller remote,ip=" + main.ONOSip[ i ]
@@ -352,9 +352,7 @@
         """
         import json
 
-        scale = main.topoScale[0]
-
-        main.case( "Verifying topology: TORUS %sx%s" % (scale, scale) )
+        main.case( "Verifying topology: TORUS %sx%s" % (main.currScale, main.currScale) )
         main.caseExplanation = "Pinging all hosts andcomparing topology " +\
                 "elements between Mininet and ONOS"
         main.step( "Pinging all hosts" )
@@ -438,9 +436,8 @@
         '''
             Balance masters, ping and bring third ONOS node down
         '''
-        scale = main.topoScale[0]
 
-        main.case("Balancing Masters and bring ONOS node 3 down: TORUS %sx%s" % (scale, scale))
+        main.case("Balancing Masters and bring ONOS node 3 down: TORUS %sx%s" % (main.currScale, main.currScale))
         main.caseExplanation = "Balance masters to make sure " +\
                         "each controller has some devices and " +\
                         "stop ONOS node 3 service. "
@@ -500,9 +497,7 @@
             Bring up onos node and balance masters
         '''
 
-        scale = main.topoScale[0]
-
-        main.case("Bring ONOS node 3 up and balance masters: TORUS %sx%s" % (scale, scale))
+        main.case("Bring ONOS node 3 up and balance masters: TORUS %sx%s" % (main.currScale, main.currScale))
         main.caseExplanation = "Bring node 3 back up and balance the masters"
 
         node = main.deadNode + 1