Merge "Print clusters on failed assert"
diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
index 6aab7aa..69f094d 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
@@ -1679,8 +1679,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2555,6 +2556,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster
diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
index 25b9772..a48a460 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
@@ -1681,8 +1681,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2539,6 +2540,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster
diff --git a/TestON/tests/HA/HAkillNodes/HAkillNodes.py b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
index bda572f..6fb4d6c 100644
--- a/TestON/tests/HA/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
@@ -1701,8 +1701,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2574,6 +2575,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster
diff --git a/TestON/tests/HA/HAsanity/HAsanity.py b/TestON/tests/HA/HAsanity/HAsanity.py
index cb6929a..aa66574 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.py
+++ b/TestON/tests/HA/HAsanity/HAsanity.py
@@ -1667,8 +1667,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2475,6 +2476,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index 3c98ab7..3eb95c6 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -1719,8 +1719,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2614,6 +2615,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.py b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
index 26f255f..0f33ec0 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
@@ -1680,8 +1680,9 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
- if consistentClustersResult != main.TRUE:
+ if not consistentClustersResult:
main.log.debug( clusters )
+
# there should always only be one cluster
main.step( "Cluster view correct across ONOS nodes" )
try:
@@ -2551,6 +2552,8 @@
actual=consistentClustersResult,
onpass="Clusters view is consistent across all ONOS nodes",
onfail="ONOS nodes have different views of clusters" )
+ if not consistentClustersResult:
+ main.log.debug( clusters )
main.step( "There is only one SCC" )
# there should always only be one cluster