Add additional response checking to onosInstall
Change-Id: I6ab30aff25a019d0da9a8a8c4c47abd86d964e5f
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index b55f98a..d8edf32 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -936,6 +936,8 @@
i = self.handle.expect( [ "Network\sis\sunreachable",
"onos\sstart/running,\sprocess",
"ONOS\sis\salready\sinstalled",
+ "already\sup-to-date",
+ "\$",
pexpect.TIMEOUT ], timeout=60 )
if i == 0:
main.log.warn( "Network is unreachable" )
@@ -953,6 +955,13 @@
self.handle.expect( "\$" )
return main.TRUE
elif i == 3:
+ main.log.info( "ONOS is already installed on " + node )
+ self.handle.expect( "\$" )
+ return main.TRUE
+ elif i == 4:
+ main.log.info( "ONOS was installed on " + node )
+ return main.TRUE
+ elif i == 5:
main.log.info(
"Installation of ONOS on " +
node +