Look at port stats to choose port
- In TOST port failure tests, look at port stats to
determine which link is carrying the most traffic
so we can bring it down
- Add eNB leaf-spine link down case
Change-Id: Ia13f3d41e836deaf21dd93574a39ccd954dd488f
diff --git a/TestON/drivers/common/cli/emulator/scapyclidriver.py b/TestON/drivers/common/cli/emulator/scapyclidriver.py
index 79a1956..c4708bc 100644
--- a/TestON/drivers/common/cli/emulator/scapyclidriver.py
+++ b/TestON/drivers/common/cli/emulator/scapyclidriver.py
@@ -792,7 +792,7 @@
self.handle.expect( self.scapyPrompt )
response = self.cleanOutput( self.handle.before )
main.log.debug( self.name + ": Send packet response: {}".format( response ) )
- if "Traceback" in response:
+ if "Traceback" in response or "Errno" in response or "Error" in response:
# KeyError, SyntaxError, ...
main.log.error( self.name + ": Error in sending command: " + response )
return main.FALSE
@@ -915,6 +915,10 @@
else:
self.handle.sendline( "pkts.summary()")
output = self.clearBuffer()
+ if "Traceback" in output or "Errno" in output or "Error" in output:
+ # KeyError, SyntaxError, IOError, NameError, ...
+ main.log.error( self.name + ": Error in sending command: " + output )
+ main.cleanAndExit()
except pexpect.TIMEOUT:
main.log.exception( self.name + ": Command timed out" )
return None
@@ -1081,7 +1085,7 @@
gw = route.get( 'gw' )
iface = route.get( 'interface' )
returnValues .append( self.addRoute( "%s/%s" % ( route.get( 'network' ), route.get( 'netmask' ) ),
- gw if gw else main.Cluster.active(0).ipAddress,
+ gw if gw else main.Cluster.active(0).address,
interface=iface if iface else self.interfaces[ 0 ].get( 'name' ) ) )
return returnValues
diff --git a/TestON/drivers/common/cli/onosclusterdriver.py b/TestON/drivers/common/cli/onosclusterdriver.py
index d10b17f..b0f924b 100755
--- a/TestON/drivers/common/cli/onosclusterdriver.py
+++ b/TestON/drivers/common/cli/onosclusterdriver.py
@@ -233,6 +233,8 @@
portsList += "%s:%s " % ( localPort, port )
if port == cliPort:
node.CLI.karafPort = localPort
+ elif port == guiPort:
+ node.REST.port = localPort
main.log.info( "Setting up port forward for pod %s: [ %s ]" % ( self.podNames[ index ], portsList ) )
pf = kubectl.kubectlPortForward( self.podNames[ index ],
portsList,