[ONOS-3181] Refactored test:
- Increased log output
- Combined similar cases
- Case steps are more specific
- Other minor changes
Change-Id: I45431e017c7786e8ae495f9b0fdb55d49571edaa
diff --git a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
index 1e8635e..cd9390c 100755
--- a/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
+++ b/TestON/tests/SCPFscaleTopo/SCPFscaleTopo.params
@@ -2,15 +2,13 @@
# 1 - optional pull and build ONOS package
# 2 - set cell and install ONOS
- # 10 - start mininet and assign switches to controller
- # 11 - pingall
- # 12 - compare topology
- # 100 - balance master
- # 200 - bring down onos node
- # 300 - bring up onos node
+ # 10 - start mininet and verify topo
+ # 11 - verify topo
+ # 100 - balance master and bring onos node down
+ # 200 - bring onos node up and balance masters
# 1000 - report logs
- <testcases>1,2,[10,100,11,12,200,100,11,12,300,100,11,12,1000]*3</testcases>
+ <testcases>1,2,[10,100,11,200,11,1000]*3</testcases>
<DEPENDENCY>
<path>/tests/SCPFscaleTopo/Dependency/</path>
@@ -37,19 +35,32 @@
<SLEEP>
<startup>15</startup>
<fwd>30</fwd>
- <topoAttempts>1</topoAttempts>
<balance>10</balance>
<nodeDown>10</nodeDown>
<nodeUp>10</nodeUp>
+ <pingall>3</pingall>
+ <stopMN>5</stopMN>
+ <startMN>5</startMN>
</SLEEP>
<TIMEOUT>
- <pingall>1000</pingall>
+ <pingall>240</pingall>
</TIMEOUT>
+ <ATTEMPTS>
+ <topoCmp>1</topoCmp>
+ <pingall>2</pingall>
+ </ATTEMPTS>
+
<TOPOLOGY>
<topology>torus</topology>
<scale>5,10,20</scale>
</TOPOLOGY>
+ <PINGALL>
+ <sleep>3</sleep>
+ <attempts>5</attempts>
+ <timeout>1000</timeout>
+ </PINGALL>
+
</PARAMS>