Changes for SRBridging tests through test-station
Change-Id: Ifb6600f244885e94be3444eb18889c564b7b0b1a
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 06caa7c..6e3a7d3 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -1409,7 +1409,7 @@
main.log.debug( "%s: %s" % ( self.name, handle ) )
assert handle is not None, "Error in sendline"
assert "Command not found:" not in handle, handle
- assert "error" not in handle, handle
+ # assert "error" not in handle, handle
assert "usage:" not in handle, handle
return main.TRUE
except AssertionError:
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.topo b/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
index fa04a90..255ce76 100755
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.topo
@@ -11,8 +11,8 @@
<COMPONENTS>
<cluster_name></cluster_name> # Used as a prefix for cluster components. Defaults to 'ONOS'
<diff_clihost></diff_clihost> # if it has different host other than localhost for CLI. True or empty. OC# will be used for True.
- <karaf_username></karaf_username>
- <karaf_password></karaf_password>
+ <karaf_username>sdn/karaf_username>
+ <karaf_password>rocks</karaf_password>
<web_user></web_user>
<web_pass></web_pass>
<rest_port></rest_port>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
index 7021d41..343c458 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.params
@@ -21,10 +21,11 @@
<topology>trellis_fabric.py</topology>
<lib>routinglib.py,trellislib.py,stratum.py</lib>
<conf>bgpdbgp1.conf,bgpdbgp2.conf,bgpdr1.conf,bgpdr2.conf,dhcpd6.conf,dhcpd.conf,zebradbgp1.conf,zebradbgp2.conf</conf>
- <trellisOar>/home/sdn/segmentrouting-app-3.0.1-SNAPSHOT.oar</trellisOar>
- <t3Oar>/home/sdn/t3-app-4.0.0-SNAPSHOT.oar</t3Oar>
+ <trellisOar>~/trellis-control/app/target/segmentrouting-app-3.0.1-SNAPSHOT.oar</trellisOar>
+ <t3Oar>~/trellis-t3/app/target/t3-app-4.0.0-SNAPSHOT.oar</t3Oar>
</DEPENDENCY>
+ <trellisOar>~/segmentrouting-app-3.0.1-SNAPSHOT.oar</trellisOar>
<ENV>
<cellName>productionCell</cellName>
<cellApps>drivers,openflow,fpm,netcfghostprovider,drivers.bmv2,pipelines.fabric</cellApps>
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo
index 4be7eca..6ab0e2d 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.topo
@@ -12,8 +12,12 @@
<docker_prompt>~/onos#</docker_prompt>
<cluster_name></cluster_name> # Used as a prefix for cluster components. Defaults to 'ONOS'
<diff_clihost></diff_clihost> # if it has different host other than localhost for CLI. True or empty. OC# will be used if True.
- <karaf_username></karaf_username>
- <karaf_password></karaf_password>
+ <karaf_username>sdn</karaf_username>
+ <karaf_password>rocks</karaf_password>
+ <node_username>sdn</node_username>
+ <node_password>rocks</node_password>
+ <karafPrompt_username></karafPrompt_username>
+ <karafPrompt_password></karafPrompt_password>
<web_user></web_user>
<web_pass></web_pass>
<rest_port></rest_port>
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 3f9efcc..c8d83ef 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -111,6 +111,8 @@
- Install ONOS cluster
- Connect to cli
"""
+ # Check params file for local repos on external apps. cd to repos, run the build command, potentially move o/p file to a different location
+
# main.scale[ 0 ] determines the current number of ONOS controller
try:
if not main.persistentSetup and main.params.get( 'EXTERNAL_APPS' ):
diff --git a/TestON/tests/dependencies/Cluster.py b/TestON/tests/dependencies/Cluster.py
index b905381..b99e069 100644
--- a/TestON/tests/dependencies/Cluster.py
+++ b/TestON/tests/dependencies/Cluster.py
@@ -255,7 +255,7 @@
cellApps,
onosIps,
atomixIps,
- main.ONOScell.karafUser,
+ main.ONOScell.nodeUser,
useSSH ],
specificDriver=1,
getFrom="all" if installMax else "running" )
@@ -745,10 +745,15 @@
Returns:
Returns True if it successfully checked
"""
+ import time
results = True
nodesOutput = self.command( "nodes", specificDriver=2 )
if None in nodesOutput:
- return False
+ time.sleep(60)
+ nodesOutput = self.command( "nodes", specificDriver=2 )
+ main.log.debug(nodesOutput)
+ if None in nodesOutput:
+ return False
try:
self.command( "getAddress", specificDriver=2 )
except ( ValueError, TypeError ):