commit 142b534902392c2e638e4567964bde1bafc70209
author Devin Lim <devin@opennetworking.org> Thu Jul 20 15:22:39 2017 -0700
committer Devin Lim <devin@opennetworking.org> Thu Aug 03 17:04:32 2017 -0700
tree 5a3916b97593b255666d6b93c89aaca6e3c94b8d
parent ca319897d2b1c94be8d986500d9646112f472634

Update Cluster Driver

Change-Id: I8a3a57e19637ff210548e57d41178e6f194cf694

TestON/tests/HA/HAsanity/HAsanity.py

diff --git a/TestON/tests/HA/HAsanity/HAsanity.py b/TestON/tests/HA/HAsanity/HAsanity.py
index c70d921..8332a2b 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.py
+++ b/TestON/tests/HA/HAsanity/HAsanity.py
@@ -79,13 +79,11 @@
             main.exit()
         main.testSetUp.envSetupDescription()
         try:
-            from dependencies.Cluster import Cluster
             from tests.HA.dependencies.HA import HA
             main.HA = HA()
-            main.Cluster = Cluster( main.ONOScell.nodes )
             cellName = main.params[ 'ENV' ][ 'cellName' ]
             main.apps = main.params[ 'ENV' ][ 'appString' ]
-            stepResult = main.testSetUp.envSetup( main.Cluster, hasNode=True )
+            stepResult = main.testSetUp.envSetup()
         except Exception as e:
             main.testSetUp.envSetupException( e )
         main.testSetUp.evnSetupConclusion( stepResult )
@@ -131,7 +129,6 @@
         The Failure case. Since this is the Sanity test, we do nothing.
         """
         import time
-        assert main.numCtrls, "main.numCtrls not defined"
         assert main, "main not defined"
         assert utilities.assert_equals, "utilities.assert_equals not defined"
         main.case( "Wait 60 seconds instead of inducing a failure" )
@@ -146,7 +143,7 @@
         """
         Check state after ONOS failure
         """
-        main.HA.checkStateAfterONOS( main, afterWhich=0, compareSwitch=True )
+        main.HA.checkStateAfterEvent( main, afterWhich=0, compareSwitch=True )
 
         main.step( "Leadership Election is still functional" )
         # Test of LeadershipElection