Remove power switch based tests from bbsim

Change-Id: I23f79acf56590bc631f9256ac3eecb0591ea2f1e
diff --git a/Makefile b/Makefile
index 55311b6..d44f72d 100755
--- a/Makefile
+++ b/Makefile
@@ -82,7 +82,7 @@
 functional-single-kind-tt: voltha-tt-test
 
 # target to invoke multiple OLTs Functional scenarios
-functional-multi-olt: ROBOT_MISC_ARGS += -i sanityORfunctional $(ROBOT_DEBUG_LOG_OPT)
+functional-multi-olt: ROBOT_MISC_ARGS += -i sanityORfunctional -e PowerSwitch $(ROBOT_DEBUG_LOG_OPT)
 functional-multi-olt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
 functional-multi-olt: ROBOT_FILE := Voltha_PODTests.robot
 functional-multi-olt: voltha-test
diff --git a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
index 14b995e..b2476d9 100755
--- a/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
+++ b/tests/data/bbsim-kind-2OLTx2ONUx2PON.yaml
@@ -50,13 +50,13 @@
       olt: 'BBSIM_OLT_0'
     -
       onu: 'BBSM00010001'
-      c_tag: '901'
-      s_tag: '900'
+      c_tag: '900'
+      s_tag: '901'
       olt: 'BBSIM_OLT_1'
     -
       onu: 'BBSM00010002'
-      c_tag: '902'
-      s_tag: '900'
+      c_tag: '901'
+      s_tag: '901'
       olt: 'BBSIM_OLT_1'
   dst:
     - ip: null