Fix assertion for topo check case
Change-Id: I8bbf1abc9913622e08f9092d0d302ec29fc691b5
diff --git a/TestON/tests/FUNCintent/FUNCintent.py b/TestON/tests/FUNCintent/FUNCintent.py
index 49c2969..a32e95b 100644
--- a/TestON/tests/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNCintent/FUNCintent.py
@@ -282,6 +282,7 @@
" Switches view is correct",
onfail="ONOS" + controllerStr +
" Switches view is incorrect" )
+ devicesResults = devicesResults and currentDevicesResult
if links[ controller ] and "Error" not in links[ controller ]:
currentLinksResult = main.Mininet1.compareLinks(
@@ -295,6 +296,7 @@
" links view is correct",
onfail="ONOS" + controllerStr +
" links view is incorrect" )
+ linksResults = linksResults and currentLinksResult
if hosts[ controller ] or "Error" not in hosts[ controller ]:
currentHostsResult = main.Mininet1.compareHosts(
@@ -308,6 +310,12 @@
" hosts exist in Mininet",
onfail="ONOS" + controllerStr +
" hosts don't match Mininet" )
+ hostsResults = hostsResults and currentHostsResult
+ topoResults = hostsResults and linksResults and devicesResults
+ utilities.assert_equals( expect=main.TRUE,
+ actual=topoResults,
+ onpass="ONOS correctly discovered the topology",
+ onfail="ONOS incorrectly discovered the topology" )
def CASE9( self, main ):
'''