commit a478b85c8ae1d0f04e7bd72e56c5137a99f8c3fd
author Jon Hall <jhall@ciena.com> Mon Dec 04 15:00:15 2017 -0800
committer Jon Hall <jhall@opennetworking.org> Fri Dec 15 23:55:11 2017 +0000
tree a0c5b583d4c4abb6d03005ec29f48eb9149c9178
parent 908cb4412abddb19ea0d82eac22a83cad7e1f261

ISSU tests

Change-Id: I88a172c6a147c2070d829861bad7e6656d3538ba

TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.py

diff --git a/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.py b/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.py
index b7385fe..9a27fea 100644
--- a/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.py
+++ b/TestON/tests/HA/HAcontinuousStopNodes/HAcontinuousStopNodes.py
@@ -66,10 +66,6 @@
         start cli sessions
         start tcpdump
         """
-        import imp
-        import pexpect
-        import time
-        import json
         main.log.info( "ONOS HA test: Stop a minority of ONOS nodes - " +
                          "initialization" )
         # set global variables
@@ -140,7 +136,7 @@
         try:
             assert main.nodeIndex is not None, "main.nodeIndex not defined"
             assert main.killCount is not None, "main.killCount not defined"
-        except AttributeError as e:
+        except AttributeError:
             main.log.warn( "Node to kill not selected, defaulting to node 1" )
             main.nodeIndex = -1
             main.killCount = 1
@@ -211,9 +207,6 @@
         # Test of LeadershipElection
         leaderList = []
 
-        restarted = []
-        for ctrl in main.kill:
-            restarted.append( ctrl.ipAddress )
         leaderResult = main.TRUE
 
         for ctrl in main.Cluster.active():
@@ -230,11 +223,6 @@
                                  " shows no leader for the election-app was" +
                                  " elected after the old one died" )
                 leaderResult = main.FALSE
-            elif leaderN in restarted:
-                main.log.error( ctrl.name + " shows " + str( leaderN ) +
-                                 " as leader for the election-app, but it " +
-                                 "was restarted" )
-                leaderResult = main.FALSE
         if len( set( leaderList ) ) != 1:
             leaderResult = main.FALSE
             main.log.error(