diff --git a/Makefile b/Makefile
index b718b3d..91acf26 100755
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,7 @@
 # Robot config
 ROBOT_SANITY_SINGLE_PON_FILE    ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
 ROBOT_SANITY_DT_SINGLE_PON_FILE    ?= $(ROOT_DIR)/tests/data/bbsim-kind-dt.yaml
+ROBOT_SANITY_MULTIPLE_OLT_FILE    ?= $(ROOT_DIR)/tests/data/multiple-bbsim-kind.yaml
 ROBOT_FAIL_SINGLE_PON_FILE      ?= $(ROOT_DIR)/tests/data/bbsim-kind.yaml
 ROBOT_SANITY_MULT_PON_FILE      ?= $(ROOT_DIR)/tests/data/bbsim-kind-2x2.yaml
 ROBOT_SCALE_SINGLE_PON_FILE     ?= $(ROOT_DIR)/tests/data/bbsim-kind-16.yaml
@@ -66,6 +67,12 @@
 functional-single-kind-dt: ROBOT_FILE := Voltha_DT_PODTests.robot
 functional-single-kind-dt: voltha-dt-test
 
+# target to invoke multiple OLTs Functional scenarios
+functional-multi-olt: ROBOT_MISC_ARGS += -i sanityMultiOLT $(ROBOT_DEBUG_LOG_OPT)
+functional-multi-olt: ROBOT_CONFIG_FILE := $(ROBOT_SANITY_MULTIPLE_OLT_FILE)
+functional-multi-olt: ROBOT_FILE := Voltha_multipleOLTTests.robot
+functional-multi-olt: voltha-test
+
 # target to invoke openonu go adapter
 openonu-go-adapter-test: ROBOT_MISC_ARGS += -v state2test:4 -v testmode:SingleState -v timeout:120s
 openonu-go-adapter-test: ROBOT_MISC_ARGS += -i statetest $(ROBOT_DEBUG_LOG_OPT)
diff --git a/libraries/onos.robot b/libraries/onos.robot
old mode 100644
new mode 100755
index 0810bfe..a3c047f
--- a/libraries/onos.robot
+++ b/libraries/onos.robot
@@ -267,9 +267,10 @@
 Remove All Devices From ONOS
     [Arguments]    ${url}
     [Documentation]    Executes the device-remove command on each device in ONOS
-    ${rc}    @{dpids}    Run And Return Rc And Output
+    ${rc}    ${output}    Run And Return Rc And Output
     ...    curl --fail -sSL ${url}/onos/v1/devices | jq -r '.devices[].id'
     Should Be Equal As Integers    ${rc}    0
+    @{dpids}    Split String    ${output}
     ${count}=    Get length    ${dpids}
     FOR    ${dpid}    IN    @{dpids}
         ${rc}=    Run Keyword If    '${dpid}' != ''
@@ -314,9 +315,9 @@
     ${result}=      Create List
     ${out}=    Execute ONOS CLI Command    ${onos_ip}    ${onos_port}
     ...    ports -e ${of_id} | grep -v SWITCH | grep -v nni
-    @{unis}=	Split To Lines	${out}
+    @{unis}=    Split To Lines    ${out}
     FOR    ${uni}    IN    @{unis}
-        ${matches} =	Get Regexp Matches	${uni}  .*port=([0-9]+),.*  1
+        ${matches} =    Get Regexp Matches    ${uni}  .*port=([0-9]+),.*  1
         &{portDict}    Create Dictionary    of_id=${of_id}    port=${matches[0]}
         Append To List  ${result}    ${portDict}
     END
@@ -338,10 +339,10 @@
     ${result}=      Create List
     ${out}=    Execute ONOS CLI Command    ${onos_ip}    ${onos_port}
     ...     volt-olts
-    @{olts}=    Split To Lines	${out}
+    @{olts}=    Split To Lines    ${out}
     FOR    ${olt}    IN    @{olts}
         Log     ${olt}
