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

TestON/tests/HA/HAsanity/HAsanity.topo

diff --git a/TestON/tests/HA/HAsanity/HAsanity.topo b/TestON/tests/HA/HAsanity/HAsanity.topo
index f3b9278..4bf4bd4 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.topo
+++ b/TestON/tests/HA/HAsanity/HAsanity.topo
@@ -1,17 +1,6 @@
 <TOPOLOGY>
     <COMPONENT>
 
-        <ONOSbench>
-            <host>localhost</host>
-            <user>sdn</user>
-            <password>rocks</password>
-            <type>OnosDriver</type>
-            <connect_order>1</connect_order>
-            <COMPONENTS>
-                <prompt></prompt>
-            </COMPONENTS>
-        </ONOSbench>
-
         <ONOScell>
             <host>localhost</host>  # ONOS "bench" machine
             <user>sdn</user>
@@ -20,6 +9,7 @@
             <connect_order>1</connect_order>
             <COMPONENTS>
                 <cluster_name></cluster_name>  # Used as a prefix for cluster components. Defaults to 'ONOS'
+                <diff_clihost></diff_clihost>  # if it has different host other than localhost for CLI. True or empty. OC# will be used if True.
                 <karaf_username></karaf_username>
                 <karaf_password></karaf_password>
                 <web_user></web_user>
@@ -36,7 +26,7 @@
             <user>sdn</user>
             <password>rocks</password>
             <type>MininetCliDriver</type>
-            <connect_order>16</connect_order>
+            <connect_order>2</connect_order>
             <COMPONENTS>
                 #Specify the Option for mininet
                 <arg1> --custom ~/mininet/custom/obelisk.py </arg1>
@@ -53,7 +43,7 @@
             <user>sdn</user>
             <password>rocks</password>
             <type>RemoteMininetDriver</type>
-            <connect_order>17</connect_order>
+            <connect_order>3</connect_order>
             <COMPONENTS>
                 <prompt></prompt>
             </COMPONENTS>