From a43d0334aa0237fd8d5ff8324fa62632bbf59ac0 Mon Sep 17 00:00:00 2001 From: Jon Hall Date: Thu, 4 Aug 2016 15:02:23 -0700 Subject: [PATCH] Add check for node status to onos.py startup Change-Id: I8e6b103ef46a5bc5877507a7adef3eb6117adf64 --- tools/dev/mininet/onos.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/tools/dev/mininet/onos.py b/tools/dev/mininet/onos.py index 069f680be6..d170caae44 100755 --- a/tools/dev/mininet/onos.py +++ b/tools/dev/mininet/onos.py @@ -62,6 +62,7 @@ from functools import partial KarafPort = 8101 # ssh port indicating karaf is running GUIPort = 8181 # GUI/REST port OpenFlowPort = 6653 # OpenFlow port +CopycatPort = 9876 # Copycat port def defaultUser(): "Return a reasonable default user" @@ -338,6 +339,17 @@ class ONOSNode( Controller ): info( '.' ) self.sanityCheck() time.sleep( 1 ) + info( ' node-status' ) + while True: + result = quietRun( '%s -h %s "nodes"' % + ( self.client, self.IP() ), shell=True ) + nodeStr = 'id=%s, address=%s:%s, state=READY, updated' %\ + ( self.IP(), self.IP(), CopycatPort ) + if nodeStr in result: + break + info( '.' ) + self.sanityCheck() + time.sleep( 1 ) info( ')\n' ) def updateEnv( self, envDict ):