Merge "[ONOS-6595] Allow TestOn to run with non-default username"
diff --git a/TestON/drivers/common/cli/onosclidriver.py b/TestON/drivers/common/cli/onosclidriver.py
index 6289925..b7a4439 100755
--- a/TestON/drivers/common/cli/onosclidriver.py
+++ b/TestON/drivers/common/cli/onosclidriver.py
@@ -5389,6 +5389,7 @@
assert "Command not found:" not in output, output
assert "Error executing command" not in output, output
assert " not found" not in output, output
+ assert "still updating" not in output, output
return main.TRUE
except AssertionError:
main.log.exception( "" )
@@ -5426,6 +5427,7 @@
assert "Error executing command" not in output, output
assert "already associated to network" not in output, output
assert "Interface cannot be added." not in output, output
+ assert "still updating" not in output, output
return main.TRUE
except AssertionError:
main.log.exception( "" )
@@ -5461,6 +5463,7 @@
assert "Command not found:" not in output, output
assert "Error executing command" not in output, output
assert "is not configured" not in output, output
+ assert "still updating" not in output, output
return main.TRUE
except AssertionError:
main.log.exception( "" )
@@ -5488,6 +5491,7 @@
handle = self.sendline( cmdStr )
assert handle is not None, "Error in sendline"
assert "Command not found:" not in handle, handle
+ assert "still updating" not in handle, handle
return handle
except AssertionError:
main.log.exception( "" )
@@ -5526,6 +5530,7 @@
assert "Error executing command" not in output, output
assert "already associated to network" not in output, output
assert "Encapsulation type " not in output, output
+ assert "still updating" not in output, output
return main.TRUE
except AssertionError:
main.log.exception( "" )
diff --git a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.params b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.params
index 89202a5..cefc4f1 100755
--- a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.params
+++ b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.params
@@ -18,7 +18,7 @@
<ENV>
<cellName>bgp_ls</cellName>
- <cellApps>drivers,openflow,proxyarp,mobility</cellApps>
+ <cellApps>drivers,openflow,proxyarp,mobility,pcep-api</cellApps>
</ENV>
<CTRL>
diff --git a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
index fc1bf21..17debe1 100755
--- a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
+++ b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.topo
@@ -2,7 +2,7 @@
<COMPONENT>
<ONOSbench>
- <host>OCN</host>
+ <host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosDriver</type>
@@ -12,7 +12,7 @@
</ONOSbench>
<ONOScli1>
- <host>OCN</host>
+ <host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
diff --git a/TestON/tests/FUNC/FUNCbgpls/dependencies/Nbdata.py b/TestON/tests/FUNC/FUNCbgpls/dependencies/Nbdata.py
index 14f1500..ccf4084 100644
--- a/TestON/tests/FUNC/FUNCbgpls/dependencies/Nbdata.py
+++ b/TestON/tests/FUNC/FUNCbgpls/dependencies/Nbdata.py
@@ -24,7 +24,6 @@
self.bgpPeer = []
self.routerId = ''
self.peerIp = ''
- #self.org_bgp = []
def ipValue( self, localip, remoteip ):
self.routerId = localip
@@ -79,7 +78,7 @@
return self.list1
def checkLinks( self, linksResp ):
- #Declaring the links values
+ # Declaring the links values
links = { 'link1_src': "1650.5555.0055", 'link1_dst': "1660.6666.0066",
'link2_src': "1630.3333.0033", 'link2_dst': "1620.2222.0022",
'link3_src': "1660.6666.0066", 'link3_dst': "1650.5555.0055",
@@ -104,7 +103,7 @@
'link22_src': "1660.6666.0066", 'link4_dst': "1640.4444.0044"
}
- #Comparing the Links
+ # Comparing the Links
for x in xrange( 22 ):
link_src_info = linksResp[ x ][ 'src' ][ 'device' ]
link_dst_info = linksResp[ x ][ 'dst' ][ 'device' ]
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index be8fe28..ee42669 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -1054,7 +1054,6 @@
" OVS running in Mininet and compile intents" +\
" using " + main.flowCompiler
- """
# No option point intents
main.step( "NOOPTION: Add point intents between h1 and h9" )
main.assertReturnString = "Assertion Result for NOOPTION point intent\n"
@@ -1432,7 +1431,6 @@
onpass=main.assertReturnString,
onfail=main.assertReturnString )
- """
main.step( "BANDWIDTH ALLOCATION: Checking bandwidth allocation for point intents between h1 and h9" )
main.assertReturnString = "Assertion Result for BANDWIDTH ALLOCATION for point intent\n"
senders = [
diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
index 2c420aa..d0eec88 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
@@ -16,9 +16,6 @@
- GIT ( optional )
- Checkout ONOS master branch
- Pull latest ONOS code
- - Building ONOS ( optional )
- - Install ONOS package
- - Build ONOS package
"""
main.case( "Constructing test variables and building ONOS package" )
main.step( "Constructing test variables" )
@@ -122,8 +119,8 @@
- Verify cell file
- Kill ONOS process
- Uninstall ONOS cluster
- - Verify ONOS start up
- Install ONOS cluster
+ - Verify ONOS start up
- Connect to cli
"""
import time
@@ -165,7 +162,6 @@
onpass="Successfully created ONOS package",
onfail="Failed to create ONOS package" )
- time.sleep( main.startUpSleep )
main.step( "Uninstalling ONOS package" )
onosUninstallResult = main.TRUE
for ip in main.ONOSip:
@@ -190,6 +186,15 @@
onfail="Failed to install ONOS package" )
time.sleep( main.startUpSleep )
+ main.step( "Set up ONOS secure SSH" )
+ secureSshResult = main.TRUE
+ for i in range( int( main.numCtrls ) ):
+ secureSshResult = secureSshResult and main.ONOSbench.onosSecureSSH( node=main.ONOSip[ i ] )
+ utilities.assert_equals( expect=main.TRUE, actual=secureSshResult,
+ onpass="Test step PASS",
+ onfail="Test step FAIL" )
+
+ time.sleep( main.startUpSleep )
main.step( "Starting ONOS service" )
stopResult = main.TRUE
startResult = main.TRUE