Merge "[ONOS-6584] Added retry function to getNetCFG functions in FUNCnetCfg and VPLS test cases."
diff --git a/TestON/drivers/common/cli/onosdriver.py b/TestON/drivers/common/cli/onosdriver.py
index 611d604..805946b 100755
--- a/TestON/drivers/common/cli/onosdriver.py
+++ b/TestON/drivers/common/cli/onosdriver.py
@@ -40,6 +40,7 @@
self.home = None
self.handle = None
self.nicAddr = None
+ self.prompt = "\$"
super( CLI, self ).__init__()
def connect( self, **connectargs ):
@@ -131,7 +132,7 @@
if self.handle:
self.handle.sendline( "cd " + self.home )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return self.handle
else:
main.log.info( "Failed to create ONOS handle" )
@@ -154,7 +155,7 @@
try:
if self.handle:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "exit" )
self.handle.expect( "closed" )
except pexpect.EOF:
@@ -203,7 +204,7 @@
"Unknown options",
"No such file or directory",
"tar.gz",
- "\$" ],
+ self.prompt ],
opTimeout )
handle = str( self.handle.before + self.handle.after )
if i == 0:
@@ -257,7 +258,7 @@
"BUILD FAILED" ],
timeout=120 )
handle = str( self.handle.before )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "onos-build command returned: " +
handle )
@@ -291,10 +292,10 @@
str( self.name ) +
". This may take some time." )
self.handle.sendline( "cd " + self.home )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
if not skipTest:
self.handle.sendline( "mvn clean install" )
@@ -333,7 +334,7 @@
if "Total time:" in line:
main.log.info( line )
self.handle.sendline( "" )
- self.handle.expect( "\$", timeout=60 )
+ self.handle.expect( self.prompt, timeout=60 )
return main.TRUE
elif i == 5:
main.log.error(
@@ -371,7 +372,7 @@
i = self.handle.expect( [ "This does not appear to be the root of a Buck project.",
"\n",
"BUILD FAILED",
- "\$" ],
+ self.prompt ],
timeout=timeout )
output += str( self.handle.before + self.handle.after )
if i == 0:
@@ -423,7 +424,7 @@
"""
try:
self.handle.sendline( "cd " + self.home )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
cmd = "git pull"
if comp1 != "":
cmd += ' ' + comp1
@@ -461,12 +462,12 @@
main.log.info(
self.name +
": Git Pull - pulling repository now" )
- self.handle.expect( self.home + "\$", 120 )
+ self.handle.expect( self.prompt, 120 )
# So that only when git pull is done, we do mvn clean compile
return main.TRUE
elif i == 3:
main.log.info( self.name + ": Git Pull - Already up to date" )
- return i
+ return main.TRUE
elif i == 4:
main.log.info(
self.name +
@@ -504,7 +505,7 @@
" but a swap file exists." )
try:
self.handle.send( 'A' ) # Abort
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.ERROR
except Exception:
main.log.exception( "Couldn't exit editor prompt!")
@@ -552,7 +553,7 @@
"""
try:
self.handle.sendline( "cd " + self.home )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
main.log.info( self.name +
": Checking out git branch/ref: " + branch + "..." )
cmd = "git checkout " + branch
@@ -588,7 +589,7 @@
main.log.info(
self.name +
": Git Checkout %s : Already on this branch" % branch )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
# main.log.info( "DEBUG: after checkout cmd = "+
# self.handle.before )
return main.TRUE
@@ -596,7 +597,7 @@
main.log.info(
self.name +
": Git checkout %s - Switched to this branch" % branch )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
# main.log.info( "DEBUG: after checkout cmd = "+
# self.handle.before )
return main.TRUE
@@ -613,7 +614,7 @@
"Your local changes to the following files would" +
" be overwritten by checkout:" +
str( self.handle.before ) )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
return main.ERROR
elif i == 6:
main.log.error(
@@ -621,7 +622,7 @@
": Git checkout error: \n" +
"You need to resolve your current index first:" +
str( self.handle.before ) )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
return main.ERROR
elif i == 7:
main.log.info(
@@ -629,13 +630,13 @@
": Git checkout " + str( branch ) +
" - You are in 'detached HEAD' state. HEAD is now at " +
str( branch ) )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
elif i == 8: # Already in detached HEAD on the specified commit
main.log.info(
self.name +
": Git Checkout %s : Already on commit" % branch )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
else:
main.log.error(
@@ -661,10 +662,10 @@
main.log.info( "self.home = " )
main.log.info( self.home )
self.handle.sendline( "cd " + self.home )
- self.handle.expect( self.home + "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "git name-rev --name-only HEAD" )
self.handle.expect( "git name-rev --name-only HEAD" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
lines = self.handle.before.splitlines()
if lines[1] == "master" or re.search( "^onos-\d+(\.\d+)+$", lines[1] ):
return lines[1]
@@ -693,7 +694,7 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline(
"cd " +
self.home +
@@ -702,11 +703,11 @@
# NOTE: for some reason there are backspaces inserted in this
# phrase when run from Jenkins on some tests
self.handle.expect( "never" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
response = ( self.name + ": \n" + str(
self.handle.before + self.handle.after ) )
self.handle.sendline( "cd " + self.home )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
lines = response.splitlines()
for line in lines:
print line
@@ -857,7 +858,7 @@
handleBefore = self.handle.before
handleAfter = self.handle.after
# Get the rest of the handle
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
time.sleep(10)
handleMore = self.handle.before
@@ -888,9 +889,9 @@
try:
# Clean handle by sending empty and expecting $
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-verify-cell" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
handleBefore = self.handle.before
handleAfter = self.handle.after
main.log.info( "Verify cell returned: " + handleBefore +
@@ -974,10 +975,10 @@
cmdstr = str( cmdstr )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos -w " + ONOSIp + " " + cmdstr )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
handleBefore = self.handle.before
main.log.info( "Command sent successfully" )
@@ -1008,19 +1009,19 @@
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( " onos-secure-ssh -u " + userName + " -p " + userPWD + " " + node )
# NOTE: this timeout may need to change depending on the network
# and size of ONOS
# TODO: Handle the other possible error
i = self.handle.expect([ "Network\sis\sunreachable",
- "\$",
+ self.prompt,
pexpect.TIMEOUT ], timeout=180 )
if i == 0:
# can't reach ONOS node
main.log.warn( "Network is unreachable" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.FALSE
elif i == 1:
# Process started
@@ -1063,12 +1064,12 @@
"ONOS\sis\salready\sinstalled",
"already\sup-to-date",
"does not exist",
- "\$",
+ self.prompt,
pexpect.TIMEOUT ], timeout=180 )
if i == 0:
# can't reach ONOS node
main.log.warn( "Network is unreachable" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.FALSE
elif i == 1:
# Process started
@@ -1076,17 +1077,17 @@
"ONOS was installed on " +
node +
" and started" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
elif i == 2 or i == 3:
# same bits are already on ONOS node
main.log.info( "ONOS is already installed on " + node )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
elif i == 4:
# onos not packaged
main.log.error( "ONOS package not found." )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.FALSE
elif i == 5:
# prompt
@@ -1098,7 +1099,7 @@
"Installation of ONOS on " +
node +
" timed out" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.warn( self.handle.before )
return main.FALSE
except pexpect.EOF:
@@ -1118,28 +1119,28 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-service " + str( nodeIp ) +
" start" )
i = self.handle.expect( [
"Job\sis\salready\srunning",
"start/running",
- "\$",
+ self.prompt,
"Unknown\sinstance",
pexpect.TIMEOUT ], timeout=180 )
if i == 0:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "Service is already running" )
return main.TRUE
elif i == 1:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "ONOS service started" )
return main.TRUE
elif i == 2:
main.log.info( "ONOS service started" )
return main.TRUE
else:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.error( "ONOS service failed to start" )
main.cleanup()
main.exit()
@@ -1160,26 +1161,26 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-service " + str( nodeIp ) +
" stop" )
i = self.handle.expect( [
"stop/waiting",
"Could not resolve hostname",
"Unknown\sinstance",
- "\$",
+ self.prompt,
pexpect.TIMEOUT ], timeout=180 )
if i == 0:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "ONOS service stopped" )
return main.TRUE
elif i == 1:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "onosStop() Unknown ONOS instance specified: " +
str( nodeIp ) )
return main.FALSE
elif i == 2:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.warn( "ONOS wasn't running" )
return main.TRUE
elif i == 3:
@@ -1206,9 +1207,9 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$", timeout=180 )
+ self.handle.expect( self.prompt, timeout=180 )
self.handle.sendline( "onos-uninstall " + str( nodeIp ) )
- self.handle.expect( "\$", timeout=180 )
+ self.handle.expect( self.prompt, timeout=180 )
main.log.info( "ONOS " + nodeIp + " was uninstalled" )
# onos-uninstall command does not return any text
return main.TRUE
@@ -1232,7 +1233,7 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
cmdStr = "onos-die " + str( nodeIp )
self.handle.sendline( cmdStr )
i = self.handle.expect( [
@@ -1243,12 +1244,12 @@
main.log.info( "ONOS instance " + str( nodeIp ) +
" was killed and stopped" )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
elif i == 1:
main.log.info( "ONOS process was not running" )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
@@ -1268,10 +1269,10 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-kill " + str( nodeIp ) )
i = self.handle.expect( [
- "\$",
+ self.prompt,
"No\sroute\sto\shost",
"password:",
pexpect.TIMEOUT ], timeout=60 )
@@ -1315,13 +1316,13 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-remove-raft-logs" )
# Sometimes this command hangs
- i = self.handle.expect( [ "\$", pexpect.TIMEOUT ],
+ i = self.handle.expect( [ self.prompt, pexpect.TIMEOUT ],
timeout=120 )
if i == 1:
- i = self.handle.expect( [ "\$", pexpect.TIMEOUT ],
+ i = self.handle.expect( [ self.prompt, pexpect.TIMEOUT ],
timeout=120 )
if i == 1:
return main.FALSE
@@ -1355,7 +1356,7 @@
mntopo = str( mntopo )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-start-network " + mntopo )
self.handle.expect( "mininet>" )
@@ -1384,7 +1385,7 @@
self.handle.sendline( "onos-wait-for-start " + node )
self.handle.expect( "onos-wait-for-start" )
# NOTE: this timeout is arbitrary"
- i = self.handle.expect(["\$", pexpect.TIMEOUT], timeout)
+ i = self.handle.expect([self.prompt, pexpect.TIMEOUT], timeout)
if i == 0:
main.log.info( self.name + ": " + node + " is up" )
return main.TRUE
@@ -1393,7 +1394,7 @@
# we will kill it on timeout
main.log.error( "ONOS has not started yet" )
self.handle.send( "\x03" ) # Control-C
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.FALSE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
@@ -1478,13 +1479,13 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "tshark -i " + str( interface ) + " -t e -w " + str( dirFile ) + " &" )
self.handle.sendline( "\n" )
self.handle.expect( "Capturing on" )
self.handle.sendline( "\n" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( "Tshark started capturing files on " +
str( interface ) + " and saving to directory: " +
@@ -1512,7 +1513,7 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
cmd = "onos-topo-cfg "
self.handle.sendline( cmd + str( onosIp ) + " " + jsonFile )
handle = self.handle.before
@@ -1521,7 +1522,7 @@
main.log.error( self.name + ": " + self.handle.before )
return main.FALSE
else:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
except pexpect.EOF:
@@ -1549,7 +1550,7 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "" )
if grepOptions:
grepStr = "grep "+str(grepOptions)
@@ -1569,7 +1570,7 @@
main.log.info(cmd)
self.handle.expect( "Capturing on" )
self.handle.sendline( "\n" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
main.log.error( self.name + ": " + self.handle.before )
@@ -1614,8 +1615,8 @@
i = self.handle.expect( [
"Multiple",
"Error",
- "\$" ] )
- self.handle.expect( "\$" )
+ self.prompt ] )
+ self.handle.expect( self.prompt )
if i == 0:
handle = self.handle.before
@@ -1702,12 +1703,12 @@
str( destDir ) + str( copyFileName ) +
localtime )
self.handle.expect( "cp" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
else:
self.handle.sendline( "cp " + str( logToCopy ) +
" " + str( destDir ) )
self.handle.expect( "cp" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return self.handle.before
@@ -1750,7 +1751,7 @@
"""
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "onos-service " + str( node ) +
" status" )
i = self.handle.expect( [
@@ -1760,7 +1761,7 @@
"Not Running ...",
pexpect.TIMEOUT ], timeout=120 )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
if i == 0 or i == 1:
main.log.info( "ONOS is running" )
@@ -1843,7 +1844,7 @@
# -D is the 'delete' rule of iptables
actionFlag = '-D'
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
cmd = "sudo iptables " + actionFlag + " " +\
direction +\
" -s " + str( ip )
@@ -1859,7 +1860,7 @@
cmd += " -j " + str( rule )
self.handle.sendline( cmd )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.warn( self.handle.before )
info_string = "On " + str( self.name )
@@ -1893,11 +1894,11 @@
import re
try:
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "cd " + self.home )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
self.handle.sendline( "service onos status" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
response = self.handle.before
if re.search( "onos start/running", response ):
# onos start/running, process 10457
@@ -2269,7 +2270,7 @@
str( ip ) + ":" + mnPath + fileName
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
main.log.info( self.name + ": Execute: " + cmd )
@@ -2288,7 +2289,7 @@
main.log.info( self.name + ": File " + fileName +
" has been copied!" )
self.handle.sendline( "" )
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
except pexpect.EOF:
@@ -2495,7 +2496,7 @@
main.log.error( self.name + ": " + self.handle.before )
return main.FALSE
else:
- self.handle.expect( "\$" )
+ self.handle.expect( self.prompt )
return main.TRUE
except pexpect.EOF:
main.log.error( self.name + ": EOF exception found" )
diff --git a/TestON/tests/CHO/CHOtest/CHOtest.py b/TestON/tests/CHO/CHOtest/CHOtest.py
index 6fc4882..60bbfb1 100644
--- a/TestON/tests/CHO/CHOtest/CHOtest.py
+++ b/TestON/tests/CHO/CHOtest/CHOtest.py
@@ -16,7 +16,6 @@
Startup sequence:
apply cell <name>
git pull
- mvn clean install
onos-package
onos-verify-cell
onos-uninstall
@@ -96,16 +95,6 @@
onpass="Test step PASS",
onfail="Test step FAIL" )
- main.step( "mvn clean & install" )
- if git_pull == 'on':
- mvn_result = main.ONOSbench.cleanInstall()
- utilities.assert_equals( expect=main.TRUE, actual=mvn_result,
- onpass="Test step PASS",
- onfail="Test step FAIL" )
- else:
- mvn_result = main.TRUE
- main.log.info( "Skipped mvn clean install as git pull is disabled in params file" )
-
main.ONOSbench.getVersion( report=True )
main.step( "Create ONOS package" )
diff --git a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
index 7113508..5ad6a87 100644
--- a/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
+++ b/TestON/tests/CHOTestMonkey/CHOTestMonkey.py
@@ -20,7 +20,6 @@
Startup sequence:
apply cell <name>
git pull
- mvn clean install
onos-package
onos-verify-cell
onos-uninstall
@@ -105,16 +104,6 @@
onpass="Test step PASS",
onfail="Test step FAIL" )
- main.step( "mvn clean & install" )
- if gitPull == 'on':
- mvnResult = main.ONOSbench.cleanInstall()
- else:
- mvnResult = main.TRUE
- main.log.info( "Skipped mvn clean install as it is disabled in params file" )
- utilities.assert_equals( expect=main.TRUE,
- actual=mvnResult,
- onpass="Test step PASS",
- onfail="Test step FAIL" )
main.ONOSbench.getVersion( report=True )
main.step( "Create ONOS package" )
diff --git a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
index 8d41458..e4a4567 100644
--- a/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
+++ b/TestON/tests/FUNC/FUNCbgpls/FUNCbgpls.py
@@ -29,7 +29,6 @@
NOTE: temporary - onos-remove-raft-logs
onos-uninstall
git pull
- mvn clean install
onos-package
onos-install -f
onos-wait-for-start
@@ -91,7 +90,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.FALSE
main.step( "Git checkout and pull" + gitBranch )
if PULLCODE:
@@ -102,19 +100,7 @@
onpass="Git pull successful",
onfail="Git pull failed" )
- #main.ONOSbench.getVersion( report=True )
-
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn" +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
+ main.ONOSbench.getVersion( report=True )
main.step( "Creating ONOS package" )
packageResult = main.ONOSbench.buckBuild()
diff --git a/TestON/tests/FUNC/FUNCflow/FUNCflow.py b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
index 3751289..31b427c 100644
--- a/TestON/tests/FUNC/FUNCflow/FUNCflow.py
+++ b/TestON/tests/FUNC/FUNCflow/FUNCflow.py
@@ -82,17 +82,7 @@
onpass="Successfully construct " + "test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " + "latest ONOS",
- onfail="Failed to compile " + "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
+
def CASE2( self, main ):
"""
diff --git a/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py b/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCflow/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py b/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
index 3a59d3d..29b2d2a 100644
--- a/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
+++ b/TestON/tests/FUNC/FUNCgroup/FUNCgroup.py
@@ -101,18 +101,6 @@
onpass="Successfully construct " + "test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " + "latest ONOS",
- onfail="Failed to compile " + "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
-
def CASE2( self, main ):
"""
- Set up cell
diff --git a/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py b/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCgroup/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCintent/FUNCintent.py b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
index ee42669..8adb52a 100644
--- a/TestON/tests/FUNC/FUNCintent/FUNCintent.py
+++ b/TestON/tests/FUNC/FUNCintent/FUNCintent.py
@@ -109,19 +109,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py b/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
index 8122586..ad92fb9 100644
--- a/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCintent/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck Build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py b/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
index f02314c..8ea8d0d 100644
--- a/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
+++ b/TestON/tests/FUNC/FUNCintentRest/FUNCintentRest.py
@@ -126,19 +126,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py b/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
index 8122586..ad92fb9 100644
--- a/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCintentRest/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck Build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
index 26489db..94f64ce 100644
--- a/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
+++ b/TestON/tests/FUNC/FUNCipv6Intent/FUNCipv6Intent.py
@@ -100,19 +100,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCipv6Intent/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
index 51bbe38..7c8bf3b 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/FUNCnetCfg.py
@@ -96,19 +96,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py b/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
index 8455cd6..9ebeb60 100644
--- a/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCnetCfg/dependencies/startUp.py
@@ -25,7 +25,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
index b06741b..1b22c2f 100644
--- a/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
+++ b/TestON/tests/FUNC/FUNCnetconf/FUNCnetconf.py
@@ -112,19 +112,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py b/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
index 8122586..a9becf9 100644
--- a/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
+++ b/TestON/tests/FUNC/FUNCnetconf/dependencies/startUp.py
@@ -27,7 +27,7 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
index 61da26b..1e68327 100644
--- a/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
+++ b/TestON/tests/FUNC/FUNCoptical/FUNCoptical.py
@@ -83,19 +83,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
def CASE2( self, main ):
diff --git a/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py b/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
index 5073a8a..e40a0e8 100644
--- a/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
+++ b/TestON/tests/FUNC/FUNCovsdbtest/FUNCovsdbtest.py
@@ -50,17 +50,6 @@
main.startUpSleep = int( main.params[ 'SLEEP' ][ 'startup' ] )
cellAppString = main.params[ 'ENV' ][ 'cellApps' ]
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + "branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled latest ONOS",
- onfail="Failed to compile latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
main.log.info( "Safety check, killing all ONOS processes" +
diff --git a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
index c8a5c55..499aa77 100644
--- a/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
+++ b/TestON/tests/FUNC/FUNCvirNetNB/FUNCvirNetNB.py
@@ -104,7 +104,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.log.info( "Git checkout and pull " + gitBranch )
if PULLCODE:
@@ -115,18 +114,6 @@
onpass="Git pull successful",
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
-
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
main.step( "Creating ONOS package" )
packageResult = main.ONOSbench.buckBuild()
diff --git a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
index 8931dad..83115b9 100644
--- a/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
+++ b/TestON/tests/HA/HAclusterRestart/HAclusterRestart.py
@@ -133,7 +133,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -160,17 +159,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
index 297171a..6a8283f 100644
--- a/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
+++ b/TestON/tests/HA/HAfullNetPartition/HAfullNetPartition.py
@@ -135,7 +135,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -162,17 +161,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAkillNodes/HAkillNodes.py b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
index df97bd6..31bab52 100644
--- a/TestON/tests/HA/HAkillNodes/HAkillNodes.py
+++ b/TestON/tests/HA/HAkillNodes/HAkillNodes.py
@@ -135,7 +135,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -162,18 +161,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
-
main.step( "Make sure ONOS service doesn't automatically respawn" )
handle = main.ONOSbench.handle
handle.sendline( "sed -i -e 's/^respawn$/#respawn/g' tools/package/init/onos.conf" )
diff --git a/TestON/tests/HA/HAsanity/HAsanity.py b/TestON/tests/HA/HAsanity/HAsanity.py
index de2508e..52f0b49 100644
--- a/TestON/tests/HA/HAsanity/HAsanity.py
+++ b/TestON/tests/HA/HAsanity/HAsanity.py
@@ -134,7 +134,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -161,17 +160,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAscaling/HAscaling.py b/TestON/tests/HA/HAscaling/HAscaling.py
index e1b0425..6e13d85 100644
--- a/TestON/tests/HA/HAscaling/HAscaling.py
+++ b/TestON/tests/HA/HAscaling/HAscaling.py
@@ -155,7 +155,6 @@
onpass="New cluster metadata file generated",
onfail="Failled to generate new metadata file" )
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -182,17 +181,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
index e68ecda..42d88fe 100644
--- a/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
+++ b/TestON/tests/HA/HAsingleInstanceRestart/HAsingleInstanceRestart.py
@@ -110,7 +110,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -137,17 +136,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAstopNodes/HAstopNodes.py b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
index 49fc278..6b86378 100644
--- a/TestON/tests/HA/HAstopNodes/HAstopNodes.py
+++ b/TestON/tests/HA/HAstopNodes/HAstopNodes.py
@@ -135,7 +135,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -162,17 +161,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/HA/HAswapNodes/HAswapNodes.py b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
index fe4f557..0811287 100644
--- a/TestON/tests/HA/HAswapNodes/HAswapNodes.py
+++ b/TestON/tests/HA/HAswapNodes/HAswapNodes.py
@@ -149,7 +149,6 @@
onpass="New cluster metadata file generated",
onfail="Failled to generate new metadata file" )
- cleanInstallResult = main.TRUE
gitPullResult = main.TRUE
main.step( "Starting Mininet" )
@@ -176,17 +175,6 @@
onfail="Git pull failed" )
main.ONOSbench.getVersion( report=True )
- main.step( "Using mvn clean install" )
- cleanInstallResult = main.TRUE
- if PULLCODE and gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- utilities.assert_equals( expect=main.TRUE,
- actual=cleanInstallResult,
- onpass="MCI successful",
- onfail="MCI failed" )
# GRAPHS
# NOTE: important params here:
# job = name of Jenkins job
diff --git a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
index 5ffb455..70bad52 100644
--- a/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
+++ b/TestON/tests/MISC/SCPFbatchFlowResp/SCPFbatchFlowResp.py
@@ -66,19 +66,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
def CASE2( self, main ):
"""
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
index ebd7718..a0e3e7b 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_1node/SAMPstartTemplate_1node.py
@@ -37,16 +37,8 @@
onfail="Failed to pull onos. Exiting test ..." )
if not stepResult: main.exit()
- main.step( "Building ONOS branch: " + gitBranch )
- stepResult = main.ONOSbench.cleanInstall( skipTest = True )
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test..." )
- if not stepResult: main.exit()
-
else:
- main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
+ main.log.warn( "Skipped pulling onos" )
def CASE1( self, main ):
diff --git a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
index 3673622..ba9a3cc 100644
--- a/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
+++ b/TestON/tests/SAMP/SAMPstartTemplate_3node/SAMPstartTemplate_3node.py
@@ -37,14 +37,6 @@
onfail="Failed to pull onos. Exiting test ..." )
if not stepResult: main.exit()
- main.step( "Building ONOS branch: " + gitBranch )
- stepResult = main.ONOSbench.cleanInstall( skipTest = True )
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test..." )
- if not stepResult: main.exit()
-
else:
main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
index fb23e90..0b51d1a 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.params
@@ -11,7 +11,6 @@
</ENV>
<TEST>
- <skipCleanInstall>yes</skipCleanInstall>
<cbenchCMD>cbench -c localhost -p 6653 -m 1000 -l 70 -s 16 -M 100000 -w 10 -D 5000 -</cbenchCMD>
<mode>t</mode> #t throughput
</TEST>
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
index ddadce2..bd14c72 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.py
@@ -35,7 +35,6 @@
CBENCHuser = main.params[ 'CBENCH'][ 'user' ]
MN1Ip = os.environ[ main.params[ 'MN' ][ 'ip1' ] ]
maxNodes = int(main.params[ 'availableNodes' ])
- skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
cellName = main.params[ 'ENV' ][ 'cellName' ]
cellApps = main.params[ 'ENV' ][ 'cellApps' ]
@@ -56,10 +55,6 @@
ipString = os.environ[main.params['CTRL']['ip1']]
ONOSIp.append(ipString)
- #mvn clean install, for debugging set param 'skipCleanInstall' to yes to speed up test
- if skipMvn != "yes":
- mvnResult = main.ONOSbench.cleanInstall()
-
#git
main.step( "Git checkout and pull " + checkoutBranch )
if gitPull == 'on':
@@ -90,10 +85,6 @@
main.ONOSbench.onosUninstall( ONOSIp[i] )
time.sleep(10)
- main.ONOSbench.handle.sendline(" ")
- main.ONOSbench.handle.expect(":~")
- print "pexpect: \n" + main.ONOSbench.handle.before
-
print "Cellname is: "+ cellName + "ONOS IP is: " + str(ONOSIp)
main.ONOSbench.createCellFile(BENCHIp, cellName, MN1Ip,
@@ -102,10 +93,6 @@
main.step( "Set Cell" )
main.ONOSbench.setCell(cellName)
- #main.ONOSbench.handle.sendline(" ")
- #main.ONOSbench.handle.expect(":~")
- #print "pexpect: \n" + main.ONOSbench.handle.before
-
main.step( "Creating ONOS package" )
packageResult = main.ONOSbench.buckBuild()
@@ -116,6 +103,7 @@
for node in range(1, clusterCount + 1):
main.log.info("Starting ONOS " + str(node) + " at IP: " + ONOSIp[node])
main.ONOSbench.onosInstall( ONOSIp[node])
+ main.ONOSbench.onosSecureSSH( node=ONOSIp[node] )
for node in range(1, clusterCount + 1):
for i in range( 2 ):
@@ -149,8 +137,6 @@
onfail="Failed to configure onos for cbench test" )
-
-
def CASE2( self, main ):
main.case("Running Cbench")
main.step("Issuing cbench commands and grab returned results")
@@ -216,8 +202,3 @@
onpass="Successfully tested onos for cbench. ",
onfail="Failed to obtain valid onos cbench result!" )
-
-
-
-
-
diff --git a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
index d4637ad..4f3b35c 100644
--- a/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
+++ b/TestON/tests/SCPF/SCPFcbench/SCPFcbench.topo
@@ -14,16 +14,16 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1>
- <host>OC1</host>
+ <ONOScli1>
+ <host>localhost</host>
<user>sdn</user>
<password>rocks</password>
- <type>OnosDriver</type>
+ <type>OnosCliDriver</type>
<connect_order>9</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1>
+ </ONOScli1>
</COMPONENT>
</TOPOLOGY>
-
+
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
index fe10703..3ce83c0 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.params
@@ -14,7 +14,6 @@
<TEST>
<enableFlowRuleStoreBackup>true</enableFlowRuleStoreBackup>
- <skipCleanInstall>yes</skipCleanInstall>
<warmUp>5</warmUp> #number of runs to warm up the system
<sampleSize>20</sampleSize> #number of runs to take data from
<neighbors>0,a</neighbors> #list of number of neighbors, a = all
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
index 523a285..369cb43 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.py
@@ -31,7 +31,6 @@
BENCHUser = main.params[ 'BENCH' ][ 'user' ]
BENCHIp = main.params[ 'BENCH' ][ 'ip1' ]
main.maxNodes = int(main.params[ 'max' ])
- skipMvn = main.params[ 'TEST' ][ 'skipCleanInstall' ]
cellName = main.params[ 'ENV' ][ 'cellName' ]
main.log.info("==========DEBUG VERSION 3===========")
@@ -57,10 +56,6 @@
ONOSIp = [0]
ONOSIp.extend(main.ONOSbench.getOnosIps())
- #mvn clean install, for debugging set param 'skipCleanInstall' to yes to speed up test
- if skipMvn != "yes":
- mvnResult = main.ONOSbench.cleanInstall()
-
#git
main.step( "Git checkout and pull " + checkoutBranch )
if gitPull == 'on':
@@ -134,7 +129,7 @@
main.log.report( "ONOS " + str(node) + " didn't start!" )
for node in range(1, clusterCount + 1):
- exec "a = main.ONOS%scli.startOnosCli" %str(node)
+ exec "a = main.ONOScli%s.startOnosCli" %str(node)
a(ONOSIp[node])
main.log.info("Startup sequence complete")
diff --git a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
index d521c3a..418f218 100644
--- a/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
+++ b/TestON/tests/SCPF/SCPFflowTp1g/SCPFflowTp1g.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
index c221887..bfbe95d 100644
--- a/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
+++ b/TestON/tests/SCPF/SCPFhostLat/SCPFhostLat.py
@@ -90,14 +90,6 @@
main.commit = main.ONOSbench.getVersion(report=True)
main.commit = main.commit.split(" ")[1]
- if gitPull == 'True':
- if not main.startUp.onosBuild( main, gitBranch ):
- main.log.error( "Failed to build ONOS" )
- main.cleanup()
- main.exit()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
with open(main.dbFileName, "a") as dbFile:
temp = "'" + main.commit + "',"
temp += "'" + nic + "',"
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
index 2fc760a..7952499 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.params
@@ -60,7 +60,6 @@
<TEST>
<loadFrom>1,1,1,1,1,1,1</loadFrom> #generate load on server, 1 = generator on
<numSwitches>10,10,10,10,10,10,10</numSwitches>
- <skipCleanInstall>yes</skipCleanInstall>
<duration>400</duration>
<log_interval>20</log_interval>
<numKeys>40000</numKeys>
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
index 36fa781..d5a2b4d 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.py
@@ -46,16 +46,8 @@
onfail="Failed to pull onos. Exiting test ...")
if not stepResult: main.exit()
- main.step( "Building ONOS branch: " + gitBranch )
- stepResult = main.ONOSbench.cleanInstall( skipTest=True )
- utilities.assert_equals(expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test...")
- if not stepResult: main.exit()
-
else:
- main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
+ main.log.warn( "Skipped pulling onos" )
main.cellName = main.params['ENV']['cellName']
main.Apps = main.params['ENV']['cellApps']
@@ -106,7 +98,7 @@
main.CLIs = []
main.log.info( "Creating list of ONOS cli handles" )
for i in range( main.numCtrls ):
- main.CLIs.append( getattr( main, 'ONOS%scli' % (i + 1) ) )
+ main.CLIs.append( getattr( main, 'ONOScli%s' % (i + 1) ) )
if not main.CLIs:
main.log.error( "Failed to create the list of ONOS cli handles" )
diff --git a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
index 3a1c9f9..f375c84 100644
--- a/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
+++ b/TestON/tests/SCPF/SCPFintentEventTp/SCPFintentEventTp.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
@@ -113,7 +113,6 @@
<COMPONENTS> </COMPONENTS>
</ONOS4>
-
<ONOS5>
<host>OC5</host>
<user>sdn</user>
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
index 8843c2f..308e0d0 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.params
@@ -11,7 +11,6 @@
</ENV>
<TEST>
- <skipCleanInstall>yes</skipCleanInstall>
<warmUp>5</warmUp>
<sampleSize>20</sampleSize>
<intents>1,100,1000</intents> #list format, will be split on ','
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
index 2c990c3..dd49dc0 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.py
@@ -44,13 +44,6 @@
onfail="Failed to pull onos. Exiting test ...")
if not stepResult: main.exit()
- main.step("Building ONOS branch: " + gitBranch)
- stepResult = main.ONOSbench.cleanInstall(skipTest=True)
- utilities.assert_equals(expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test...")
- if not stepResult: main.exit()
else:
main.log.warn("Skipped pulling onos and Skipped building ONOS")
@@ -104,7 +97,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' %(i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
index 915d033..226657f 100644
--- a/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
+++ b/TestON/tests/SCPF/SCPFintentInstallWithdrawLat/SCPFintentInstallWithdrawLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
index 64e0ab5..fd3553c 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.params
@@ -21,7 +21,6 @@
</SEARCHTERM>
<TEST>
- <skipCleanInstall>yes</skipCleanInstall>
<warmUp>5</warmUp>
<sampleSize>20</sampleSize>
<intents>1,100,1000</intents> #list format, will be split on ','
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
index 6a7c259..ab64f23 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.py
@@ -54,15 +54,6 @@
onfail="Failed to pull onos. Exiting test ...")
if not stepResult: main.exit()
- main.step("Building ONOS branch: " + gitBranch)
- stepResult = main.ONOSbench.cleanInstall(skipTest=True)
- utilities.assert_equals(expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test...")
- if not stepResult:
- main.exit()
-
else:
main.log.warn("Skipped pulling onos and Skipped building ONOS")
main.onosIp = main.ONOSbench.getOnosIps()
@@ -71,7 +62,6 @@
main.BENCHIp = main.params['BENCH']['ip1']
main.MN1Ip = main.params['MN']['ip1']
main.maxNodes = int(main.params['max'])
- main.skipMvn = main.params['TEST']['skipCleanInstall']
main.cellName = main.params['ENV']['cellName']
main.scale = (main.params['SCALE']).split(",")
main.timeout = int(main.params['SLEEP']['timeout'])
@@ -130,7 +120,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' % (i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
index 915d033..226657f 100644
--- a/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
+++ b/TestON/tests/SCPF/SCPFintentRerouteLat/SCPFintentRerouteLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
index 3236ef8..951fe83 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.py
@@ -44,13 +44,6 @@
onfail="Failed to pull onos. Exiting test ...")
if not stepResult: main.exit()
- main.step( "Building ONOS branch: " + gitBranch )
- stepResult = main.ONOSbench.cleanInstall( skipTest=True )
- utilities.assert_equals(expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test...")
- if not stepResult: main.exit()
else:
main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
@@ -108,7 +101,7 @@
main.CLIs = []
main.log.info( "Creating list of ONOS cli handles" )
for i in range( main.numCtrls ):
- main.CLIs.append( getattr(main, 'ONOS%scli' % (i + 1)) )
+ main.CLIs.append( getattr(main, 'ONOScli%s' % (i + 1)) )
if not main.CLIs:
main.log.error( "Failed to create the list of ONOS cli handles" )
diff --git a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
index c988f13..750cd78 100644
--- a/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
+++ b/TestON/tests/SCPF/SCPFportLat/SCPFportLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<Mininet1>
<host>OCN</host>
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
index 24ccb4b..5fd051c 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/SCPFscaleTopo.py
@@ -119,20 +119,6 @@
"test variables ",
onfail="Failed to construct test variables" )
- if gitPull == 'True':
- main.step( "Building ONOS in " + gitBranch + " branch" )
- onosBuildResult = main.startUp.onosBuild( main, gitBranch )
- stepResult = onosBuildResult
- utilities.assert_equals( expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully compiled " +
- "latest ONOS",
- onfail="Failed to compile " +
- "latest ONOS" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
-
def CASE2( self, main):
"""
diff --git a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
index bf2a2b6..501cbb3 100644
--- a/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
+++ b/TestON/tests/SCPF/SCPFscaleTopo/dependencies/startUp.py
@@ -28,8 +28,8 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
index 9032e1f..3d46cc8 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/SCPFscalingMaxIntents.py
@@ -115,14 +115,6 @@
commit = main.ONOSbench.getVersion(report=True)
commit = commit.split(" ")[1]
- if gitPull == 'True':
- if not main.startUp.onosBuild( main, gitBranch ):
- main.log.error( "Failed to build ONOS" )
- main.cleanup()
- main.exit()
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
with open(main.dbFileName, "a") as dbFile:
temp = "'" + commit + "',"
temp += "'" + nic + "',"
diff --git a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py b/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
index bf2a2b6..501cbb3 100644
--- a/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
+++ b/TestON/tests/SCPF/SCPFscalingMaxIntents/dependencies/startUp.py
@@ -28,8 +28,8 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
index c921a67..9f7ba70 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.py
@@ -47,13 +47,6 @@
onfail="Failed to pull onos. Exiting test ...")
if not stepResult: main.exit()
- main.step( "Building ONOS branch: " + gitBranch )
- stepResult = main.ONOSbench.cleanInstall( skipTest=True )
- utilities.assert_equals(expect=main.TRUE,
- actual=stepResult,
- onpass="Successfully build onos.",
- onfail="Failed to build onos. Exiting test...")
- if not stepResult: main.exit()
else:
main.log.warn( "Skipped pulling onos and Skipped building ONOS" )
@@ -111,7 +104,7 @@
main.CLIs = []
main.log.info("Creating list of ONOS cli handles")
for i in range(main.numCtrls):
- main.CLIs.append(getattr(main, 'ONOS%scli' % (i + 1)))
+ main.CLIs.append(getattr(main, 'ONOScli%s' % (i + 1)))
if not main.CLIs:
main.log.error("Failed to create the list of ONOS cli handles")
diff --git a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
index 4addd4a..8373f13 100644
--- a/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
+++ b/TestON/tests/SCPF/SCPFswitchLat/SCPFswitchLat.topo
@@ -14,68 +14,68 @@
</COMPONENTS>
</ONOSbench>
- <ONOS1cli>
+ <ONOScli1>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>2</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS1cli>
+ </ONOScli1>
- <ONOS2cli>
+ <ONOScli2>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>3</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS2cli>
+ </ONOScli2>
- <ONOS3cli>
+ <ONOScli3>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>4</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS3cli>
+ </ONOScli3>
- <ONOS4cli>
+ <ONOScli4>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>5</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS4cli>
+ </ONOScli4>
- <ONOS5cli>
+ <ONOScli5>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>6</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS5cli>
+ </ONOScli5>
- <ONOS6cli>
+ <ONOScli6>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>7</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS6cli>
+ </ONOScli6>
- <ONOS7cli>
+ <ONOScli7>
<host>localhost</host>
<user>sdn</user>
<password>rocks</password>
<type>OnosCliDriver</type>
<connect_order>8</connect_order>
<COMPONENTS> </COMPONENTS>
- </ONOS7cli>
+ </ONOScli7>
<ONOS1>
<host>OC1</host>
diff --git a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
index 1c19c30..b3d34de 100644
--- a/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
+++ b/TestON/tests/USECASE/SDNIPfunction/SDNIPfunction.py
@@ -34,19 +34,11 @@
main.log.report( "Uninstalling ONOS" )
main.ONOSbench.onosUninstall( ONOS1Ip )
- # cleanInstallResult = main.TRUE
# gitPullResult = main.TRUE
main.step( "Git pull" )
gitPullResult = main.ONOSbench.gitPull()
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- cleanInstallResult = main.ONOSbench.cleanInstall( mciTimeout = 1000 )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- cleanInstallResult = main.TRUE
main.ONOSbench.getVersion( report = True )
@@ -71,9 +63,8 @@
cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
commandlineTimeout = 100, onosStartTimeout = 600 )
- case1Result = ( cleanInstallResult and packageResult and
- cellResult and verifyResult and
- onos1InstallResult and
+ case1Result = ( packageResult and cellResult and
+ verifyResult and onos1InstallResult and
onos1Isup and secureSshResult and
cliResult )
diff --git a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
index 9d6ae4a..0134e42 100644
--- a/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
+++ b/TestON/tests/USECASE/SDNIPperf/SDNIPperf.py
@@ -32,21 +32,11 @@
main.log.report( "Uninstalling ONOS" )
main.ONOSbench.onosUninstall( ONOS1Ip )
- cleanInstallResult = main.TRUE
- gitPullResult = main.TRUE
-
main.step( "Git pull" )
gitPullResult = main.FALSE
#Need to push some new code to ONOS before using the git pull
#gitPullResult = main.ONOSbench.gitPull()
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- #cleanInstallResult = main.ONOSbench.cleanInstall()
- cleanInstallResult = main.ONOSbench.cleanInstall( skipTest=True)
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
main.ONOSbench.getVersion( report=True )
main.step( "Creating ONOS package" )
@@ -70,9 +60,8 @@
cliResult = main.ONOScli.startOnosCli( ONOS1Ip,
commandlineTimeout=100, onosStartTimeout=600)
- case1Result = ( cleanInstallResult and packageResult and
- cellResult and verifyResult and
- onos1InstallResult and
+ case1Result = ( packageResult and cellResult and
+ verifyResult and onos1InstallResult and
onos1Isup and secureSshResult and
cliResult )
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
index bf2a2b6..501cbb3 100755
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/startUp.py
@@ -28,8 +28,8 @@
else:
main.log.info( "Successfully pulled " + gitBranch + " branch" )
- # Maven clean install
- buildResult = main.ONOSbench.cleanInstall()
+ # buck build
+ buildResult = main.ONOSbench.buckBuild()
return buildResult
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
index 69e9aef..983ac75 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction/USECASE_SdnipFunction.py
@@ -126,18 +126,6 @@
actual=gitPullResult2,
onpass="Git pull ONOS succeeded",
onfail="Git pull ONOS failed" )
-
- main.step( "Using mvn clean install" )
- if gitPullResult == main.TRUE:
- mciResult = main.ONOSbench.cleanInstall( mciTimeout=1000 )
- utilities.assert_equals( expect=main.TRUE,
- actual=mciResult,
- onpass="Maven clean install ONOS succeeded",
- onfail="Maven clean install ONOS failed" )
- else:
- main.log.warn( "Did not pull new code so skipping mvn " +
- "clean install" )
- mciResult = main.TRUE
'''
main.ONOSbench.getVersion( report=True )
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
index 76f7ccd..5a5d089 100644
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
@@ -74,8 +74,6 @@
killed = main.ONOSbench.onosKill( node.ip_address )
killResults = killResults and killed
- cleanInstallResult = main.TRUE
-
main.step( "Starting Mininet" )
# scp topo file to mininet
# TODO: move to params?