commit 6301b746fb1c756507b0bb4e2c339b892eb5ce56
author Devin Lim <devin@opennetworking.org> Mon Aug 07 11:00:21 2017 -0700
committer Devin Lim <devin@opennetworking.org> Mon Aug 07 11:17:59 2017 -0700
tree e52a67e506c66ea26e3adefb1048fd36d5aec6e6
parent 0e4ca9e7dc73f1ae5019a664626de27f9508918b

fix the bugs from the cluster update

Change-Id: I595d3c8a812290d35a73b406222443166573a521

TestON/tests/USECASE/VPLS/dependencies/vpls.py

diff --git a/TestON/tests/USECASE/VPLS/dependencies/vpls.py b/TestON/tests/USECASE/VPLS/dependencies/vpls.py
index 34fffbb..47ffe78 100644
--- a/TestON/tests/USECASE/VPLS/dependencies/vpls.py
+++ b/TestON/tests/USECASE/VPLS/dependencies/vpls.py
@@ -69,14 +69,14 @@
 
     # Variables
     app = main.params[ 'vpls' ][ 'name' ]
-    pprint = main.ONOSrest1.pprint
+    pprint = main.Cluster.active( 0 ).REST.pprint
     SLEEP = int( main.params[ 'SLEEP' ][ 'netcfg' ] )
 
     main.step( "Check network configurations for vpls application" )
     clusterResult = True
-    for node in main.RESTs:
+    for ctrl in main.Cluster.active():
         result = False
-        getVPLS = utilities.retry( f=node.getNetCfg,
+        getVPLS = utilities.retry( f=ctrl.REST.getNetCfg,
                                    retValue=False,
                                    kwargs={"subjectClass":"apps", "subjectKey":app},
                                    sleep=SLEEP )
@@ -98,10 +98,10 @@
 
     main.step( "Check vpls app configurations" )
     clusterResult = True
-    for node in main.CLIs:
+    for ctrl in main.Cluster.active():
         result = False
         #TODO Read from vpls show and match to pushed json
-        vpls = node.parseVplsShow()
+        vpls = ctrl.CLI.parseVplsShow()
         parsedVpls = pprint( sanitizeConfig( vpls ) )
         sentVpls = pprint( sanitizeConfig( main.vplsConfig ) )
         result = parsedVpls == sentVpls
@@ -155,7 +155,7 @@
 
 def checkIntentState( main , bl=[] ):
     # Print the intent states
-    intents = main.CLIs[ 0 ].intents()
+    intents = main.Cluster.active( 0 ).CLI.intents()
     count = 0
     while count <= 5:
         installedCheck = True
@@ -227,8 +227,8 @@
 def compareApps( main ):
     result = True
     first = None
-    for cli in main.CLIs:
-        currentApps = cli.apps( summary=True, active=True )
+    for ctrl in main.Cluster.active():
+        currentApps = ctrl.CLI.apps( summary=True, active=True )
         if not result:
             first = currentApps
         else: