commit 9bea5e6de8ac2afd1956222d218151adc833c9fa
author Jon Hall <jhall@onlab.us> Tue Sep 01 23:06:56 2015 +0000
committer Gerrit Code Review <gerrit@onlab.us> Tue Sep 01 23:06:56 2015 +0000
tree 941c739f505745031fe1fdbcf749bae07f0202b9
parent ad0c52074917b7ddb2a75266716c0e7449aa0475
parent 4cc11185ee444ea95a20c57a94a7e7d864340041

Merge "Increased spine and torus params"

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
index c593a74..c1a35f9 100755
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
@@ -14,8 +14,8 @@
         <wrapper3>topo</wrapper3>
         <topology>spine.py</topology>
         <multiovs>multiovs.py</multiovs>
-        <spine>spine,3,6</spine>
-        <torus>torus,5,5</torus>
+        <spine>spine,15,30</spine>
+        <torus>torus,28,28</torus>
     </DEPENDENCY>
 
     <ENV>

TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py

diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
index 620f793..24e8842 100644
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.py
@@ -319,12 +319,6 @@
 
         time.sleep(3)
 
-        '''
-        main.ONOSbench.scp( main.Mininet1,
-                           "~/mininet/custom/spine.json",
-                           "/tmp/",
-                           direction="to" )
-        '''
         utilities.assert_equals( expect=main.TRUE,
                                  actual=stepResult,
                                  onpass=main.spine + " topology successful",
@@ -333,6 +327,13 @@
 
         time.sleep(60)
 
+        '''
+        main.ONOSbench.scp( main.Mininet1,
+                           "~/mininet/custom/spine.json",
+                           "/tmp/",
+                           direction="to" )
+        '''
+
     def CASE1002( self, main ):
         """
             Topology test