Improve SCPF tests
- Add flowObj param to check if test run with FlowObject
- Clean up old FlowObject tests
Change-Id: I04f455983a13a3221306fdde12ff6e9392fe7399
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index 6d684cc..7dbda89 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -18,9 +18,11 @@
<ingress>null:0000000000000001/0</ingress>
<egress>null:0000000000000007/0</egress>
<debug>False</debug>
+ <flowObj>False</flowObj>
</TEST>
<DATABASE>
- <file>/tmp/IntentRerouteLatDB</file>
+ <dbName>/tmp/IntentRerouteLatDB</dbName>
+ <dbFlowObj>/tmp/IntentRerouteLatDBWithFlowObj</dbFlowObj>
</DATABASE>
<GIT>
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 4a63f18..b282ebf 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -69,7 +69,6 @@
main.skipMvn = main.params['TEST']['skipCleanInstall']
main.cellName = main.params['ENV']['cellName']
main.scale = (main.params['SCALE']).split(",")
- main.dbFileName = main.params['DATABASE']['file']
main.timeout = int(main.params['SLEEP']['timeout'])
main.startUpSleep = int(main.params['SLEEP']['startup'])
main.installSleep = int(main.params['SLEEP']['install'])
@@ -82,6 +81,15 @@
main.ingress = main.params['TEST']['ingress']
main.egress = main.params['TEST']['egress']
main.debug = main.params['TEST']['debug']
+ main.flowObj = main.params['TEST']['flowObj']
+
+ if main.flowObj == "True":
+ main.flowObj = True
+ main.dbFileName = main.params['DATABASE']['dbFlowObj']
+ else:
+ main.flowObj = False
+ main.dbFileName = main.params['DATABASE']['dbName']
+
for i in range(0, len(main.intentsList)):
main.intentsList[i] = int(main.intentsList[i])
# Create DataBase file
@@ -202,7 +210,9 @@
main.CLIs[0].setCfg("org.onosproject.provider.nil.NullProviders", "topoShape", value="reroute")
main.CLIs[0].setCfg("org.onosproject.provider.nil.NullProviders", "enabled", value="true")
main.CLIs[0].setCfg("org.onosproject.store.flow.impl.DistributedFlowRuleStore", "backupEnabled", value="false")
-
+ if main.flowObj:
+ main.CLIs[0].setCfg("org.onosproject.net.intent.impl.compiler.IntentConfigurableRegistrator",
+ "useFlowObjectives", value="true")
time.sleep(main.startUpSleep)
# Balance Master