-        ${matches} =	Get Regexp Matches	${olt}  ^OLT (.+)$  1
+        ${matches} =    Get Regexp Matches    ${olt}  ^OLT (.+)$  1
         # there may be some logs mixed with the output so only append if we have a match
         ${matches_length}=      Get Length  ${matches}
         Run Keyword If  ${matches_length}==1
diff --git a/tests/data/multiple-bbsim-kind.yaml b/tests/data/multiple-bbsim-kind.yaml
new file mode 100755
index 0000000..30c65c2
--- /dev/null
+++ b/tests/data/multiple-bbsim-kind.yaml
@@ -0,0 +1,136 @@
+---
+
+# Copyright 2017-present Open Networking Foundation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+# Automated deployment configuration for kind-voltha running BBSim
+
+# Change default values in tests
+has_dataplane: false
+external_libs: false
+teardown_device: true
+ONOS_REST_PORT: 8181
+ONOS_SSH_PORT: 8101
+OLT_PORT: 50060
+
+nodes:
+  -
+    ip: '127.0.0.1'
+
+olts:
+  -
+    ip: bbsim0.voltha.svc
+    serial: BBSIM_OLT_0
+  -
+    ip: bbsim1.voltha.svc
+    serial: BBSIM_OLT_1
+  -
+    ip: bbsim2.voltha.svc
+    serial: BBSIM_OLT_2
+  -
+    ip: bbsim3.voltha.svc
+    serial: BBSIM_OLT_3
+  -
+    ip: bbsim4.voltha.svc
+    serial: BBSIM_OLT_4
+  -
+    ip: bbsim5.voltha.svc
+    serial: BBSIM_OLT_5
+  -
+    ip: bbsim6.voltha.svc
+    serial: BBSIM_OLT_6
+  -
+    ip: bbsim7.voltha.svc
+    serial: BBSIM_OLT_7
+  -
+    ip: bbsim8.voltha.svc
+    serial: BBSIM_OLT_8
+  -
+    ip: bbsim9.voltha.svc
+    serial: BBSIM_OLT_9
+
+hosts:
+  -
+    src:
+      - onu: 'BBSM00000001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00010001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00020001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00030001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00040001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00050001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00060001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00070001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00080001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+  -
+    src:
+      - onu: 'BBSM00090001'
+        c_tag: '900'
+        s_tag: '900'
+    dst:
+      - ip: null
+
+sadis:
+  file: ${CURDIR}/../../data/onos-sadis-multiple-bbsim.json
diff --git a/tests/data/onos-sadis-multiple-bbsim.json b/tests/data/onos-sadis-multiple-bbsim.json
new file mode 100755
index 0000000..2603c60
--- /dev/null
+++ b/tests/data/onos-sadis-multiple-bbsim.json
@@ -0,0 +1,718 @@
+{
+  "org.opencord.sadis": {
+    "sadis": {
+      "integration": {
+        "cache": {
+          "enabled": false,
+          "maxsize": 50,
+          "ttl": "PT0m"
+        }
+      },
+      "entries": [
+        {
+          "id": "BBSIM_OLT_0",
+          "hardwareIdentifier": "0f:f1:ce:c0:ff:ee",
+          "nasId": "BBSIMOLT000",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00000001-1",
+          "nasPortId": "BBSM00000001-1",
+          "circuitId": "BBSM00000001-1",
+          "remoteId": "BBSM00000001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000002-1",
+          "nasPortId": "BBSM00000002-1",
+          "circuitId": "BBSM00000002-1",
+          "remoteId": "BBSM00000002-1",
+          "uniTagList": [
+            {
+              "ponCTag": 901,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000003-1",
+          "nasPortId": "BBSM00000003-1",
+          "circuitId": "BBSM00000003-1",
+          "remoteId": "BBSM00000003-1",
+          "uniTagList": [
+            {
+              "ponCTag": 902,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000004-1",
+          "nasPortId": "BBSM00000004-1",
+          "circuitId": "BBSM00000004-1",
+          "remoteId": "BBSM00000004-1",
+          "uniTagList": [
+            {
+              "ponCTag": 903,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000005-1",
+          "nasPortId": "BBSM00000005-1",
+          "circuitId": "BBSM00000005-1",
+          "remoteId": "BBSM00000005-1",
+          "uniTagList": [
+            {
+              "ponCTag": 904,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000006-1",
+          "nasPortId": "BBSM00000006-1",
+          "circuitId": "BBSM00000006-1",
+          "remoteId": "BBSM00000006-1",
+          "uniTagList": [
+            {
+              "ponCTag": 905,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000007-1",
+          "nasPortId": "BBSM00000007-1",
+          "circuitId": "BBSM00000007-1",
+          "remoteId": "BBSM00000007-1",
+          "uniTagList": [
+            {
+              "ponCTag": 906,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000008-1",
+          "nasPortId": "BBSM00000008-1",
+          "circuitId": "BBSM00000008-1",
+          "remoteId": "BBSM00000008-1",
+          "uniTagList": [
+            {
+              "ponCTag": 907,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000009-1",
+          "nasPortId": "BBSM00000009-1",
+          "circuitId": "BBSM00000009-1",
+          "remoteId": "BBSM00000009-1",
+          "uniTagList": [
+            {
+              "ponCTag": 908,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000a-1",
+          "nasPortId": "BBSM0000000a-1",
+          "circuitId": "BBSM0000000a-1",
+          "remoteId": "BBSM0000000a-1",
+          "uniTagList": [
+            {
+              "ponCTag": 909,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000b-1",
+          "nasPortId": "BBSM0000000b-1",
+          "circuitId": "BBSM0000000b-1",
+          "remoteId": "BBSM0000000b-1",
+          "uniTagList": [
+            {
+              "ponCTag": 910,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000c-1",
+          "nasPortId": "BBSM0000000c-1",
+          "circuitId": "BBSM0000000c-1",
+          "remoteId": "BBSM0000000c-1",
+          "uniTagList": [
+            {
+              "ponCTag": 911,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000d-1",
+          "nasPortId": "BBSM0000000d-1",
+          "circuitId": "BBSM0000000d-1",
+          "remoteId": "BBSM0000000d-1",
+          "uniTagList": [
+            {
+              "ponCTag": 912,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000e-1",
+          "nasPortId": "BBSM0000000e-1",
+          "circuitId": "BBSM0000000e-1",
+          "remoteId": "BBSM0000000e-1",
+          "uniTagList": [
+            {
+              "ponCTag": 913,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM0000000f-1",
+          "nasPortId": "BBSM0000000f-1",
+          "circuitId": "BBSM0000000f-1",
+          "remoteId": "BBSM0000000f-1",
+          "uniTagList": [
+            {
+              "ponCTag": 914,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000010-1",
+          "nasPortId": "BBSM00000010-1",
+          "circuitId": "BBSM00000010-1",
+          "remoteId": "BBSM00000010-1",
+          "uniTagList": [
+            {
+              "ponCTag": 915,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000101-1",
+          "nasPortId": "BBSM00000101-1",
+          "circuitId": "BBSM00000101-1",
+          "remoteId": "BBSM00000101-1",
+          "uniTagList": [
+            {
+              "ponCTag": 902,
+              "ponSTag": 910,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000102-1",
+          "nasPortId": "BBSM00000102-1",
+          "circuitId": "BBSM00000102-1",
+          "remoteId": "BBSM00000102-1",
+          "uniTagList": [
+            {
+              "ponCTag": 903,
+              "ponSTag": 910,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000201-1",
+          "nasPortId": "BBSM00000201-1",
+          "circuitId": "BBSM00000201-1",
+          "remoteId": "BBSM00000201-1",
+          "uniTagList": [
+            {
+              "ponCTag": 904,
+              "ponSTag": 920,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000202-1",
+          "nasPortId": "BBSM00000202-1",
+          "circuitId": "BBSM00000202-1",
+          "remoteId": "BBSM00000202-1",
+          "uniTagList": [
+            {
+              "ponCTag": 905,
+              "ponSTag": 920,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000301-1",
+          "nasPortId": "BBSM00000301-1",
+          "circuitId": "BBSM00000301-1",
+          "remoteId": "BBSM00000301-1",
+          "uniTagList": [
+            {
+              "ponCTag": 906,
+              "ponSTag": 930,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000302-1",
+          "nasPortId": "BBSM00000302-1",
+          "circuitId": "BBSM00000302-1",
+          "remoteId": "BBSM00000302-1",
+          "uniTagList": [
+            {
+              "ponCTag": 907,
+              "ponSTag": 930,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000401-1",
+          "nasPortId": "BBSM00000401-1",
+          "circuitId": "BBSM00000401-1",
+          "remoteId": "BBSM00000401-1",
+          "uniTagList": [
+            {
+              "ponCTag": 908,
+              "ponSTag": 940,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000402-1",
+          "nasPortId": "BBSM00000402-1",
+          "circuitId": "BBSM00000402-1",
+          "remoteId": "BBSM00000402-1",
+          "uniTagList": [
+            {
+              "ponCTag": 909,
+              "ponSTag": 940,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000501-1",
+          "nasPortId": "BBSM00000501-1",
+          "circuitId": "BBSM00000501-1",
+          "remoteId": "BBSM00000501-1",
+          "uniTagList": [
+            {
+              "ponCTag": 910,
+              "ponSTag": 950,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000502-1",
+          "nasPortId": "BBSM00000502-1",
+          "circuitId": "BBSM00000502-1",
+          "remoteId": "BBSM00000502-1",
+          "uniTagList": [
+            {
+              "ponCTag": 911,
+              "ponSTag": 950,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000601-1",
+          "nasPortId": "BBSM00000601-1",
+          "circuitId": "BBSM00000601-1",
+          "remoteId": "BBSM00000601-1",
+          "uniTagList": [
+            {
+              "ponCTag": 912,
+              "ponSTag": 960,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000602-1",
+          "nasPortId": "BBSM00000602-1",
+          "circuitId": "BBSM00000602-1",
+          "remoteId": "BBSM000000602-1",
+          "uniTagList": [
+            {
+              "ponCTag": 913,
+              "ponSTag": 960,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000701-1",
+          "nasPortId": "BBSM00000701-1",
+          "circuitId": "BBSM00000701-1",
+          "remoteId": "BBSM00000701-1",
+          "uniTagList": [
+            {
+              "ponCTag": 914,
+              "ponSTag": 970,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSM00000702-1",
+          "nasPortId": "BBSM00000702-1",
+          "circuitId": "BBSM00000702-1",
+          "remoteId": "BBSM00000702-1",
+          "uniTagList": [
+            {
+              "ponCTag": 915,
+              "ponSTag": 970,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_1",
+          "hardwareIdentifier": "0f:f1:ce:c1:ff:ee",
+          "nasId": "BBSIMOLT001",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00010001-1",
+          "nasPortId": "BBSM00010001-1",
+          "circuitId": "BBSM00010001-1",
+          "remoteId": "BBSM00010001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_2",
+          "hardwareIdentifier": "0f:f1:ce:c2:ff:ee",
+          "nasId": "BBSIMOLT002",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00020001-1",
+          "nasPortId": "BBSM00020001-1",
+          "circuitId": "BBSM00020001-1",
+          "remoteId": "BBSM00020001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_3",
+          "hardwareIdentifier": "0f:f1:ce:c3:ff:ee",
+          "nasId": "BBSIMOLT003",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00030001-1",
+          "nasPortId": "BBSM00030001-1",
+          "circuitId": "BBSM00030001-1",
+          "remoteId": "BBSM00030001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_4",
+          "hardwareIdentifier": "0f:f1:ce:c4:ff:ee",
+          "nasId": "BBSIMOLT004",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00040001-1",
+          "nasPortId": "BBSM00040001-1",
+          "circuitId": "BBSM00040001-1",
+          "remoteId": "BBSM00040001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_5",
+          "hardwareIdentifier": "0f:f1:ce:c5:ff:ee",
+          "nasId": "BBSIMOLT005",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00050001-1",
+          "nasPortId": "BBSM00050001-1",
+          "circuitId": "BBSM00050001-1",
+          "remoteId": "BBSM00050001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_6",
+          "hardwareIdentifier": "0f:f1:ce:c6:ff:ee",
+          "nasId": "BBSIMOLT006",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00060001-1",
+          "nasPortId": "BBSM00060001-1",
+          "circuitId": "BBSM00060001-1",
+          "remoteId": "BBSM00060001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_7",
+          "hardwareIdentifier": "0f:f1:ce:c7:ff:ee",
+          "nasId": "BBSIMOLT007",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00070001-1",
+          "nasPortId": "BBSM00070001-1",
+          "circuitId": "BBSM00070001-1",
+          "remoteId": "BBSM00070001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_8",
+          "hardwareIdentifier": "0f:f1:ce:c8:ff:ee",
+          "nasId": "BBSIMOLT008",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00080001-1",
+          "nasPortId": "BBSM00080001-1",
+          "circuitId": "BBSM00080001-1",
+          "remoteId": "BBSM00080001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        },
+        {
+          "id": "BBSIM_OLT_9",
+          "hardwareIdentifier": "0f:f1:ce:c9:ff:ee",
+          "nasId": "BBSIMOLT009",
+          "uplinkPort": 1048576
+        },
+        {
+          "id": "BBSM00090001-1",
+          "nasPortId": "BBSM00090001-1",
+          "circuitId": "BBSM00090001-1",
+          "remoteId": "BBSM00090001-1",
+          "uniTagList": [
+            {
+              "ponCTag": 900,
+              "ponSTag": 900,
+              "technologyProfileId": 64,
+              "downstreamBandwidthProfile": "Default",
+              "upstreamBandwidthProfile": "Default",
+              "isDhcpRequired": true
+            }
+          ]
+        }
+      ]
+    },
+    "bandwidthprofile": {
+      "integration": {
+        "cache": {
+          "enabled": true,
+          "maxsize": 40,
+          "ttl": "PT1m"
+        }
+      },
+      "entries": [
+        {
+          "id": "Default",
+          "cir": 1000000,
+          "cbs": 1001,
+          "eir": 1002,
+          "ebs": 1003,
+          "air": 1004
+        }
+      ]
+    }
+  }
+}
\ No newline at end of file
diff --git a/tests/functional/Voltha_multipleOLTTests.robot b/tests/functional/Voltha_multipleOLTTests.robot
new file mode 100755
index 0000000..7161d6d
--- /dev/null
+++ b/tests/functional/Voltha_multipleOLTTests.robot
@@ -0,0 +1,205 @@
+*** Settings ***
+Documentation     Test various end-to-end scenarios with multiple OLTs
+Suite Setup       Setup Suite
+Suite Teardown    Teardown Suite
+Test Setup
+Test Teardown     Teardown
+Library           Collections
+Library           String
+Library           OperatingSystem
+Library           XML
+Library           RequestsLibrary
+Library           ../../libraries/DependencyLibrary.py
+Resource          ../../libraries/onos.robot
+Resource          ../../libraries/voltctl.robot
+Resource          ../../libraries/voltha.robot
+Resource          ../../libraries/utils.robot
+Resource          ../../libraries/k8s.robot
+Resource          ../../variables/variables.robot
+
+*** Variables ***
+${POD_NAME}       flex-ocp-cord
+${KUBERNETES_CONF}    ${KUBERNETES_CONFIGS_DIR}/${POD_NAME}.conf
+${KUBERNETES_CONFIGS_DIR}    ~/pod-configs/kubernetes-configs
+#${KUBERNETES_CONFIGS_DIR}    ${KUBERNETES_CONFIGS_DIR}/${POD_NAME}.conf
+${KUBERNETES_YAML}    ${KUBERNETES_CONFIGS_DIR}/${POD_NAME}.yml
+${HELM_CHARTS_DIR}    ~/helm-charts
+${VOLTHA_POD_NUM}    8
+${NAMESPACE}      voltha
+# For below variable value, using deployment name as using grep for
+# parsing radius pod name, we can also use full radius pod name
+${RESTART_POD_NAME}    radius
+${timeout}        60s
+${of_id}          0
+${logical_id}     0
+${has_dataplane}    True
+${external_libs}    True
+${teardown_device}    True
+${scripts}        ../../scripts
+# Per-test logging on failure is turned off by default; set this variable to enable
+${container_log_dir}    ${None}
+
+*** Test Cases ***
+Sanity E2E Test for OLTs/ONUs on POD
+    [Documentation]    Validates E2E Ping Connectivity and object states for the given scenario:
+    ...    Validate successful authentication/DHCP/E2E ping for the tech profile that is used
+    [Tags]    sanityMultiOLT
+    [Setup]    Run Keywords    Start Logging    SanityMultiOLT
+    ...    AND    Setup Test
+    Run Keyword If    ${has_dataplane}    Clean Up Linux
+    FOR    ${I}    IN RANGE    0    ${num_olts}
+        ${olt_ip}=    Evaluate    ${olts}[${I}].get("ip")
+        ${olt_user}=    Evaluate    ${olts}[${I}].get("user")
+        ${olt_pass}=    Evaluate    ${olts}[${I}].get("pass")
+        ${olt_serial_number}=    Evaluate    ${olts}[${I}].get("serial")
+        ${src}=    Evaluate    ${hosts}[${I}].get("src")
+        ${dst}=    Evaluate    ${hosts}[${I}].get("dst")
+        Set Suite Variable    ${olt_serial_number}
+        Set Suite Variable    ${olt_ip}
+        Set Suite Variable    ${olt_user}
+        Set Suite Variable    ${olt_pass}
+        Wait Until Keyword Succeeds    ${timeout}    2s    Do Sanity Test    ${src}    ${dst}
+    END
+    [Teardown]    Run Keywords    Collect Logs
+    ...    AND    Stop Logging    SanityTest
+
+*** Keywords ***
+Setup Suite
+    [Documentation]    Setup the test suite
+    Set Global Variable    ${KUBECTL_CONFIG}    export KUBECONFIG=%{KUBECONFIG}
+    Set Global Variable    ${VOLTCTL_CONFIG}    export VOLTCONFIG=%{VOLTCONFIG}
+    ${k8s_node_ip}=    Evaluate    ${nodes}[0].get("ip")
+    ${ONOS_REST_IP}=    Get Environment Variable    ONOS_REST_IP    ${k8s_node_ip}
+    ${ONOS_SSH_IP}=     Get Environment Variable    ONOS_SSH_IP     ${k8s_node_ip}
+    Set Global Variable    ${ONOS_REST_IP}
+    Set Global Variable    ${ONOS_SSH_IP}
+    ${k8s_node_user}=    Evaluate    ${nodes}[0].get("user")
+    ${k8s_node_pass}=    Evaluate    ${nodes}[0].get("pass")
+    Check CLI Tools Configured
+    ${onos_auth}=    Create List    karaf    karaf
+    ${HEADERS}    Create Dictionary    Content-Type=application/json
+    Create Session    ONOS    http://${ONOS_REST_IP}:${ONOS_REST_PORT}    auth=${ONOS_AUTH}
+    ${num_olts}    Get Length    ${olts}
+    ${num_olts}    Convert to String    ${num_olts}
+    ${list_olts}    Create List
+    FOR    ${I}    IN RANGE    0    ${num_olts}
+        ${ip}    Evaluate    ${olts}[${I}].get("ip")
+        ${user}    Evaluate    ${olts}[${I}].get("user")
+        ${pass}    Evaluate    ${olts}[${I}].get("pass")
+        ${serial_number}    Evaluate    ${olts}[${I}].get("serial")
+        ${olt}    Create Dictionary    ip    ${ip}    user    ${user}    pass
+        ...    ${pass}    sn    ${serial_number}
+        Append To List    ${list_olts}    ${olt}
+    END
+    ${olt_ip}=    Evaluate    ${olts}[0].get("ip")
+    ${olt_user}=    Evaluate    ${olts}[0].get("user")
+    ${olt_pass}=    Evaluate    ${olts}[0].get("pass")
+    ${olt_serial_number}=    Evaluate    ${olts}[0].get("serial")
+    ${num_onus}=    Evaluate    ${hosts}[0].get("src")
+    ${num_onus}=    Get Length    ${num_onus}
+    ${num_onus}=    Convert to String    ${num_onus}
+    #send sadis file to onos
+    ${sadis_file}=    Get Variable Value    ${sadis.file}
+    Log To Console    \nSadis File:${sadis_file}
+    Run Keyword Unless    '${sadis_file}' is '${None}'    Send File To Onos    ${sadis_file}    apps/
+    Set Suite Variable    ${num_onus}
+    Set Suite Variable    ${num_olts}
+    Set Suite Variable    ${list_olts}
+    Set Suite Variable    ${olt_serial_number}
+    Set Suite Variable    ${olt_ip}
+    Set Suite Variable    ${olt_user}
+    Set Suite Variable    ${olt_pass}
+    Set Suite Variable    ${k8s_node_ip}
+    Set Suite Variable    ${k8s_node_user}
+    Set Suite Variable    ${k8s_node_pass}
+    @{container_list}=    Create List    adapter-open-olt    adapter-open-onu    voltha-api-server
+    ...    voltha-ro-core    voltha-rw-core-11    voltha-rw-core-12    voltha-ofagent
+    Set Suite Variable    ${container_list}
+    ${datetime}=    Get Current Date
+    Set Suite Variable    ${datetime}
+
+Setup Test
+    [Documentation]    Pre-test Setup
+    #test for empty device list
+    Test Empty Device List
+    Sleep    60s
+    #create/preprovision device
+    #read all bbsims
+    ${rc}    ${num_bbsims}    Run And Return Rc And Output    kubectl get pod -n voltha | grep bbsim | wc -l
+    Should Be Equal As Integers    ${rc}    0
+    Should Not Be Empty    ${num_bbsims}
+    Should Not Be Equal As Integers    ${num_bbsims}    0
+    Run Keyword Unless    ${has_dataplane}    Set Suite Variable    ${num_olts}    ${num_bbsims}
+    FOR    ${I}    IN RANGE    0    ${num_olts}
+        ${olt_device_id}=    Create Device    ${list_olts}[${I}][ip]    ${OLT_PORT}
+        Set Suite Variable    ${olt_device_id}
+        #validate olt states
+        Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device    PREPROVISIONED    UNKNOWN    UNKNOWN
+        ...    ${olt_device_id}
+        Sleep    5s
+        Enable Device    ${olt_device_id}
+        Wait Until Keyword Succeeds    ${timeout}    5s    Validate OLT Device    ENABLED    ACTIVE    REACHABLE
+        ...    ${olt_serial_number}
+        ${logical_id}=    Get Logical Device ID From SN    ${olt_serial_number}
+        Set Suite Variable    ${logical_id}
+    END
+
+Do Sanity Test
+    [Arguments]    ${host_src}    ${host_dst}
+    [Documentation]    This keyword performs Sanity Test Procedure
+    ...    Sanity test performs authentication, dhcp and pings for all the ONUs given for the POD
+    ...    This keyword can be used to call in any other tests where sanity check is required
+    ...    and avoids duplication of code.
+    ${of_id}=    Wait Until Keyword Succeeds    ${timeout}    15s    Validate OLT Device in ONOS    ${olt_serial_number}
+    Set Global Variable    ${of_id}
+    ${nni_port}=    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+    ...    Get NNI Port in ONOS    ${of_id}
+    Set Global Variable    ${nni_port}
+    ${num_onus}=    Get Length    ${host_src}
+    ${num_onus}=    Convert to String    ${num_onus}
+    FOR    ${I}    IN RANGE    0    ${num_onus}
+        ${src}=    Set Variable    ${host_src[${I}]}
+        ${dst}=    Set Variable    ${host_dst[${I}]}
+        Run Keyword and Ignore Error    Collect Logs
+        ${onu_device_id}=    Get Device ID From SN    ${src['onu']}
+        ${onu_port}=    Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+        ...    Get ONU Port in ONOS    ${src['onu']}    ${of_id}
+        # Check ONU port is Enabled in ONOS
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds   120s   2s
+        ...    Verify ONU Port Is Enabled   ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+        # Verify EAPOL flows are added for the ONU port
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+        ...    Verify Eapol Flows Added For ONU    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+        # Verify ONU state in voltha
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s    Validate Device
+        ...    ENABLED    ACTIVE    REACHABLE
+        ...    ${src['onu']}    onu=True    onu_reason=omci-flows-pushed
+        # Perform Authentication
+        ${wpa_log}=    Run Keyword If    ${has_dataplane}    Catenate    SEPARATOR=.
+        ...    /tmp/wpa    ${src['dp_iface_name']}    log
+        Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure    Validate Authentication    True
+        ...    ${src['dp_iface_name']}    wpa_supplicant.conf    ${src['ip']}    ${src['user']}    ${src['pass']}
+        ...    ${src['container_type']}    ${src['container_name']}    ${wpa_log}
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2
+        ...    Verify ONU in AAA-Users    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2
+        ...    Execute ONOS CLI Command    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}
+        ...    volt-add-subscriber-access ${of_id} ${onu_port}
+        # Verify that no pending flows exist for the ONU port
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+        ...    Verify No Pending Flows For ONU    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+        # Verify subscriber access flows are added for the ONU port
+        # Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    5s
+        # ...    Verify Subscriber Access Flows Added For ONU    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${of_id}
+        # ...    ${onu_port}    ${nni_port}    ${src['c_tag']}    ${src['s_tag']}
+        Run Keyword If    ${has_dataplane}    Run Keyword And Continue On Failure    Validate DHCP and Ping    True
+        ...    True    ${src['dp_iface_name']}    ${src['s_tag']}    ${src['c_tag']}    ${dst['dp_iface_ip_qinq']}
+        ...    ${src['ip']}    ${src['user']}    ${src['pass']}    ${src['container_type']}    ${src['container_name']}
+        ...    ${dst['dp_iface_name']}    ${dst['ip']}    ${dst['user']}    ${dst['pass']}    ${dst['container_type']}
+        ...    ${dst['container_name']}
+        Run Keyword And Continue On Failure    Wait Until Keyword Succeeds    ${timeout}    2s
+        ...    Validate Subscriber DHCP Allocation    ${ONOS_SSH_IP}    ${ONOS_SSH_PORT}    ${onu_port}
+        Run Keyword and Ignore Error    Get Device Output from Voltha    ${onu_device_id}
+        Run Keyword and Ignore Error    Collect Logs
+    END
+