Updated check for node state.
New state READY indicated node is active and all components were correctly
loaded.
Change-Id: Ie466e365673bc5bea88432d2e1e4ade93a98c7be
diff --git a/TestON/tests/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HAclusterRestart/HAclusterRestart.py
index 850a93f..f903f95 100644
--- a/TestON/tests/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HAclusterRestart/HAclusterRestart.py
@@ -2533,7 +2533,7 @@
activeIps = []
currentResult = main.FALSE
for node in current:
- if node['state'] == 'ACTIVE':
+ if node['state'] == 'READY':
activeIps.append( node['ip'] )
activeIps.sort()
if ips == activeIps:
diff --git a/TestON/tests/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HAfullNetPartition/HAfullNetPartition.py
index 5c342f3..5a6de1a 100644
--- a/TestON/tests/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HAfullNetPartition/HAfullNetPartition.py
@@ -2537,7 +2537,7 @@
activeIps = []
currentResult = main.FALSE
for node in current:
- if node['state'] == 'ACTIVE':
+ if node['state'] == 'READY':
activeIps.append( node['ip'] )
activeIps.sort()
if ips == activeIps:
diff --git a/TestON/tests/HAkillNodes/HAkillNodes.py b/TestON/tests/HAkillNodes/HAkillNodes.py
index 16b8a8b..7654097 100644
--- a/TestON/tests/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HAkillNodes/HAkillNodes.py
@@ -2547,7 +2547,7 @@
activeIps = []
currentResult = main.FALSE
for node in current:
- if node['state'] == 'ACTIVE':
+ if node['state'] == 'READY':
activeIps.append( node['ip'] )
activeIps.sort()
if ips == activeIps:
diff --git a/TestON/tests/HAsanity/HAsanity.py b/TestON/tests/HAsanity/HAsanity.py
index 205e6d2..624b720 100644
--- a/TestON/tests/HAsanity/HAsanity.py
+++ b/TestON/tests/HAsanity/HAsanity.py
@@ -2434,7 +2434,7 @@
activeIps = []
currentResult = main.FALSE
for node in current:
- if node['state'] == 'ACTIVE':
+ if node['state'] == 'READY':
activeIps.append( node['ip'] )
activeIps.sort()
if ips == activeIps:
diff --git a/TestON/tests/HAstopNodes/HAstopNodes.py b/TestON/tests/HAstopNodes/HAstopNodes.py
index 1ebf34a..21ec7f3 100644
--- a/TestON/tests/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HAstopNodes/HAstopNodes.py
@@ -2536,7 +2536,7 @@
activeIps = []
currentResult = main.FALSE
for node in current:
- if node['state'] == 'ACTIVE':
+ if node['state'] == 'READY':
activeIps.append( node['ip'] )
activeIps.sort()
if ips == activeIps:
diff --git a/TestON/tests/PLATdockertest/PLATdockertest.py b/TestON/tests/PLATdockertest/PLATdockertest.py
index f56ae70..2e743f3 100755
--- a/TestON/tests/PLATdockertest/PLATdockertest.py
+++ b/TestON/tests/PLATdockertest/PLATdockertest.py
@@ -167,7 +167,7 @@
main.log.debug("Rest call response: " + str(status) + " - " + response)
if status == 200:
jrsp = json.loads(response)
- clusterIP = [item["ip"]for item in jrsp["nodes"] if item["status"]== "ACTIVE"]
+ clusterIP = [item["ip"]for item in jrsp["nodes"] if item["status"]== "READY"]
main.log.debug(" IPlist is:" + ",".join(IPlist))
main.log.debug("cluster IP is" + ",".join(clusterIP) )
if set(IPlist) == set(clusterIP): stepResult = main.TRUE