SEBA-344 move BBSim to openOLT and openOMCI adaptors

bbsim no longer requires it's own adapter - it can be used
with openolt and brcm_openomci_onu adapters

Change-Id: Ice533047c12cd737575f1674e42b7acd009ee92f
diff --git a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py
index 565fa63..6791ce4 100644
--- a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py
+++ b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py
@@ -54,7 +54,7 @@
     supported_device_types = [
         DeviceType(
             id=name,
-            vendor_ids=['OPEN', 'ALCL', 'BRCM', 'TWSH', 'ALPH', 'ISKT', 'SFAA'],
+            vendor_ids=['OPEN', 'ALCL', 'BRCM', 'TWSH', 'ALPH', 'ISKT', 'SFAA', 'BBSM'],
             adapter=name,
             accepts_bulk_flow_update=True
         )
diff --git a/voltha/adapters/broadcom_onu/broadcom_onu.py b/voltha/adapters/broadcom_onu/broadcom_onu.py
index 992e1b6..35b2537 100644
--- a/voltha/adapters/broadcom_onu/broadcom_onu.py
+++ b/voltha/adapters/broadcom_onu/broadcom_onu.py
@@ -69,7 +69,7 @@
     supported_device_types = [
         DeviceType(
             id=name,
-            vendor_ids=['NONE', 'BBSM'],
+            vendor_ids=['NONE'],
             adapter=name,
             accepts_bulk_flow_update=True,
             accepts_add_remove_flow_updates=True