Merge "Fix the HA test error for 1.10-onos"
diff --git a/TestON/drivers/common/api/controller/onosrestdriver.py b/TestON/drivers/common/api/controller/onosrestdriver.py
index 95039b0..3e17dea 100755
--- a/TestON/drivers/common/api/controller/onosrestdriver.py
+++ b/TestON/drivers/common/api/controller/onosrestdriver.py
@@ -59,8 +59,7 @@
except Exception as inst:
main.log.error( "Uncaught exception: " + str( inst ) )
- self.handle = super( OnosRestDriver, self ).connect()
- return self.handle
+ return super( OnosRestDriver, self ).connect()
def pprint( self, jsonObject ):
"""
@@ -333,7 +332,7 @@
ip = ip, port = port )
if response:
output = response[ 1 ]
- app = json.loads( output )
+ app = {} if output == "" else json.loads( output )
if 200 <= response[ 0 ] <= 299:
if check:
if app.get( 'state' ) == 'INSTALLED':
diff --git a/TestON/tests/HA/dependencies/HA.py b/TestON/tests/HA/dependencies/HA.py
index d98088d..6750775 100644
--- a/TestON/tests/HA/dependencies/HA.py
+++ b/TestON/tests/HA/dependencies/HA.py
@@ -2911,7 +2911,7 @@
if intentsResults and not consistentIntents:
for i in range( len( main.Cluster.active() ) ):
- ctrl = main.Cluster.contoller[ i ]
+ ctrl = main.Cluster.controllers[ i ]
main.log.warn( ctrl.name + " intents: " )
main.log.warn( json.dumps(
json.loads( ONOSIntents[ i ] ),