Merge "Changing instances of 'onos -w' to 'onos-wait-for-start'"
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index db0b48c..f60fc4e 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -280,8 +280,8 @@
# Not in CLI so login
if waitForStart:
- # Wait for onos start ( -w ) and enter onos cli
- startCliCommand = "onos -w "
+ # Wait for onos start ( onos-wait-for-start ) and enter onos cli
+ startCliCommand = "onos-wait-for-start "
else:
startCliCommand = "onos "
self.handle.sendline( startCliCommand + str( ONOSIp ) )
@@ -362,7 +362,7 @@
main.log.info( "ONOS cli is already running" )
return main.TRUE
- # Wait for onos start ( -w ) and enter onos cli
+ # Wait for onos start ( onos-wait-for-start ) and enter onos cli
self.handle.sendline( "/opt/onos/bin/onos" )
i = self.handle.expect( [
"onos>",
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 5b12d0c..002bc1a 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1,6 +1,8 @@
#!/usr/bin/env python
"""
+Copyright 2014 Open Networking Foundation (ONF)
+
This driver interacts with ONOS bench, the OSGi platform
that configures the ONOS nodes. ( aka ONOS-next )
@@ -950,7 +952,7 @@
self.handle.sendline( "" )
self.handle.expect( self.prompt )
- self.handle.sendline( "onos -w " + ONOSIp + " " + cmdstr )
+ self.handle.sendline( "onos-wait-for-start " + ONOSIp + " " + cmdstr )
self.handle.expect( self.prompt )
handleBefore = self.handle.before