[ONOS-6593]Review and Refactor ONOS startup procedures in TestON
Change-Id: I509a8ee7a26c198957bebf59da5c85a0edb8b995
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params b/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
index b1c2f8f..7fc2d27 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.params
@@ -17,7 +17,10 @@
<fsfwPort>6633</fsfwPort>
<port1>6653</port1>
</CTRL>
-
+ <GIT>
+ <pull>False</pull>
+ <branch>master</branch>
+ </GIT>
<DEPENDENCY>
<path>/USECASE/USECASE_SdnipFunction_fsfw/dependencies/</path>
<topology>USECASE_SdnipI2MN.py</topology>
diff --git a/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py b/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
index da38107..505a602 100644
--- a/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
+++ b/TestON/tests/USECASE/USECASE_SdnipFunction_fsfw/USECASE_SdnipFunction_fsfw.py
@@ -29,8 +29,6 @@
main.exit()
main.step( "Connect switches to FSFW" )
- global ONOS1Ip
- ONOS1Ip = os.getenv( main.params[ 'CTRL' ][ 'ip1' ] )
global fsfwIp
# TDOO: there is some setup sequence issue, will fix it later
# fsfwIp = os.getenv( main.params[ 'CTRL' ][ 'ipN' ] )
@@ -53,10 +51,10 @@
main.exit()
main.step( "Set up tunnel from Mininet node to onos node" )
- forwarding1 = '%s:2000:%s:2000' % ( '1.1.1.2', ONOS1Ip )
+ forwarding1 = '%s:2000:%s:2000' % ( '1.1.1.2', main.ONOSip[ 0 ] )
command = 'ssh -nNT -o "PasswordAuthentication no"'
command += ' -o "StrictHostKeyChecking no" -l sdn'
- command += ' -L %s %s & ' % ( forwarding1, ONOS1Ip )
+ command += ' -L %s %s & ' % ( forwarding1, main.ONOSip[ 0 ] )
tunnelResult = main.TRUE
tunnelResult = main.Mininet.node( "root", command )
@@ -83,108 +81,17 @@
import os
from operator import eq
- main.case( "Setting up ONOS environment" )
-
- cellName = main.params[ 'ENV' ][ 'cellName' ]
- global ONOS1Ip
- ONOS1Ip = os.getenv( main.params[ 'CTRL' ][ 'ip1' ] )
- ipList = [ ONOS1Ip ]
-
- main.step( "Copying config files" )
- src = os.path.dirname( main.testFile ) + "/network-cfg.json"
- dst = main.ONOSbench.home + "/tools/package/config/network-cfg.json"
- status = main.ONOSbench.scp( main.ONOSbench, src, dst, direction="to" )
- utilities.assert_equals( expect=main.TRUE,
- actual=status,
- onpass="Copy config file succeeded",
- onfail="Copy config file failed" )
-
- main.step( "Create cell file" )
- cellAppString = main.params[ 'ENV' ][ 'appString' ]
- main.ONOSbench.createCellFile( main.ONOSbench.ip_address, cellName,
- main.Mininet.ip_address,
- cellAppString, ipList, main.ONOScli1.karafUser )
-
- main.step( "Applying cell variable to environment" )
- cellResult = main.ONOSbench.setCell( cellName )
- utilities.assert_equals( expect=main.TRUE,
- actual=cellResult,
- onpass="Set cell succeeded",
- onfail="Set cell failed" )
-
- main.step( "Verify cell connectivity" )
- verifyResult = main.ONOSbench.verifyCell()
- utilities.assert_equals( expect=main.TRUE,
- actual=verifyResult,
- onpass="Verify cell succeeded",
- onfail="Verify cell failed" )
-
- branchName = main.ONOSbench.getBranchName()
- main.log.report( "ONOS is on branch: " + branchName )
-
- main.step( "Uninstalling ONOS" )
- uninstallResult = main.ONOSbench.onosUninstall( ONOS1Ip )
- utilities.assert_equals( expect=main.TRUE,
- actual=uninstallResult,
- onpass="Uninstall ONOS succeeded",
- onfail="Uninstall ONOS failed" )
-
- main.ONOSbench.getVersion( report=True )
-
- main.step( "Creating ONOS package" )
- packageResult = main.ONOSbench.buckBuild()
- utilities.assert_equals( expect=main.TRUE,
- actual=packageResult,
- onpass="Package ONOS succeeded",
- onfail="Package ONOS failed" )
-
- main.step( "Installing ONOS package" )
- onos1InstallResult = main.ONOSbench.onosInstall( options="-f",
- node=ONOS1Ip )
- utilities.assert_equals( expect=main.TRUE,
- actual=onos1InstallResult,
- onpass="Install ONOS succeeded",
- onfail="Install ONOS failed" )
-
- main.step( "Set up ONOS secure SSH" )
- secureSshResult = main.ONOSbench.onosSecureSSH( node=ONOS1Ip )
- utilities.assert_equals( expect=main.TRUE,
- actual=secureSshResult,
- onpass="Set up ONOS secure SSH succeeded",
- onfail="Set up ONOS secure SSH failed " )
-
- main.step( "Checking if ONOS is up yet" )
- onos1UpResult = main.ONOSbench.isup( ONOS1Ip, timeout=420 )
- utilities.assert_equals( expect=main.TRUE,
- actual=onos1UpResult,
- onpass="ONOS is up",
- onfail="ONOS is NOT up" )
-
- main.step( "Checking if ONOS CLI is ready" )
- cliResult = main.ONOScli1.startOnosCli( ONOS1Ip,
- commandlineTimeout=100,
- onosStartTimeout=600 )
- utilities.assert_equals( expect=main.TRUE,
- actual=cliResult,
- onpass="ONOS CLI is ready",
- onfail="ONOS CLI is not ready" )
-
- for i in range( 10 ):
- ready = True
- output = main.ONOScli1.summary()
- if not output:
- ready = False
- if ready:
- break
- time.sleep( 30 )
- utilities.assert_equals( expect=True, actual=ready,
- onpass="ONOS summary command succeded",
- onfail="ONOS summary command failed" )
-
- if not ready:
- main.log.error( "ONOS startup failed!" )
- main.cleanup()
+ try:
+ from tests.USECASE.dependencies.sdnipBaseFunction import SdnBase
+ except ImportError:
+ main.log.error( "sdnBase not found. exiting the test" )
main.exit()
+ try:
+ main.sdnBase
+ except ( NameError, AttributeError ):
+ main.sdnBase = SdnBase()
+
+ main.sdnBase.initSetup()
main.log.info( "Get links in the network" )
time.sleep( int ( main.params['timers']['TopoDiscovery'] ) )
@@ -249,30 +156,7 @@
'''
point-to-point intents test for each BGP peer and BGP speaker pair
'''
- import time
- main.case( "Check point-to-point intents" )
- main.log.info( "There are %s BGP peers in total "
- % main.params[ 'config' ][ 'peerNum' ] )
- main.step( "Check P2P intents number from ONOS CLI" )
-
- getIntentsResult = main.ONOScli1.intents( jsonFormat=True )
- bgpIntentsActualNum = \
- main.QuaggaCliSpeaker1.extractActualBgpIntentNum( getIntentsResult )
- bgpIntentsExpectedNum = int( main.params[ 'config' ][ 'peerNum' ] ) * 6
- if bgpIntentsActualNum != bgpIntentsExpectedNum:
- time.sleep( int( main.params['timers']['RouteDelivery'] ) )
- getIntentsResult = main.ONOScli1.intents( jsonFormat=True )
- bgpIntentsActualNum = \
- main.QuaggaCliSpeaker1.extractActualBgpIntentNum( getIntentsResult )
- main.log.info( "bgpIntentsExpected num is:" )
- main.log.info( bgpIntentsExpectedNum )
- main.log.info( "bgpIntentsActual num is:" )
- main.log.info( bgpIntentsActualNum )
- utilities.assertEquals( \
- expect=True,
- actual=eq( bgpIntentsExpectedNum, bgpIntentsActualNum ),
- onpass="PointToPointIntent Intent Num is correct!",
- onfail="PointToPointIntent Intent Num is wrong!" )
+ main.sdnBase.pToPIntentTest( 6 )
def CASE3( self, main ):
@@ -287,60 +171,7 @@
allRoutesExpected.append( "5.0.0.0/24" + "/" + "10.0.5.1" )
allRoutesExpected.append( "6.0.0.0/24" + "/" + "10.0.6.1" )
- getRoutesResult = main.ONOScli1.routes( jsonFormat=True )
- allRoutesActual = \
- main.QuaggaCliSpeaker1.extractActualRoutesMaster( getRoutesResult )
- allRoutesStrExpected = str( sorted( allRoutesExpected ) )
- allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
- if allRoutesStrActual != allRoutesStrExpected:
- time.sleep( int( main.params['timers']['RouteDelivery'] ) )
- getRoutesResult = main.ONOScli1.routes( jsonFormat=True )
- allRoutesActual = \
- main.QuaggaCliSpeaker1.extractActualRoutesMaster( getRoutesResult )
- allRoutesStrActual = str( allRoutesActual ).replace( 'u', "" )
-
- main.step( "Check routes installed" )
- main.log.info( "Routes expected:" )
- main.log.info( allRoutesStrExpected )
- main.log.info( "Routes get from ONOS CLI:" )
- main.log.info( allRoutesStrActual )
- utilities.assertEquals( \
- expect=allRoutesStrExpected, actual=allRoutesStrActual,
- onpass="Routes are correct!",
- onfail="Routes are wrong!" )
-
- main.step( "Check M2S intents installed" )
- getIntentsResult = main.ONOScli1.intents( jsonFormat=True )
- routeIntentsActualNum = \
- main.QuaggaCliSpeaker1.extractActualRouteIntentNum( getIntentsResult )
- routeIntentsExpectedNum = 3
- if routeIntentsActualNum != routeIntentsExpectedNum:
- time.sleep( int( main.params['timers']['RouteDelivery'] ) )
- getIntentsResult = main.ONOScli1.intents( jsonFormat=True )
- routeIntentsActualNum = \
- main.QuaggaCliSpeaker1.extractActualRouteIntentNum( getIntentsResult )
-
- main.log.info( "MultiPointToSinglePoint Intent Num expected is:" )
- main.log.info( routeIntentsExpectedNum )
- main.log.info( "MultiPointToSinglePoint Intent NUM Actual is:" )
- main.log.info( routeIntentsActualNum )
- utilities.assertEquals( \
- expect=routeIntentsExpectedNum,
- actual=routeIntentsActualNum,
- onpass="MultiPointToSinglePoint Intent Num is correct!",
- onfail="MultiPointToSinglePoint Intent Num is wrong!" )
-
- main.step( "Check whether all flow status are ADDED" )
- flowCheck = utilities.retry( main.ONOScli1.checkFlowsState,
- main.FALSE,
- kwargs={'isPENDING':False},
- attempts=10 )
- utilities.assertEquals( \
- expect=main.TRUE,
- actual=flowCheck,
- onpass="Flow status is correct!",
- onfail="Flow status is wrong!" )
-
+ main.sdnBase.routeAndIntentCheck( allRoutesExpected, 3 )
def CASE4( self, main ):
'''
@@ -356,150 +187,19 @@
'''
Cut links to peers one by one, check routes/intents
'''
- import time
- main.case( "Bring down links and check routes/intents" )
- main.step( "Bring down the link between sw32 and peer64514" )
- linkResult1 = main.Mininet.link( END1="sw32", END2="pr64514",
- OPTION="down" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult1,
- onpass="Bring down link succeeded!",
- onfail="Bring down link failed!" )
-
- if linkResult1 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 2 )
- main.Functions.checkM2SintentNum( main, 2 )
- else:
- main.log.error( "Bring down link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Bring down the link between sw8 and peer64515" )
- linkResult2 = main.Mininet.link( END1="sw8", END2="pr64515",
- OPTION="down" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult2,
- onpass="Bring down link succeeded!",
- onfail="Bring down link failed!" )
- if linkResult2 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 1 )
- main.Functions.checkM2SintentNum( main, 1 )
- else:
- main.log.error( "Bring down link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Bring down the link between sw28 and peer64516" )
- linkResult3 = main.Mininet.link( END1="sw28", END2="pr64516",
- OPTION="down" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult3,
- onpass="Bring down link succeeded!",
- onfail="Bring down link failed!" )
- if linkResult3 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 0 )
- main.Functions.checkM2SintentNum( main, 0 )
- else:
- main.log.error( "Bring down link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Check whether all flow status are ADDED" )
- flowCheck = utilities.retry( main.ONOScli1.checkFlowsState,
- main.FALSE,
- kwargs={'isPENDING':False},
- attempts=10 )
- utilities.assertEquals( \
- expect=main.TRUE,
- actual=flowCheck,
- onpass="Flow status is correct!",
- onfail="Flow status is wrong!" )
-
- # Ping test
- main.Functions.pingSpeakerToPeer( main, speakers=["speaker1"],
- peers=["pr64514", "pr64515", "pr64516"],
- expectAllSuccess=False )
- main.Functions.pingHostToHost( main,
- hosts=["host64514", "host64515", "host64516"],
- expectAllSuccess=False )
-
+ main.sdnBase.linkUpDownCheck( "pr64514", "pr64515", "pr64516",
+ 2, 2, 1, 1, 0, 0,
+ "speaker1", [ "host64514", "host64515", "host64516" ],
+ "down" )
def CASE6( self, main ):
'''
Recover links to peers one by one, check routes/intents
'''
- import time
- main.case( "Bring up links and check routes/intents" )
- main.step( "Bring up the link between sw32 and peer64514" )
- linkResult1 = main.Mininet.link( END1="sw32", END2="pr64514",
- OPTION="up" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult1,
- onpass="Bring up link succeeded!",
- onfail="Bring up link failed!" )
- if linkResult1 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 1 )
- main.Functions.checkM2SintentNum( main, 1 )
- else:
- main.log.error( "Bring up link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Bring up the link between sw8 and peer64515" )
- linkResult2 = main.Mininet.link( END1="sw8", END2="pr64515",
- OPTION="up" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult2,
- onpass="Bring up link succeeded!",
- onfail="Bring up link failed!" )
- if linkResult2 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 2 )
- main.Functions.checkM2SintentNum( main, 2 )
- else:
- main.log.error( "Bring up link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Bring up the link between sw28 and peer64516" )
- linkResult3 = main.Mininet.link( END1="sw28", END2="pr64516",
- OPTION="up" )
- utilities.assertEquals( expect=main.TRUE,
- actual=linkResult3,
- onpass="Bring up link succeeded!",
- onfail="Bring up link failed!" )
- if linkResult3 == main.TRUE:
- time.sleep( int( main.params[ 'timers' ][ 'RouteDelivery' ] ) )
- main.Functions.checkRouteNum( main, 3 )
- main.Functions.checkM2SintentNum( main, 3 )
- else:
- main.log.error( "Bring up link failed!" )
- main.cleanup()
- main.exit()
-
- main.step( "Check whether all flow status are ADDED" )
- flowCheck = utilities.retry( main.ONOScli1.checkFlowsState,
- main.FALSE,
- kwargs={'isPENDING':False},
- attempts=10 )
- utilities.assertEquals( \
- expect=main.TRUE,
- actual=flowCheck,
- onpass="Flow status is correct!",
- onfail="Flow status is wrong!" )
-
- # Ping test
- main.Functions.pingSpeakerToPeer( main, speakers=["speaker1"],
- peers=["pr64514", "pr64515", "pr64516"],
- expectAllSuccess=True )
- main.Functions.pingHostToHost( main,
- hosts=["host64514", "host64515", "host64516"],
- expectAllSuccess=True )
-
+ main.sdnBase.linkUpDownCheck( "pr64514", "pr64515", "pr64516",
+ 1, 1, 2, 2, 3, 3,
+ "speaker1", [ "host64514", "host64515", "host64516" ],
+ "up" )
def CASE7( self, main ):
'''