Change CHOtest to not force to specify the cellname to start the test
Change-Id: I94751a063f96c029373e02d3ad3c67e2f4514a4b
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.params b/TestON/tests/CHOTestMonkey/CHOTestMonkey.params
index 5d84a8f..6bb3467 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.params
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.params
@@ -41,7 +41,10 @@
<testDuration>86400</testDuration>
<package>on</package>
</TEST>
-
+ <ENV>
+ <cellName>choCell</cellName>
+ <cellApps>drivers,openflow,proxyarp,events</cellApps>
+ </ENV>
<EVENT>
<Event>
<status>on</status>
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
index 7410810..2a0dc55 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
@@ -71,6 +71,8 @@
main.enableIPv6 = main.params[ 'TEST' ][ 'IPv6' ]
main.enableIPv6 = True if main.enableIPv6 == "on" else False
main.caseSleep = int( main.params[ 'TEST' ][ 'caseSleep' ] )
+ main.onosCell = main.params[ 'ENV' ][ 'cellName' ]
+ main.apps = main.params[ 'ENV' ][ 'cellApps' ]
main.controllers = []
main.devices = []
@@ -97,13 +99,8 @@
main.testSetUp.evnSetupConclusion( stepResult )
- if not main.onoscell :
- main.log.error("Please provide onoscell option at TestON CLI to run CHO tests")
- main.log.error("Example: ~/TestON/bin/cli.py run CHOTestMonkey onoscell <cellName>")
- main.cleanAndExit()
-
setupResult = main.testSetUp.ONOSSetUp( main.Mininet1, main.Cluster,
- newCell=False, cellName=main.onoscell )
+ cellName=main.onosCell )
for i in range( 1, main.Cluster.numCtrls + 1 ):
newController = Controller( i )
newController.setCLI( main.Cluster.active( i - 1 ).CLI )