Added reroute fields to DB file
Change-Id: Ie458932fba3192b4c737bfeaa5ca3f64726c010d
diff --git a/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.params b/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.params
index 2f7ce4b..325ca7f 100755
--- a/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.params
+++ b/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.params
@@ -4,7 +4,7 @@
# 11-mininet setup, 20-pushing intents,
# 21-rerouting intents
# 0,1,10,20,1,11,20,1,10,21,1,11,21,100
- <testcases>0,1,10,20,1,11,20,1,10,21,1,11,21,100</testcases>
+ <testcases>0,1,11,20,1,11,21,100</testcases>
<SCALE>
<size>1</size>
@@ -48,7 +48,7 @@
<TEST>
<batch_size>1000</batch_size>
- <min_intents>800000</min_intents>
+ <min_intents>500000</min_intents>
<max_intents>1000000</max_intents>
<check_interval>10000</check_interval>
</TEST>
diff --git a/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.py b/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.py
index 834e968..2fafc1e 100644
--- a/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.py
+++ b/TestON/tests/SCPFmaxIntents/SCPFmaxIntents.py
@@ -416,7 +416,7 @@
dbFileName="/tmp/MaxIntentDB"
dbfile = open(dbFileName, "a")
temp = str(maxIntents) + ","
- temp += str(maxFlows) + "\n"
+ temp += str(maxFlows) + ","
dbfile.write(temp)
dbfile.close()
except IOError:
@@ -548,6 +548,16 @@
main.log.info("Installed intents: " + str(maxIntents) +
"\nAdded flows: " + str(maxFlows))
+ try:
+ dbFileName="/tmp/MaxIntentDB"
+ dbfile = open(dbFileName, "a")
+ temp = str(maxIntents) + ","
+ temp += str(maxFlows) + "\n"
+ dbfile.write(temp)
+ dbfile.close()
+ except IOError:
+ main.log.warn("Error opening " + dbFileName + " to write results.")
+
# Stopping mininet
if main.switch == "of":
main.log.info("Stopping mininet")