commit c3baa4cad91f82880119dad55f000f8197d17ae5
author Carmelo Cascone <carmelo@opennetworking.org> Tue Nov 21 00:06:11 2017 -0800
committer Carmelo Cascone <carmelo@opennetworking.org> Tue Nov 21 19:05:43 2017 +0000
tree 9d4ca6d789c4ba83f81c6484047654c5a6ff1d76
parent a09f87f02bbd4b5f6a6e8e1ce799014a6d797ec4

Fixed onos.py

It now works also when no OpenFlow subsytem is loaded

Change-Id: If51f1ab654dad7c02a3f8744b53f4029abf1bd9f

tools/dev/mininet/onos.py

diff --git a/tools/dev/mininet/onos.py b/tools/dev/mininet/onos.py
index 9b59cc7..2e7b6f7 100755
--- a/tools/dev/mininet/onos.py
+++ b/tools/dev/mininet/onos.py
@@ -364,14 +364,11 @@
             time.sleep( 1 )
         info( ' ssh-port' )
         waitListening( server=self, port=KarafPort, callback=self.sanityCheck )
-        info( ' openflow-port' )
-        waitListening( server=self, port=OpenFlowPort,
-                       callback=self.sanityCheck )
-        info( ' client' )
+        info( ' protocol' )
         while True:
             result = quietRun( '%s -h %s "apps -a"' %
                                ( self.client, self.IP() ), shell=True )
-            if 'openflow' in result:
+            if 'openflow' in result or 'p4runtime' in result:
                 break
             info( '.' )
             self.sanityCheck()
@@ -380,7 +377,7 @@
         while True:
             result = quietRun( '%s -h %s "nodes"' %
                                ( self.client, self.IP() ), shell=True )
-            nodeStr = 'id=%s, address=%s:%s, state=READY, updated' %\
+            nodeStr = 'id=%s, address=%s:%s, state=READY' %\
                       ( self.IP(), self.IP(), CopycatPort )
             if nodeStr in result:
                 break