commit be98fb10a4df14ae61dc0f19b3af8e1673f54750
author You Wang <you@opennetworking.org> Thu May 24 16:15:17 2018 -0700
committer You Wang <you@opennetworking.org> Thu May 24 16:15:17 2018 -0700
tree f18898133abacad53d14aa91d4f16f17cb77e737
parent 5fad178bc5c4a0d2cd64ed6f25143c6f2bd6954c

[ONOS-7650] Workaround for CORD-3098 and CORD-3079

Change-Id: I7bb63808dbe840583663123518f16f9ea5f963f7

TestON/tests/dependencies/topology.py

diff --git a/TestON/tests/dependencies/topology.py b/TestON/tests/dependencies/topology.py
index c0e1e7a..be3b69a 100644
--- a/TestON/tests/dependencies/topology.py
+++ b/TestON/tests/dependencies/topology.py
@@ -264,10 +264,11 @@
             pool = []
             for src in srcList:
                 srcIp = srcIpList[ src ]
-                if srcIp == dstIp:
+                if not srcIp or not dstIp:
+                    if expect:
+                        unexpectedPings.append( [ src, dst, "no IP" ] )
                     continue
-                if expect and ( not srcIp or not dstIp ):
-                    unexpectedPings.append( [ src, dst, "no IP" ] )
+                if srcIp == dstIp:
                     continue
                 hostHandle = getattr( main, src )
                 thread = main.Thread( target=utilities.retry,