commit 8f545df5a09775362cee3f661fe55d82d00b6d7a
author GlennRC <glenn@onlab.us> Fri Aug 28 09:26:38 2015 -0700
committer GlennRC <glenn@onlab.us> Fri Aug 28 14:00:36 2015 -0700
tree 5a669028738699aaac646f811be47f6013f8b756
parent 9882f35479869dd67f0eb7227db301258d3fe97f

Parameterized topo size

Change-Id: I430eb9f385831751d2d00569b8961aaefbeded0f

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
index e2b0a72..c593a74 100755
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
@@ -14,10 +14,12 @@
         <wrapper3>topo</wrapper3>
         <topology>spine.py</topology>
         <multiovs>multiovs.py</multiovs>
+        <spine>spine,3,6</spine>
+        <torus>torus,5,5</torus>
     </DEPENDENCY>
 
     <ENV>
-        <cellApps>drivers,openflow,proxyarp,mobility</cellApps>
+        <cellApps>drivers,openflow,fwd</cellApps>
     </ENV>
 
     <GIT>

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
index 95edf25..5e391d6 100644
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
@@ -35,6 +35,8 @@
                                   main.params[ 'DEPENDENCY' ][ 'path' ]
             main.topology = main.params[ 'DEPENDENCY' ][ 'topology' ]
             main.multiovs = main.params[ 'DEPENDENCY' ][ 'multiovs' ]
+            main.torus = main.params[ 'DEPENDENCY' ][ 'torus' ]
+            main.spine = main.params[ 'DEPENDENCY' ][ 'spine' ]
             main.scale = ( main.params[ 'SCALE' ][ 'size' ] ).split( "," )
             if main.ONOSbench.maxNodes:
                 main.maxNodes = int( main.ONOSbench.maxNodes )
@@ -79,13 +81,13 @@
                                               main.topology,
                                               main.Mininet1.home,
                                               direction="to" )
-
+            time.sleep(3)
             copyResult2 = main.ONOSbench.scp( main.Mininet1,
                                               main.dependencyPath +
                                               main.multiovs,
                                               main.Mininet1.home,
                                               direction="to" )
-
+            time.sleep(3)
             if main.CLIs:
                 stepResult = main.TRUE
             else:
@@ -189,7 +191,7 @@
 
 
         # Remove the first element in main.scale list
-        main.scale.remove( main.scale[ 0 ] )
+        #main.scale.remove( main.scale[ 0 ] )
 
     def CASE8( self, main ):
         """
@@ -307,7 +309,7 @@
         mnCmd = "sudo mn --custom " + main.dependencyPath +\
                 main.multiovs + " --switch=ovsm --custom " +\
                 main.dependencyPath + main.topology +\
-                " --topo spine,3,6 --controller=remote,ip=" +\
+                " --topo " + main.spine + " --controller=remote,ip=" +\
                 main.ONOSip[ 0 ] + " --mac"
 
         stepResult = main.scaleTopoFunction.testTopology( main,
@@ -315,6 +317,7 @@
                                                           timeout=900,
                                                           clean=False )
 
+        time.sleep(3)
         main.ONOSbench.scp( main.Mininet1,
                            "~/mininet/custom/spine.json",
                            "/tmp/",
@@ -327,8 +330,8 @@
 
         utilities.assert_equals( expect=main.TRUE,
                                  actual=stepResult,
-                                 onpass=main.topoName + " topology successful",
-                                 onfail=main.topoName +
+                                 onpass=main.spine + " topology successful",
+                                 onfail=main.spine +
                                  "Spine topology failed" )
         time.sleep(60)
 
@@ -336,18 +339,18 @@
         """
             Topology test
         """
-        main.topoName = "TORUS28-28"
+        main.topoName = "TORUS"
         main.case( "Topology discovery test" )
         stepResult = main.TRUE
-        main.step( main.topoName + " topology" )
+        main.step( main.torus + " topology" )
         mnCmd = "sudo mn --custom=mininet/custom/multiovs.py " +\
-                "--switch=ovsm --topo=torus,28,28 " +\
-                "--controller=remote,ip=" + main.ONOSip[ 0 ]  +" --mac"
+                "--switch=ovsm --topo " + main.torus +\
+                " --controller=remote,ip=" + main.ONOSip[ 0 ]  +" --mac"
         stepResult = main.scaleTopoFunction.testTopology( main,
                                                           mnCmd=mnCmd,
                                                           timeout=900,
-                                                          clean=True )
+                                                          clean=False )
         utilities.assert_equals( expect=main.TRUE,
                                  actual=stepResult,
-                                 onpass=main.topoName + " topology successful",
-                                 onfail=main.topoName + "Torus 28-28 topology failed" )
+                                 onpass=main.torus + " topology successful",
+                                 onfail=main.torus + " topology failed" )