commit a19e3c81c7ae7a5b0a1de403435384b98c6b26a7
author Siddesh <siddesh@opennetworking.org> Wed Jun 09 22:45:27 2021 +0000
committer Siddesh Sreenivasan <siddesh@opennetworking.org> Fri Jun 11 20:06:09 2021 +0000
tree 2a01eb17190bae4885469ab6404dc357e5635e19
parent 4d956de362a9fbf5523b4a57123787ad21694eee

SRBridgingvlan tagged, untagged and native

Change-Id: I804e4808a7bd22e7662ae06e5d82c2cf03d3efc3

TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py

diff --git a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
index 1ffa9c2..4e5e5fb 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRBridging/dependencies/SRBridgingTest.py
@@ -55,19 +55,20 @@
             if self.topo[ topology ][ 'dual-homed' ]:
                 links += ( leaves - 1 ) * 2
 
-            main.cfgName = 'CASE%01d%01d' % ( test_idx / 10, ( ( test_idx - 1 ) % 10 ) % 4 + 1 )
+            main.cfgName = 'CASE%01d%01d' % ( test_idx / 10, test_idx % 10 )
+            print (main.cfgName, "Testcase : CASE 09")
             main.Cluster.setRunningNode( onosNodes )
             run.installOnos( main, skipPackage=skipPackage, cliSleep=5 )
-            if main.useBmv2:
-                switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', '' )
-                if switchPrefix is None or "None":
-                    switchPrefix = ''
-                # Translate configuration file from OVS-OFDPA to BMv2 driver
-                translator.bmv2ToOfdpa( main )  # Try to cleanup if switching between switch types
-                translator.ofdpaToBmv2( main, switchPrefix=switchPrefix )
-            else:
-                translator.bmv2ToOfdpa( main )
             if not main.persistentSetup:
+                if main.useBmv2:
+                    switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', '' )
+                    if switchPrefix is None or "None":
+                        switchPrefix = ''
+                    # Translate configuration file from OVS-OFDPA to BMv2 driver
+                    translator.bmv2ToOfdpa( main )  # Try to cleanup if switching between switch types
+                    translator.ofdpaToBmv2( main, switchPrefix=switchPrefix )
+                else:
+                    translator.bmv2ToOfdpa( main )
                 suf = main.params.get( 'jsonFileSuffix', None)
                 if suf:
                     run.loadJson( main, suffix=suf )