commit f69e316ead9a17a850961c2e1344efff7fe3080d
author Jon Hall <jhall@ciena.com> Tue Sep 01 09:08:44 2020 -0700
committer Jon Hall <jhall@ciena.com> Thu Sep 10 13:06:50 2020 -0700
tree 4ea2c5ba0275b219e775add39e7ad527a3de1358
parent 9b0de1f374b16ed5ac5e01ce9c414eb9c9829217

Add Stratum support for SRDynamicConf

- Add bmv2 switch support to cord_fabric topo file
- Fix some error handling for SR tests
- Updating testcases to run for SR Stratum tests
- Fix Tost-ONOS docker image tag for onos-2.2
- Update make command for changed variable names
- Fix expected hosts files for SRDhcprelay
    - Fix case 12 config
    - Add config for cases 3 and 4
    - Create generic files

Change-Id: I39d499baaf69eb047e261fd2d6b6f2e846707719
(cherry picked from commit c15b8dfb3093c1b693ea05227ada9a9f1c6d4afb)

TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/SRDynamicConfTest.py

diff --git a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/SRDynamicConfTest.py b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/SRDynamicConfTest.py
index a959e71..5c8d277 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/SRDynamicConfTest.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRDynamicConf/dependencies/SRDynamicConfTest.py
@@ -88,7 +88,7 @@
                 intfCfg = "%s%s%s.json" % ( main.configPath, main.forJson, TAG )
                 if main.useBmv2:
                     # Translate configuration file from OVS-OFDPA to BMv2 driver
-                    translator.bmv2ToOfdpa( main )  # Try to cleanup if switching between switch types
+                    translator.bmv2ToOfdpa( main, intfCfg )  # Try to cleanup if switching between switch types
                     switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', "bmv2" )
                     translator.ofdpaToBmv2( main, switchPrefix=switchPrefix, cfgFile=intfCfg )
                 else:
@@ -100,7 +100,7 @@
                 defaultIntfCfg = "%s%s%s_ports.json" % ( main.configPath, main.forJson, topology )
                 if main.useBmv2:
                     # Translate configuration file from OVS-OFDPA to BMv2 driver
-                    translator.bmv2ToOfdpa( main )  # Try to cleanup if switching between switch types
+                    translator.bmv2ToOfdpa( main, defaultIntfCfg )  # Try to cleanup if switching between switch types
                     switchPrefix = main.params[ 'DEPENDENCY' ].get( 'switchPrefix', "bmv2" )
                     translator.ofdpaToBmv2( main, switchPrefix=switchPrefix, cfgFile=defaultIntfCfg )
                 else:
@@ -118,6 +118,7 @@
 
             # Set up topology
             if hasattr( main, 'Mininet1' ):
+                run.mnDockerSetup( main )
                 # Run the test with mininet topology
                 mininet_args = ' --spine=%d --leaf=%d --fanout=%d' \
                                % ( topo[ topology ][ 0 ], topo[ topology ][ 1 ], fanout )
@@ -128,8 +129,8 @@
                 if dualHomed:
                     mininet_args += ' --dual-homed'
                 if main.useBmv2:
-                    mininet_args += ' --switch bmv2'
-                    main.log.info( "Using BMv2 switch" )
+                    mininet_args += ' --switch %s' % main.switchType
+                    main.log.info( "Using %s switch" % main.switchType )
 
                 run.startMininet( main, 'trellis_fabric.py', args=mininet_args )
             else:
@@ -374,10 +375,11 @@
             run.checkFlows( main, minFlowCount=minFlowCountPerLeaf * topo[ topology ][ 1 ], sleep=5, dumpflows=False )
             run.pingAll( main, '%s_After' % TAG, retryAttempts=2 )
 
-            run.cleanup( main )
         except Exception as e:
             main.log.exception( "Error in runTest" )
             main.skipCase( result="FAIL", msg=e )
+        finally:
+            run.cleanup( main )
 
     @staticmethod
     def updateIntfCfg( main, portNum, dualHomed, ips=[], untagged=0, tagged=[], native=0 ):