diff --git a/tests/data/bbsim-kind-16.yaml b/tests/data/bbsim-kind-16.yaml
index 7e17808..9dbd688 100644
--- a/tests/data/bbsim-kind-16.yaml
+++ b/tests/data/bbsim-kind-16.yaml
@@ -69,6 +69,3 @@
     - ip: null
     - ip: null
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim.json
diff --git a/tests/data/bbsim-kind-2x2.yaml b/tests/data/bbsim-kind-2x2.yaml
index a2dff34..7c48c4c 100644
--- a/tests/data/bbsim-kind-2x2.yaml
+++ b/tests/data/bbsim-kind-2x2.yaml
@@ -52,6 +52,3 @@
     - ip: null
     - ip: null
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim.json
diff --git a/tests/data/bbsim-kind-8x2.yaml b/tests/data/bbsim-kind-8x2.yaml
index 4b6810a..84e6a1c 100644
--- a/tests/data/bbsim-kind-8x2.yaml
+++ b/tests/data/bbsim-kind-8x2.yaml
@@ -69,6 +69,3 @@
     - ip: null
     - ip: null
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim.json
diff --git a/tests/data/bbsim-kind-8x8.yaml b/tests/data/bbsim-kind-8x8.yaml
index 35a0c50..d9d3017 100755
--- a/tests/data/bbsim-kind-8x8.yaml
+++ b/tests/data/bbsim-kind-8x8.yaml
@@ -356,6 +356,3 @@
     - ip: null
     - ip: null
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim.json
diff --git a/tests/data/bbsim-kind-dt.yaml b/tests/data/bbsim-kind-dt.yaml
index a1f5ace..1955c45 100644
--- a/tests/data/bbsim-kind-dt.yaml
+++ b/tests/data/bbsim-kind-dt.yaml
@@ -38,10 +38,7 @@
     -
       onu: 'BBSM00000001'
       c_tag: '4096'
-      s_tag: '900'
+      s_tag: '7'
 
   dst:
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim-dt.json
diff --git a/tests/data/bbsim-kind.yaml b/tests/data/bbsim-kind.yaml
index f0f948c..d27f5bb 100644
--- a/tests/data/bbsim-kind.yaml
+++ b/tests/data/bbsim-kind.yaml
@@ -41,6 +41,3 @@
 
   dst:
     - ip: null
-
-sadis:
-  file: ${CURDIR}/../../data/onos-sadis-bbsim.json
diff --git a/tests/data/onos-sadis-bbsim-dt.json b/tests/data/onos-sadis-bbsim-dt.json
deleted file mode 100644
index 511a8ee..0000000
--- a/tests/data/onos-sadis-bbsim-dt.json
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  "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": [
-            {
-              "uniTagMatch": 4096,
-              "ponCTag": 4096,
-              "ponSTag": 900,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default"
-            }
-          ]
-        },
-        {
-          "id": "BBSM00000002-1",
-          "nasPortId": "BBSM00000002-1",
-          "circuitId": "BBSM00000002-1",
-          "remoteId": "BBSM00000002-1",
-          "uniTagList": [
-            {
-              "uniTagMatch": 4096,
-              "ponCTag": 4096,
-              "ponSTag": 901,
-              "technologyProfileId": 64,
-              "downstreamBandwidthProfile": "Default",
-              "upstreamBandwidthProfile": "Default"
-            }
-          ]
-        }
-      ]
-    },
-    "bandwidthprofile": {
-      "integration": {
-        "cache": {
-          "enabled": true,
-          "maxsize": 40,
-          "ttl": "PT1m"
-        }
-      },
-      "entries": [
-        {
-          "id": "Default",
-          "cir": 1000000,
-          "cbs": 1001,
-          "eir": 1002,
-          "ebs": 1003,
-          "air": 1004
-        }
-      ]
-    }
-  }
-}
diff --git a/tests/data/onos-sadis-bbsim.json b/tests/data/onos-sadis-bbsim.json
deleted file mode 100644
index 3d5f7ed..0000000
--- a/tests/data/onos-sadis-bbsim.json
+++ /dev/null
@@ -1,520 +0,0 @@
-{
-  "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
-            }
-          ]
-        }
-      ]
-    },
-    "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/data/onos-sadis-multiple-bbsim.json b/tests/data/onos-sadis-multiple-bbsim.json
deleted file mode 100755
index 2603c60..0000000
--- a/tests/data/onos-sadis-multiple-bbsim.json
+++ /dev/null
@@ -1,718 +0,0 @@
-{
-  "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