Minor fixes after the big refactor
Make sure modified config files are cleaned up
Fix EOF exception when closing ssh connections
Fix wiki formating issues when printing nodes
Change-Id: Idd82e1cb191b53f13720cc884757fa6b8ef4cb18
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.py b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
index 2c4f059..e7bdcd4 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
@@ -92,10 +92,11 @@
main.testSetUp.ONOSSetUp( main.Mininet1, main.Cluster, cellName=cellName, removeLog=True,
extraApply=[ main.HA.startingMininet,
- main.HA.customizeOnosGenPartitions ],
- extraClean=main.HA.cleanUpGenPartition )
+ main.HA.customizeOnosGenPartitions,
+ main.HA.copyBackupConfig ],
+ extraClean= main.HA.cleanUpGenPartition )
- main.HA.initialSetUp()
+ main.HA.initialSetUp( serviceClean=True )
def CASE2( self, main ):
"""
@@ -147,7 +148,9 @@
main.kill.append( main.Cluster.runningNodes[ p - 1 ] )
# NOTE: This only works for cluster sizes of 3,5, or 7.
- main.step( "Stopping nodes: " + str( main.kill ) )
+ #NOTE: This is to fix an issue with wiki formating
+ nodeNames = [ node.name for node in main.kill ]
+ main.step( "Stopping nodes: " + str( nodeNames ) )
killResults = main.TRUE
for ctrl in main.kill:
killResults = killResults and\