commit 221db32140fdbc24f1e71f4060deb398fae5cbba
author You Wang <you@onlab.us> Fri Jun 03 15:45:52 2016 -0700
committer You Wang <you@onlab.us> Fri Jun 03 15:45:52 2016 -0700
tree 45c1a846c131455854b25ab88b5f11055f4960c8
parent 8b8be2e68ac2e3d2d0408bdd7be3e33a939311f0

Use new graph interfaces in CHOTestMonkey

Change-Id: If81ef8102665af2a2c96ae3820b107bc8c771ab4

TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py

diff --git a/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py b/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
index d0408f9..babdebb 100644
--- a/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
+++ b/TestON/tests/CHOTestMonkey/dependencies/events/CheckEvent.py
@@ -99,6 +99,8 @@
                 if not host.isDown() and not host.isRemoved():
                     upHostNum += 1
         clusterNum = 1
+        with main.mininetLock:
+            graphDictMininet = main.Mininet1.getGraphDict( useId=True )
         for controller in main.controllers:
             if controller.isUp():
                 with controller.CLILock:
@@ -107,8 +109,14 @@
                     #if not topoState:
                     #    main.log.warn( "Topo Check - link or device number discoverd by ONOS%s is incorrect" % ( controller.index ) )
                     #    checkResult = EventStates().FAIL
-                    # Check links
+                    # Compare ONOS and Mininet topologies
+                    graphDictONOS = controller.CLI.getGraphDict()
+                    compareResult = main.graph.compareGraphs( graphDictONOS, graphDictMininet )
+                    if not compareResult:
+                        checkResult = EventStates().FAIL
+                        main.log.warn( "Topo Check - ONOS and Mininet topologies do not match" )
                     try:
+                        # Check links
                         links = controller.CLI.links()
                         links = json.loads( links )
                         if not len( links ) == upLinkNum: