Update tests for aether pods
- Update test for QA-POD
- SRStaging for testing connecting to Staging pod
- Add some functions for a kubernetes deployed cluster
- Connect to ONOS nodes with kubernetes
- Add option to connect to components through jump hosts
- Fixes for installing ONOS in custom locations
- Invoke python2 instead of python
- If using an ssh agent, also use that for pexpect ssh sessions,
E.G. Jenkins initiated tests
Change-Id: I1fc345c8eab60a5b00c17e6ed677a63489a74a19
diff --git a/TestON/tests/dependencies/Cluster.py b/TestON/tests/dependencies/Cluster.py
index aa63714..2e79481 100644
--- a/TestON/tests/dependencies/Cluster.py
+++ b/TestON/tests/dependencies/Cluster.py
@@ -109,7 +109,7 @@
nodeList = self.runningNodes
for ctrl in nodeList:
- ips.append( ctrl.ipAddress )
+ ips.append( ctrl.ipAddress if ctrl.ipAddress is not 'localhost' else ctrl.address )
return ips
@@ -310,18 +310,21 @@
Returns:
Returns main.TRUE if it successfully set and verify cell.
"""
+ result = main.TRUE
setCellResult = self.command( "setCell",
args=[ cellName ],
specificDriver=1,
getFrom="all" )
- benchCellResult = main.ONOSbench.setCell( cellName )
- verifyResult = self.command( "verifyCell",
- specificDriver=1,
- getFrom="all" )
- result = main.TRUE
for i in range( len( setCellResult ) ):
- result = result and setCellResult[ i ] and verifyResult[ i ]
+ result = result and setCellResult[ i ]
+ benchCellResult = main.ONOSbench.setCell( cellName )
result = result and benchCellResult
+ if not self.useDocker:
+ verifyResult = self.command( "verifyCell",
+ specificDriver=1,
+ getFrom="all" )
+ for i in range( len( verifyResult ) ):
+ result = result and verifyResult[ i ]
return result
def checkService( self ):
@@ -738,6 +741,7 @@
Returns True if it successfully checked
"""
results = True
+ self.command( "getAddress", specificDriver=2 )
nodesOutput = self.command( "nodes", specificDriver=2 )
ips = sorted( self.getIps( activeOnly=True ) )
for i in nodesOutput: