Cleanup for demo
Change-Id: Iaff367aff0cbdf3fb605ad5003612c4bcc35f6b6
diff --git a/TestON/drivers/common/cli/emulator/mininetclidriver.py b/TestON/drivers/common/cli/emulator/mininetclidriver.py
index 54e7d0f..b7dc6ac 100644
--- a/TestON/drivers/common/cli/emulator/mininetclidriver.py
+++ b/TestON/drivers/common/cli/emulator/mininetclidriver.py
@@ -1295,10 +1295,10 @@
Example: main.Mininet.node( nodeName="h1", commandStr="ls" )
"""
command = str( nodeName ) + " " + str( commandStr )
- main.log.info( command )
-
try:
response = self.execute( cmd = command, prompt = "mininet>" )
+ #self.handle.sendline( command )
+ #response = self.handle.expect( "mininet>" )
if re.search( "Unknown command", response ):
main.log.warn( response )
return main.FALSE
@@ -1314,8 +1314,6 @@
main.log.error( self.name + ": " + self.handle.before )
main.cleanup()
main.exit()
- main.log.info( " response is :" )
- main.log.info( response )
return response
def yank( self, **yankargs ):
@@ -1530,7 +1528,9 @@
for cmd in commandList:
try:
- self.execute( cmd=cmd, prompt="mininet>", timeout=5 )
+ self.handle.sendline( cmd )
+ self.handle.expect( "mininet>" )
+ #self.execute( cmd=cmd, prompt="mininet>", timeout=5 )
except pexpect.TIMEOUT:
main.log.error( self.name + ": pexpect.TIMEOUT found" )
return main.FALSE
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index ba2b37c..b64f151 100644
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -4162,6 +4162,7 @@
handle = self.sendline( cmdStr )
assert "Command not found:" not in handle, handle
assert "Error:" not in handle, handle
+ assert "Exception" not in handle, handle
if not handle:
main.log.error( self.name + ": There is no output in " +
"summary command" )
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index e4935fc..3cb9843 100644
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -707,7 +707,6 @@
mnString = ""
onosString = "export OC"
tempCount = 1
-
# Create ONOSNIC ip address prefix
tempOnosIp = str( onosIpAddrs[ 0 ] )
tempList = []
@@ -717,11 +716,9 @@
# Structure the nic string ip
nicAddr = ".".join( tempList ) + ".*"
onosNicString = "export ONOS_NIC=" + nicAddr
-
try:
# Start writing to file
cellFile.write( onosNicString + "\n" )
-
for arg in onosIpAddrs:
# For each argument in onosIpAddrs, write to file
# Output should look like the following:
@@ -730,12 +727,10 @@
cellFile.write( onosString + str( tempCount ) +
"=\"" + arg + "\"\n" )
tempCount = tempCount + 1
-
cellFile.write( "export OCI=$OC1\n" )
cellFile.write( mnString + "\"" + mnIpAddrs + "\"\n" )
cellFile.write( appString + "\n" )
cellFile.close()
-
# We use os.system to send the command to TestON cluster
# to account for the case in which TestON is not located
# on the same cluster as the ONOS bench
@@ -744,9 +739,7 @@
# between TestON and ONOS bench in order to automate the test.
os.system( "scp " + tempDirectory + fileName + " " +
self.user_name + "@" + self.ip_address + ":" + cellDirectory )
-
return main.TRUE
-
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -780,7 +773,6 @@
handleMore = self.handle.before
cell_result = handleBefore + handleAfter + handleMore
- print cell_result
if( re.search( "No such cell", cell_result ) ):
main.log.error( "Cell call returned: " + handleBefore +
handleAfter + handleMore )
@@ -811,8 +803,6 @@
self.handle.expect( "\$" )
handleBefore = self.handle.before
handleAfter = self.handle.after
- main.log.info( "Verify cell returned: " + handleBefore +
- handleAfter )
return main.TRUE
except pexpect.ExceptionPexpect as e:
main.log.exception( self.name + ": Pexpect exception found: " )