SEBA-336 move BBSim to openOLT and openOMCI adaptors

Change-Id: If39f44e3f88c06a5725ecae069b1735d92c5ffd1
diff --git a/.gitreview b/.gitreview
index f459132..4ae00fe 100644
--- a/.gitreview
+++ b/.gitreview
@@ -3,3 +3,4 @@
 port=29418
 project=voltha.git
 defaultremote=origin
+defaultbranch=voltha-1.6
diff --git a/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py b/voltha/adapters/brcm_openomci_onu/brcm_openomci_onu.py
index c7fce17..622c551 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