[ONOS-6593]Review and Refactor ONOS startup procedures in TestON
Change-Id: I509a8ee7a26c198957bebf59da5c85a0edb8b995
diff --git a/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py b/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
index 7cc2258..b67a5f7 100644
--- a/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
+++ b/TestON/tests/FUNC/FUNCnetconf/dependencies/netconf.py
@@ -18,7 +18,7 @@
the OF-Config server is running on the node to be configured
"""
startResult = main.FALSE
- startResult = main.CLIs[ 0 ].activateApp( appName="org.onosproject.netconf" )
+ startResult = main.RESTs[ 0 ].activateApp( appName="org.onosproject.netconf" )
return startResult
@@ -96,7 +96,7 @@
method = "POST"
data = main.cfgJson
configResult = main.FALSE
- sendResult = main.CLIs[ 0 ].send( url=url, method=method, data=data )
+ sendResult = main.RESTs[ 0 ].send( url=url, method=method, data=data )
main.log.info( "Device configuration request response code: " + str( sendResult[ 0 ] ) )
if ( 200 <= sendResult[ 0 ] <= 299 ):
configResult = main.TRUE
@@ -117,8 +117,8 @@
addressResult = main.FALSE
driverResult = main.FALSE
try:
- apiResult = main.CLIs[ 0 ].devices()
- cliResult = main.CLIs2[ 0 ].devices()
+ apiResult = main.RESTs[ 0 ].devices()
+ cliResult = main.CLIs[ 0 ].devices()
apiDict = json.loads( apiResult )
cliDict = json.loads( cliResult )