Fixing VPLS test bugs
Change-Id: Ica483186929800792a4036665c32d93cf07b9ca8
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.params b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.params
index 1d80d90..fc6a16b 100755
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.params
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.params
@@ -1,6 +1,6 @@
<PARAMS>
- <testcases>1,2,3</testcases>
+ <testcases>1,2,10,11,12,13,14,15,16,11</testcases>
<num_controllers>3</num_controllers>
diff --git a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
index d0f4ed7..7c9905e 100644
--- a/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
+++ b/TestON/tests/USECASE/VPLS/VPLSBasic/VPLSBasic.py
@@ -61,8 +61,8 @@
stepResult = main.FALSE
try:
# load some variables from the params file
- cellName = main.params[ 'ENV' ][ 'cellName' ]
-
+ main.cellName = main.params[ 'ENV' ][ 'cellName' ]
+ main.sleep = int( main.params[ 'SLEEP' ][ 'netcfg' ] )
main.apps = main.params[ 'ENV' ][ 'cellApps' ]
ofPort = main.params[ 'CTRL' ][ 'port' ]
@@ -72,7 +72,7 @@
main.testSetUp.evnSetupConclusion( stepResult )
main.testSetUp.ONOSSetUp( main.Mininet1, main.Cluster,
- cellName=cellName )
+ cellName=main.cellName )
main.step( "Starting Mininet" )
# scp topo file to mininet
@@ -105,7 +105,7 @@
for app in apps:
main.Cluster.active( 0 ).CLI.app( app, "Activate" )
# TODO: check this worked
- time.sleep( SLEEP ) # wait for apps to activate
+ time.sleep( main.sleep ) # wait for apps to activate
for app in apps:
state = main.Cluster.active( 0 ).CLI.appStatus( app )
if state == "ACTIVE":
@@ -157,8 +157,6 @@
main.vpls = vpls
pprint = main.Cluster.active( 0 ).REST.pprint
hosts = int( main.params[ 'vpls' ][ 'hosts' ] )
- SLEEP = int( main.params[ 'SLEEP' ][ 'netcfg' ] )
-
main.step( "Discover hosts using pings" )
for i in range( 1, hosts + 1 ):
src = "h" + str( i )
@@ -179,7 +177,7 @@
onfail="Failed to load vpls configuration." )
# Time for netcfg to load data
- time.sleep( SLEEP )
+ time.sleep( main.sleep )
# 'Master' copy of test configuration
try:
@@ -201,8 +199,8 @@
result = False
getPorts = utilities.retry( f=main.Cluster.active( 0 ).REST.getNetCfg,
retValue=False,
- kwargs={"subjectClass":"ports"},
- sleep=SLEEP )
+ kwargs={ "subjectClass" :"ports" },
+ sleep=main.sleep )
onosCfg = pprint( getPorts )
sentCfg = pprint( originalCfg.get( "ports" ) )
@@ -228,52 +226,63 @@
onpass="Loaded vpls configuration.",
onfail="Failed to load vpls configuration." )
- def CASE3( self, main ):
+ def CASE10( self, main ):
"""
- Test VPLS cli commands
- High level steps:
- remove interface from a network
- Clean configs
- create vpls network
- add interfaces to a network
- add encap
- change encap
- remove encap
- list?
+ Remove an interface from a vpls network
"""
- from tests.USECASE.VPLS.dependencies import vpls
- SLEEP = int( main.params[ 'SLEEP' ][ 'netcfg' ] )
- pprint = main.Cluster.active( 0 ).REST.pprint
-
main.step( "Remove an interface from a vpls network" )
main.Cluster.active( 0 ).CLI.vplsRemIface( 'VPLS1', 'h1' )
- time.sleep( SLEEP )
+ time.sleep( main.sleep )
#update master config json
for network in main.vplsConfig:
if network.get( 'name' ) == 'VPLS1':
ifaces = network.get( 'interfaces' )
ifaces.remove( 'h1' )
- vpls.verify( main )
+ main.vpls.verify( main )
+
+ def CASE11( self, main ):
+ """
+ Clean all VPLS configurations
+ """
main.step( "Clean all vpls configurations" )
main.Cluster.active( 0 ).CLI.vplsClean()
- time.sleep( SLEEP )
+ time.sleep( main.sleep )
main.vplsConfig = []
- vpls.verify( main )
+ main.vpls.verify( main )
+
+ def CASE12( self, main ):
+ """
+ Create a new VPLS network.
+ """
main.step( "Create a new vpls network" )
name = "Network1"
main.Cluster.active( 0 ).CLI.vplsCreate( name )
- time.sleep( SLEEP )
+ time.sleep( main.sleep )
network1 = { 'name': name, 'interfaces': [], 'encapsulation': 'NONE' }
main.vplsConfig.append( network1 )
- vpls.verify( main )
+ main.vpls.verify( main )
+
+ def CASE13( self, main ):
+ """
+ Add interfaces to the new VPLS network.
+ """
main.step( "Add interfaces to the network" )
- main.Cluster.active( 0 ).CLI.vplsAddIface( name, "h1" )
- main.Cluster.active( 0 ).CLI.vplsAddIface( name, "h5" )
- main.Cluster.active( 0 ).CLI.vplsAddIface( name, "h4" )
- time.sleep( SLEEP )
+ utilities.retry( f=main.Cluster.active( 0 ).CLI.vplsAddIface,
+ retValue=main.FALSE,
+ args=( name, "h1" ),
+ sleep=main.sleep )
+ utilities.retry( f=main.Cluster.active( 0 ).CLI.vplsAddIface,
+ retValue=main.FALSE,
+ args=( name, "h5" ),
+ sleep=main.sleep )
+ utilities.retry( f=main.Cluster.active( 0 ).CLI.vplsAddIface,
+ retValue=main.FALSE,
+ args=( name, "h4" ),
+ sleep=main.sleep )
+ time.sleep( main.sleep )
for network in main.vplsConfig:
if network.get( 'name' ) == name:
ifaces = network.get( 'interfaces' )
@@ -281,37 +290,46 @@
ifaces.append( 'h4' )
ifaces.append( 'h5' )
network[ 'interfaces' ] = ifaces
- vpls.verify( main )
+ main.vpls.verify( main )
+
+ def CASE14( self, main ):
+ """
+ Add MPLS encapsulation.
+ """
main.step( "Add MPLS encapsulation to a vpls network" )
encapType = "MPLS"
main.Cluster.active( 0 ).CLI.vplsSetEncap( name, encapType )
for network in main.vplsConfig:
if network.get( 'name' ) == name:
network[ 'encapsulation' ] = encapType
- time.sleep( SLEEP )
- vpls.verify( main )
+ time.sleep( main.sleep )
+ main.vpls.verify( main )
+
+ def CASE15( self, main ):
+ """
+ Change an encapsulation type.
+ """
main.step( "Change an encapsulation type" )
encapType = "VLAN"
main.Cluster.active( 0 ).CLI.vplsSetEncap( name, encapType )
for network in main.vplsConfig:
if network.get( 'name' ) == name:
network[ 'encapsulation' ] = encapType
- time.sleep( SLEEP )
- vpls.verify( main )
+ time.sleep( main.sleep )
+ main.vpls.verify( main )
+
+ def CASE16( self, main ):
+ """
+ Remove encapsulation.
+ """
main.step( "Remove encapsulation" )
encapType = "NONE"
main.Cluster.active( 0 ).CLI.vplsSetEncap( name, encapType )
for network in main.vplsConfig:
if network.get( 'name' ) == name:
network[ 'encapsulation' ] = encapType
- time.sleep( SLEEP )
- vpls.verify( main )
-
- main.step( "Clean all vpls configurations" )
- main.Cluster.active( 0 ).CLI.vplsClean()
- time.sleep( SLEEP )
- main.vplsConfig = []
- vpls.verify( main )
+ time.sleep( main.sleep )
+ main.vpls.verify( main )
diff --git a/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.py b/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.py
index 54dbf29..bda1ecd 100644
--- a/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.py
+++ b/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.py
@@ -59,57 +59,31 @@
import imp
import time
import json
+ try:
+ from tests.dependencies.ONOSSetup import ONOSSetup
+ main.testSetUp = ONOSSetup()
+ except ImportError:
+ main.log.error( "ONOSSetup not found. exiting the test" )
+ main.cleanAndExit()
+ main.testSetUp.envSetupDescription()
+ stepResult = main.FALSE
+ try:
+ # load some variables from the params file
+ cellName = main.params[ 'ENV' ][ 'cellName' ]
+ main.timeSleep = int( main.params[ 'RETRY' ][ 'sleep' ] )
+ main.numAttempts = int( main.params[ 'RETRY' ][ 'attempts' ] )
+ main.apps = main.params[ 'ENV' ][ 'cellApps' ]
- main.case( "Setting up test environment" )
- main.caseExplanation = "Setup the test environment including " +\
- "installing ONOS, starting Mininet and ONOS" +\
- "cli sessions."
+ ofPort = main.params[ 'CTRL' ][ 'port' ]
+ stepResult = main.testSetUp.envSetup()
+ except Exception as e:
+ main.testSetUp.envSetupException( e )
+ main.testSetUp.evnSetupConclusion( stepResult )
- # load some variables from the params file
- cellName = main.params[ 'ENV' ][ 'cellName' ]
-
- main.numCtrls = int( main.params[ 'num_controllers' ] )
-
- ofPort = main.params[ 'CTRL' ][ 'port' ]
-
- main.timeSleep = int( main.params[ 'RETRY' ][ 'sleep' ] )
- main.numAttempts = int( main.params[ 'RETRY' ][ 'attempts' ] )
-
- main.CLIs = []
- main.RESTs = []
- main.nodes = []
- ipList = []
- for i in range( 1, main.numCtrls + 1 ):
- try:
- main.CLIs.append( getattr( main, 'ONOScli' + str( i ) ) )
- main.RESTs.append( getattr( main, 'ONOSrest' + str( i ) ) )
- main.nodes.append( getattr( main, 'ONOS' + str( i ) ) )
- ipList.append( main.nodes[ -1 ].ip_address )
- except AttributeError:
- break
-
- main.step( "Create cell file" )
- cellAppString = main.params[ 'ENV' ][ 'cellApps' ]
- main.ONOSbench.createCellFile( main.ONOSbench.ip_address, cellName,
- main.Mininet1.ip_address,
- cellAppString, ipList, main.ONOScli1.karafUser )
- main.step( "Applying cell variable to environment" )
- main.cellResult = main.ONOSbench.setCell( cellName )
- verifyResult = main.ONOSbench.verifyCell()
-
- main.log.info( "Uninstalling ONOS" )
- for node in main.nodes:
- main.ONOSbench.onosUninstall( node.ip_address )
-
- # Make sure ONOS is DEAD
- main.log.info( "Killing any ONOS processes" )
- killResults = main.TRUE
- for node in main.nodes:
- killed = main.ONOSbench.onosKill( node.ip_address )
- killResults = killResults and killed
+ main.testSetUp.ONOSSetUp( main.Mininet1, main.Cluster,
+ cellName=cellName )
main.step( "Starting Mininet" )
-
# scp topo file to mininet
# TODO: move to params?
topoName = "vpls"
@@ -121,72 +95,14 @@
direction="to" )
topo = " --custom " + main.Mininet1.home + topoFile + " --topo " + topoName
args = " --switch ovs,protocols=OpenFlow13"
- for node in main.nodes:
- args += " --controller=remote,ip=" + node.ip_address
+ for ctrl in main.Cluster.active():
+ args += " --controller=remote,ip=" + ctrl.ipAddress
mnCmd = "sudo mn" + topo + args
mnResult = main.Mininet1.startNet( mnCmd=mnCmd )
utilities.assert_equals( expect=main.TRUE, actual=mnResult,
onpass="Mininet Started",
onfail="Error starting Mininet" )
- main.ONOSbench.getVersion( report=True )
-
- main.step( "Creating ONOS package" )
- packageResult = main.ONOSbench.buckBuild()
- utilities.assert_equals( expect=main.TRUE, actual=packageResult,
- onpass="ONOS package successful",
- onfail="ONOS package failed" )
-
- main.step( "Installing ONOS package" )
- onosInstallResult = main.TRUE
- for node in main.nodes:
- tmpResult = main.ONOSbench.onosInstall( options="-f",
- node=node.ip_address )
- onosInstallResult = onosInstallResult and tmpResult
- utilities.assert_equals( expect=main.TRUE, actual=onosInstallResult,
- onpass="ONOS install successful",
- onfail="ONOS install failed" )
-
- main.step( "Set up ONOS secure SSH" )
- secureSshResult = main.TRUE
- for node in main.nodes:
- secureSshResult = secureSshResult and main.ONOSbench.onosSecureSSH( node=node.ip_address )
- utilities.assert_equals( expect=main.TRUE, actual=secureSshResult,
- onpass="Test step PASS",
- onfail="Test step FAIL" )
-
- main.step( "Checking if ONOS is up yet" )
- for i in range( 2 ):
- onosIsupResult = main.TRUE
- for node in main.nodes:
- started = main.ONOSbench.isup( node.ip_address )
- if not started:
- main.log.error( node.name + " hasn't started" )
- onosIsupResult = onosIsupResult and started
- if onosIsupResult == main.TRUE:
- break
- utilities.assert_equals( expect=main.TRUE, actual=onosIsupResult,
- onpass="ONOS startup successful",
- onfail="ONOS startup failed" )
-
- main.step( "Starting ONOS CLI sessions" )
- cliResults = main.TRUE
- threads = []
- for i in range( main.numCtrls ):
- t = main.Thread( target=main.CLIs[ i ].startOnosCli,
- name="startOnosCli-" + str( i ),
- args=[ main.nodes[ i ].ip_address ] )
- threads.append( t )
- t.start()
-
- for t in threads:
- t.join()
- cliResults = cliResults and t.result
- utilities.assert_equals( expect=main.TRUE, actual=cliResults,
- onpass="ONOS cli startup successful",
- onfail="ONOS cli startup failed" )
-
- main.activeNodes = [ i for i in range( 0, len( main.CLIs ) ) ]
main.step( "Activate apps defined in the params file" )
# get data from the params
@@ -196,11 +112,11 @@
main.log.warn( apps )
activateResult = True
for app in apps:
- main.CLIs[ 0 ].app( app, "Activate" )
+ main.Cluster.active( 0 ).CLI.app( app, "Activate" )
# TODO: check this worked
time.sleep( SLEEP ) # wait for apps to activate
for app in apps:
- state = main.CLIs[ 0 ].appStatus( app )
+ state = main.Cluster.active( 0 ).CLI.appStatus( app )
if state == "ACTIVE":
activateResult = activateResult and True
else:
@@ -221,7 +137,7 @@
for component in config:
for setting in config[ component ]:
value = config[ component ][ setting ]
- check = main.CLIs[ 0 ].setCfg( component, setting, value )
+ check = main.Cluster.active( 0 ).CLI.setCfg( component, setting, value )
main.log.info( "Value was changed? {}".format( main.TRUE == check ) )
checkResult = check and checkResult
utilities.assert_equals( expect=main.TRUE,
@@ -232,22 +148,11 @@
main.log.warn( "No configurations were specified to be changed after startup" )
main.step( "App Ids check" )
- appCheck = main.TRUE
- threads = []
- for i in main.activeNodes:
- t = main.Thread( target=main.CLIs[ i ].appToIDCheck,
- name="appToIDCheck-" + str( i ),
- args=[] )
- threads.append( t )
- t.start()
-
- for t in threads:
- t.join()
- appCheck = appCheck and t.result
- if appCheck != main.TRUE:
- main.log.warn( main.CLIs[ 0 ].apps() )
- main.log.warn( main.CLIs[ 0 ].appIDs() )
- utilities.assert_equals( expect=main.TRUE, actual=appCheck,
+ appCheck = main.Cluster.command( "appToIDCheck", returnBool=True )
+ if appCheck != True:
+ main.log.warn( main.Cluster.active( 0 ).CLI.apps() )
+ main.log.warn( main.Cluster.active( 0 ).CLI.appIDs() )
+ utilities.assert_equals( expect=True, actual=appCheck,
onpass="App Ids seem to be correct",
onfail="Something is wrong with app Ids" )
@@ -276,7 +181,7 @@
fileName = main.params[ 'DEPENDENCY' ][ 'topology' ]
app = main.params[ 'vpls' ][ 'name' ]
- loadVPLSResult = main.ONOSbench.onosNetCfg( main.nodes[ 0 ].ip_address, "", fileName )
+ loadVPLSResult = main.ONOSbench.onosNetCfg( main.Cluster.active( 0 ).ipAddress, "", fileName )
utilities.assert_equals( expect=main.TRUE,
actual=loadVPLSResult,
onpass="Loaded vpls configuration.",
@@ -306,7 +211,7 @@
result = False
getPorts = utilities.retry( f=main.ONOSrest1.getNetCfg,
retValue=False,
- kwargs={"subjectClass":"ports"},
+ kwargs={ "subjectClass" : "ports" },
sleep=SLEEP )
onosCfg = pprint( getPorts )
sentCfg = pprint( originalCfg.get( "ports" ) )
@@ -328,7 +233,7 @@
# This is to avoid a race condition in pushing netcfg's.
main.step( "Loading vpls configuration in case any configuration was missed." )
- loadVPLSResult = main.ONOSbench.onosNetCfg( main.nodes[ 0 ].ip_address, "", fileName )
+ loadVPLSResult = main.ONOSbench.onosNetCfg( main.Cluster.active( 0 ).ipAddress, "", fileName )
utilities.assert_equals( expect=main.TRUE,
actual=loadVPLSResult,
onpass="Loaded vpls configuration.",
@@ -469,16 +374,16 @@
result = main.TRUE
- for i in range( 0, len( main.nodes ) ):
+ for i in range( 0, main.Cluster.numCtrls ):
stri = str( i )
- ip_address = main.nodes[ i ].ip_address
+ ip_address = main.Cluster.active( i ).ipAddress
# Stop an ONOS node: i
main.step( "Stop ONOS node " + stri + ".")
stopResult = main.ONOSbench.onosStop( ip_address )
- main.activeNodes.remove( i )
+ main.Cluster.runningNodes[ i ].active = False
utilities.assert_equals( expect=main.TRUE, actual=stopResult,
onpass="ONOS nodes stopped successfully.",
@@ -507,8 +412,8 @@
# Restart CLI
main.log.info( "Restarting ONOS node " + stri + "'s main.CLI." )
- cliResult = main.CLIs[ i ].startOnosCli( ip_address )
- main.activeNodes.append( i )
+ cliResults = main.Cluster.active( 0 ).CLI.startOnosCli( ip_address )
+ main.Cluster.runningNodes[ i ].active = True
utilities.assert_equals( expect=main.TRUE, actual=cliResults,
onpass="ONOS CLI successfully restarted.",
@@ -520,7 +425,7 @@
main.step( "Checking ONOS nodes." )
nodeResults = utilities.retry( main.HA.nodesCheck,
False,
- args=[ main.activeNodes ],
+ args=[ main.Cluster.runningNodes ],
sleep=main.timeSleep,
attempts=main.numAttempts )
@@ -557,11 +462,11 @@
killSleep = int( main.params[ 'SLEEP' ][ 'killnode' ] )
result = main.TRUE
- for i in range( 0, len( main.nodes ) ):
+ for i in range( 0, main.Cluster.numCtrls ):
# Kill an ONOS node
main.step( "Killing ONOS node " + str( i + 1 ) + "." )
- killresult = main.ONOSbench.onosKill( main.nodes[ i ].ip_address )
+ killresult = main.ONOSbench.onosKill( main.Cluster.active( i ).ipAddress )
# Check if ONOS node has been successfully killed
utilities.assert_equals( expect=main.TRUE, actual=killresult,
diff --git a/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.topo b/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.topo
index 476d986..4441c62 100755
--- a/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.topo
+++ b/TestON/tests/USECASE/VPLS/VPLSfailsafe/VPLSfailsafe.topo
@@ -1,129 +1,32 @@
<TOPOLOGY>
<COMPONENT>
- <ONOSbench>
- <host>localhost</host>
+ <ONOScell>
+ <host>localhost</host> # ONOS "bench" machine
<user>sdn</user>
<password>rocks</password>
- <type>OnosDriver</type>
+ <type>OnosClusterDriver</type>
<connect_order>1</connect_order>
<COMPONENTS>
- <nodes>1</nodes>
- <prompt></prompt>
- </COMPONENTS>
- </ONOSbench>
-
- <ONOScli1>
- <host>localhost</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosCliDriver</type>
- <connect_order>2</connect_order>
- <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.
<karaf_username></karaf_username>
<karaf_password></karaf_password>
- <prompt></prompt>
+ <web_user></web_user>
+ <web_pass></web_pass>
+ <rest_port></rest_port>
+ <prompt></prompt> # TODO: we technically need a few of these, one per component
+ <onos_home></onos_home> # defines where onos home is
+ <nodes> 3 </nodes> # number of nodes in the cluster
</COMPONENTS>
- </ONOScli1>
-
- <ONOScli2>
- <host>localhost</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosCliDriver</type>
- <connect_order>3</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOScli2>
-
- <ONOScli3>
- <host>localhost</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosCliDriver</type>
- <connect_order>4</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOScli3>
-
- <ONOS1>
- <host>OC1</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosDriver</type>
- <connect_order>9</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOS1>
-
- <ONOS2>
- <host>OC2</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosDriver</type>
- <connect_order>10</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOS2>
-
- <ONOS3>
- <host>OC3</host>
- <user>sdn</user>
- <password>rocks</password>
- <type>OnosDriver</type>
- <connect_order>11</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOS3>
-
- <ONOSrest1>
- <host>OC1</host>
- <port>8181</port>
- <user>onos</user>
- <password>rocks</password>
- <type>OnosRestDriver</type>
- <connect_order>2</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOSrest1>
-
- <ONOSrest2>
- <host>OC2</host>
- <port>8181</port>
- <user>onos</user>
- <password>rocks</password>
- <type>OnosRestDriver</type>
- <connect_order>3</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOSrest2>
-
- <ONOSrest3>
- <host>OC3</host>
- <port>8181</port>
- <user>onos</user>
- <password>rocks</password>
- <type>OnosRestDriver</type>
- <connect_order>4</connect_order>
- <COMPONENTS>
- <prompt></prompt>
- </COMPONENTS>
- </ONOSrest3>
-
+ </ONOScell>
<Mininet1>
<host>OCN</host>
<user>sdn</user>
<password>rocks</password>
<type>MininetCliDriver</type>
- <connect_order>7</connect_order>
+ <connect_order>2</connect_order>
<COMPONENTS>
<home>~/mininet/custom/</home>
<prompt></prompt>
diff --git a/TestON/tests/USECASE/VPLS/dependencies/vpls.py b/TestON/tests/USECASE/VPLS/dependencies/vpls.py
index 47ffe78..6240cb3 100644
--- a/TestON/tests/USECASE/VPLS/dependencies/vpls.py
+++ b/TestON/tests/USECASE/VPLS/dependencies/vpls.py
@@ -148,8 +148,6 @@
onpass="Connectivity is as expected",
onfail="Connectivity is not as expected" )
-
-
# TODO: if encapsulation is set, look for that
# TODO: can we look at the intent keys?