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/HAclusterRestart/HAclusterRestart.py

diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
index 96ba015..2460c94 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
@@ -65,9 +65,6 @@
         start cli sessions
         start tcpdump
         """
-        import imp
-        import time
-        import json
         main.log.info( "ONOS HA test: Restart all ONOS nodes - " +
                          "initialization" )
         # These are for csv plotting in jenkins
@@ -143,12 +140,6 @@
         except ( NameError, AttributeError ):
             main.log.error( "main.HAdata not defined, setting to []" )
             main.HAdata = []
-        # Reset non-persistent variables
-        try:
-            iCounterValue = 0
-        except NameError:
-            main.log.error( "iCounterValue not defined, setting to 0" )
-            iCounterValue = 0
 
         main.case( "Restart entire ONOS cluster" )
 
@@ -216,7 +207,7 @@
                                  " error logs" )
                 leaderResult = main.FALSE
             elif leaderN is None:
-                main.log.error( cli.name +
+                main.log.error( ctrl.name +
                                  " shows no leader for the election-app." )
                 leaderResult = main.FALSE
         if len( set( leaderList ) ) != 1: