Revert "Temporarily change max size of onos cluster to 5"
This reverts commit 9b7f84836a8cdbef487662b1cc4d6707cc33b83d.
Change-Id: Ia7c09449059f284ed4cc54ba50ec7ef8f7a94c11
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
index 00fabba..fe10703 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
@@ -1,9 +1,11 @@
<PARAMS>
- <testcases>1,2,1,2,1,2,1,2,1,2</testcases>
+ <testcases>1,2,1,2,1,2,1,2,1,2,1,2,1,2</testcases>
- <SCALE>1,3,3,5,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,3,5,5,7,7</SCALE>
+ <max>7</max>
+
+
<ENV>
<cellName>flowTP</cellName>
@@ -21,6 +23,7 @@
<cooldown>10</cooldown>
<testCMD0>flow-tester.py -f</testCMD0> #base command
<testCMD1> -n </testCMD1> #neighbors
+
</TEST>
<GIT>
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
index 93004c5..be4caec 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.params
@@ -1,7 +1,7 @@
<PARAMS>
- <testcases>0,1,2,11,20,1,2,11,20,1,2,11,20</testcases>
+ <testcases>0,1,2,11,20,1,2,11,20,1,2,11,20,1,2,11,20</testcases>
- <SCALE>1,3,5</SCALE>
+ <SCALE>1,3,5,7</SCALE>
<ENV>
<cellName>topo_perf_test</cellName>
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
index 3201427..cf4c6ac 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
@@ -1,16 +1,16 @@
<PARAMS>
- <testcases>0,1,2,1,2,1,2,1,2,1,2</testcases>
+ <testcases>0,1,2,1,2,1,2,1,2,1,2,1,2,1,2</testcases>
<debugMode></debugMode> #nothing means false
<ENV>
- <cellName>intentTP</cellName>
- <cellApps>drivers,null,intentperf</cellApps>
+ <cellName>intentTP</cellName>
+ <cellApps>drivers,null,intentperf</cellApps>
</ENV>
- <SCALE>1,3,3,5,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,3,5,5,7,7</SCALE>
+ <max>7</max>
<GIT>
<gitPull>off</gitPull>
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
index e1ba390..8843c2f 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
@@ -1,9 +1,9 @@
<PARAMS>
- <testcases>0,1,2,1,2,1,2</testcases>
+ <testcases>0,1,2,1,2,1,2,1,2</testcases>
- <SCALE>1,3,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,5,7</SCALE>
+ <max>7</max>
<ENV>
<cellName>IntentInstallWithdrawCell</cellName>
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index c27f2db..19d9806 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -1,9 +1,9 @@
<PARAMS>
- <testcases>0,1,2,1,2,1,2</testcases>
+ <testcases>0,1,2,1,2,1,2,1,2</testcases>
- <SCALE>1,3,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,5,7</SCALE>
+ <max>7</max>
<ENV>
<cellName>intentRerouteCell</cellName>
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
index a6ecab9..4fc830f 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.params
@@ -1,8 +1,8 @@
<PARAMS>
- <testcases>0,1,2,1,2,1,2</testcases>
+ <testcases>0,1,2,1,2,1,2,1,2</testcases>
- <SCALE>1,3,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,5,7</SCALE>
+ <max>7</max>
<ENV>
<cellName>topo_perf_test</cellName>
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.params b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.params
index 84b4970..4485f0f 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.params
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.params
@@ -6,11 +6,11 @@
# 10-null provider setup
# 20-pushing intents, and rerouting intents if reroute is true
# 0,1,2,10,20,1,2,10,20,1,2,10,20
- <testcases>0,1,2,11,20,1,2,11,20,1,2,11,20</testcases>
+ <testcases>0,1,2,11,20,1,2,11,20,1,2,11,20,1,2,11,20</testcases>
<reroute>False</reroute>
- <SCALE>1,3,5</SCALE>
+ <SCALE>1,3,5,7</SCALE>
<DEPENDENCY>
<path>/tests/SCPF/SCPFscalingMaxIntents/dependencies/</path>
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
index 609ca36..c45fef8 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.params
@@ -1,8 +1,8 @@
<PARAMS>
- <testcases>0,1,2,1,2,1,2</testcases>
+ <testcases>0,1,2,1,2,1,2,1,2</testcases>
- <SCALE>1,3,5</SCALE>
- <max>5</max>
+ <SCALE>1,3,5,7</SCALE>
+ <max>7</max>
<ENV>
<cellName>topo_perf_test</cellName>