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/SRClusterRestart/dependencies/SRClusterRestartFuncs.py

diff --git a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
index 7ddd2aa..c11e4a0 100644
--- a/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
+++ b/TestON/tests/USECASE/SegmentRouting/SRClusterRestart/dependencies/SRClusterRestartFuncs.py
@@ -67,8 +67,5 @@
         except Exception as e:
             main.log.exception( "Error in runTest" )
             main.skipCase( result="FAIL", msg=e )
-        if hasattr( main, 'Mininet1' ):
+        finally:
             run.cleanup( main )
-        else:
-            # TODO: disconnect TestON from the physical network
-            pass