[ONOS-7468] Fix the case descriptions issue for the SRBridging test
Change-Id: I098aa5f526f65216024e8af4cbf5d3f7430066b7
diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
index 6f8c9fc..d587f69 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/SRBridging.py
@@ -16,7 +16,7 @@
test_idx = 1,
topology = '0x1',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE2( self, main ):
"""
@@ -32,7 +32,7 @@
test_idx = 2,
topology = '0x2',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE3( self, main ):
"""
@@ -48,7 +48,7 @@
test_idx = 3,
topology = '2x2',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE4( self, main ):
"""
@@ -64,7 +64,7 @@
test_idx = 4,
topology = '2x4',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE5( self, main ):
"""
@@ -80,7 +80,7 @@
test_idx = 5,
topology = '0x1',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE6( self, main ):
"""
@@ -96,7 +96,7 @@
test_idx = 6,
topology = '0x2',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE7( self, main ):
"""
@@ -112,7 +112,7 @@
test_idx = 7,
topology = '2x2',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE8( self, main ):
"""
@@ -128,7 +128,7 @@
test_idx = 8,
topology = '2x4',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-untagged port" )
def CASE11( self, main ):
"""
@@ -280,7 +280,7 @@
test_idx = 21,
topology = '0x1',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE22( self, main ):
"""
@@ -296,7 +296,7 @@
test_idx = 22,
topology = '0x2',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE23( self, main ):
"""
@@ -312,7 +312,7 @@
test_idx = 23,
topology = '2x2',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE24( self, main ):
"""
@@ -328,7 +328,7 @@
test_idx = 24,
topology = '2x4',
onosNodes = 1,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE25( self, main ):
"""
@@ -344,7 +344,7 @@
test_idx = 25,
topology = '0x1',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE26( self, main ):
"""
@@ -360,7 +360,7 @@
test_idx = 26,
topology = '0x2',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE27( self, main ):
"""
@@ -376,7 +376,7 @@
test_idx = 27,
topology = '2x2',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE28( self, main ):
"""
@@ -392,7 +392,7 @@
test_idx = 28,
topology = '2x4',
onosNodes = 3,
- description = "Bridging test between two untagged hosts" )
+ description = "Bridging test between two untagged hosts on vlan-native port" )
def CASE31( self, main ):
"""
diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index f078e2d..f3350aa 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -49,7 +49,7 @@
main.cleanAndExit()
from tests.dependencies.Network import Network
main.Network = Network()
- main.testSetUp.envSetupDescription()
+ main.testSetUp.envSetupDescription( False )
stepResult = main.FALSE
try:
main.step( "Constructing test variables" )
@@ -66,7 +66,7 @@
main.maxNodes = int( main.params[ 'SCALE' ][ 'max' ] )
main.startUpSleep = int( main.params[ 'SLEEP' ][ 'startup' ] )
- stepResult = main.testSetUp.envSetup()
+ stepResult = main.testSetUp.envSetup( False )
except Exception as e:
main.testSetUp.envSetupException( e )
@@ -95,7 +95,7 @@
main.testSetUp.ONOSSetUp( main.Cluster, newCell=True, cellName=main.cellName,
skipPack=skipPackage,
useSSH=Testcaselib.useSSH,
- installParallel=parallel)
+ installParallel=parallel, includeCaseDesc=False )
ready = utilities.retry( main.Cluster.active( 0 ).CLI.summary,
main.FALSE,
sleep=cliSleep,
@@ -411,7 +411,7 @@
main.utils.mininetCleanup( main.Mininet1 )
- main.utils.copyKarafLog( "CASE%d" % main.CurrentTestCaseNumber, before=True )
+ main.utils.copyKarafLog( "CASE%d" % main.CurrentTestCaseNumber, before=True, includeCaseDesc=False )
for ctrl in main.Cluster.active():
main.ONOSbench.onosStop( ctrl.ipAddress )