commit 71b7929fa50b749cb9f8fe5458c613686be27c2b
author You Wang <you@opennetworking.org> Mon Mar 04 23:18:24 2019 +0000
committer Gerrit Code Review <gerrit@onosproject.org> Mon Mar 04 23:18:24 2019 +0000
tree 06a5e79e2e20dd443f869340d755c96b31ab920f
parent 2d7826b29f5732bc17eb9d0b5e1f44e2ccf99158
parent eb68dc44923f90a2afd8be4c2a36a6521a82f9b0

Merge "Fix the use of exitFromCmd in mininet cli driver" into onos-1.15

TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py

diff --git a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
index 43d646b..4c49838 100644
--- a/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
+++ b/TestON/tests/USECASE/SegmentRouting/dependencies/Testcaselib.py
@@ -59,7 +59,10 @@
             main.useCommonTopo = main.params[ 'DEPENDENCY' ][ 'useCommonTopo' ] == 'True'
             main.topoPath = main.path + ( "/.." if main.useCommonTopo else "" ) + "/dependencies/"
             main.useCommonConf = main.params[ 'DEPENDENCY' ][ 'useCommonConf' ] == 'True'
-            main.useBmv2 = main.params[ 'DEPENDENCY' ][ 'useBmv2' ] == 'True'
+            if main.params[ 'DEPENDENCY' ].get( 'useBmv2' ):
+                main.useBmv2 = main.params[ 'DEPENDENCY' ][ 'useBmv2' ] == 'True'
+            else:
+                main.useBmv2 = False
             main.configPath = main.path + ( "/.." if main.useCommonConf else "" ) + "/dependencies/"
             main.bmv2Path = main.path + "/../dependencies/"
             main.forJson = "json/"