diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index 54557d8..c82aef7 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -21,11 +21,21 @@
   ONOS_SSH_PORT: 30115
   OLT_PORT: 9191
   KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
-  
-  # This tells the control node how to reach the Kubernetes nodes.
+
+# This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '127.0.0.1'
+      ip: '10.34.90.40'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.41'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.42'
+      user: 'community'
+      pass: 'admin'
   
   fabric_switches:
     -
@@ -46,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+      oltDebVersion: openolt_asgvolt64-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
       oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
  
   hosts:
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
similarity index 82%
rename from deployment-configs/dt-berlin-pod-multi-olt.yaml
rename to deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
index 4d683a4..97527b3 100644
--- a/deployment-configs/dt-berlin-pod-multi-olt.yaml
+++ b/deployment-configs/dt-berlin-pod-multi-olt-DT.yaml
@@ -22,10 +22,20 @@
   OLT_PORT: 9191
   KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
 
-  # This tells the control node how to reach the Kubernetes nodes.
+# This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '127.0.0.1'
+      ip: '10.34.90.40'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.41'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.42'
+      user: 'community'
+      pass: 'admin'
 
   fabric_switches:
     -
@@ -46,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+      oltDebVersion: openolt_asgvolt64-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
       oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
   # XGS-PON OLT
@@ -58,7 +68,7 @@
       fortygig: False
       aggPort: 1
       serial: EC1729003539
-      oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+      oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
       oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
   hosts:
@@ -82,25 +92,13 @@
         pass: admin
         dp_iface_name: eth1.7
         container_type: LXC
-        container_name: voltha-client-gpon-2
-        onu: SCOM00001c89
-        olt: EC1912001814
-        c_tag: 7
-        s_tag: 32
-        power_switch_port: 2
-      -
-        ip: 10.34.90.42
-        user: community
-        pass: admin
-        dp_iface_name: eth1.7
-        container_type: LXC
         container_name: voltha-client-gpon-3
         onu: SCOM00001c96
         olt: EC1912001814
         c_tag: 7
         s_tag: 33
         power_switch_port: 4
-       -
+      -
         ip: 10.34.90.42
         user: community
         pass: admin
@@ -118,19 +116,19 @@
         ip: 127.0.0.1
         user: community
         pass: admin
-        dp_iface_name: eth1
+        dp_iface_name: eth1.7
         container_type: LXC
         container_name: voltha-client
         onu: ALPHe3d1cf5c
         olt: EC1729003539
-        c_tag: 11
-        s_tag: 11
+        c_tag: 7
+        s_tag: 12
         power_switch_port: 6
       -
         ip: 127.0.0.1
         user: community
         pass: admin
-        dp_iface_name: eth1
+        dp_iface_name: eth1.7
         container_type: LXC
         container_name: voltha-client-dt
         onu: ALPHe3a69d03
@@ -151,16 +149,6 @@
         container_type: null
         container_name: null
       -
-        dp_iface_ip_qinq: 10.32.7.254
-        ip: null
-        user: null
-        pass: null
-        dp_iface_name: null
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
-      -
         dp_iface_ip_qinq: 10.33.7.254
         ip: null
         user: null
@@ -181,7 +169,7 @@
         container_type: null
         container_name: null
       -
-        dp_iface_ip_qinq: 10.11.2.254
+        dp_iface_ip_qinq: 10.12.7.254
         ip: null
         user: null
         pass: null
diff --git a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
index 54557d8..c82aef7 100644
--- a/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-openonugo-DT.yaml
@@ -21,11 +21,21 @@
   ONOS_SSH_PORT: 30115
   OLT_PORT: 9191
   KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
-  
-  # This tells the control node how to reach the Kubernetes nodes.
+
+# This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '127.0.0.1'
+      ip: '10.34.90.40'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.41'
+      user: 'community'
+      pass: 'admin'
+    -
+      ip: '10.34.90.42'
+      user: 'community'
+      pass: 'admin'
   
   fabric_switches:
     -
@@ -46,7 +56,7 @@
       fortygig: False
       aggPort: 2
       serial: EC1912001814
-      oltDebVersion: openolt_asgvolt64-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+      oltDebVersion: openolt_asgvolt64-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
       oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
  
   hosts:
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index 020d681..6793cb3 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -25,7 +25,17 @@
 # This tells the control node how to reach the Kubernetes nodes.
 nodes:
   -
-    ip: '127.0.0.1'
+    ip: '10.34.90.40'
+    user: 'community'
+    pass: 'admin'
+  -
+    ip: '10.34.90.41'
+    user: 'community'
+    pass: 'admin'
+  -
+    ip: '10.34.90.42'
+    user: 'community'
+    pass: 'admin'
 
 fabric_switches:
   -
@@ -46,7 +56,7 @@
     fortygig: False
     aggPort: 1
     serial: 'EC1729003539'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
 
diff --git a/deployment-configs/flex-ocp-cord-TT.yaml b/deployment-configs/flex-ocp-cord-TT.yaml
index 56f5714..1d6d191 100644
--- a/deployment-configs/flex-ocp-cord-TT.yaml
+++ b/deployment-configs/flex-ocp-cord-TT.yaml
@@ -50,7 +50,7 @@
     fortygig: 'true'
     aggPort: '10'
     serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
 onus:
diff --git a/deployment-configs/flex-ocp-cord-openonugo.yaml b/deployment-configs/flex-ocp-cord-openonugo.yaml
new file mode 100644
index 0000000..066970d
--- /dev/null
+++ b/deployment-configs/flex-ocp-cord-openonugo.yaml
@@ -0,0 +1,121 @@
+# 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 Flex POD 1 , olt/onu are connected to this
+
+---
+
+kube_config: 'flex-ocp-cord-voltha-master.conf'
+
+nodes:
+  -
+    ip: '10.192.20.45'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.46'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.192.20.47'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:5b:6d:a8'
+    ip: '10.192.20.217'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '3'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    ip: '10.192.20.206'
+    sship: '10.192.20.206'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '10'
+    serial: 'EC1838000853'
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+
+onus:
+  -
+    serial: 'ALPHe3d1cfa7'
+
+hosts:
+  src:
+    -
+      ip: '10.192.20.61'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens2f0'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cea3'
+      olt: 'EC1838000853'
+      c_tag: '801'
+      s_tag: '111'
+      power_switch_port: 1
+      onu_type: 'alpha'
+    -
+      ip: '10.192.20.46'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens2f1'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1ceb7'
+      olt: 'EC1838000853'
+      c_tag: '101'
+      s_tag: '222'
+      power_switch_port: 2
+      onu_type: 'alpha'
+
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.192.20.47'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens3d1
+      dp_iface_ip_qinq: '10.8.8.100'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.192.20.47'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens3d1
+      dp_iface_ip_qinq: '10.8.7.100'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+
+web_power_switch:
+  ip: '10.192.20.56'
+  user: 'admin'
+  password: '1234'
+  type: 'DLI'
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 79ef504..066970d 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -50,7 +50,7 @@
     fortygig: 'true'
     aggPort: '10'
     serial: 'EC1838000853'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
 onus:
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 934d7dc..9e70351 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
 onus:
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index e278a92..872582e 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -50,7 +50,7 @@
       fortygig: True
       aggPort: 9
       serial: EC1912001818
-      oltDebVersion: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+      oltDebVersion: openolt_asgvolt64-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
       oltDebVersion23: openolt_asgvolt64-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
   hosts:
diff --git a/deployment-configs/onf-demo-pod-openonugo-DT.yaml b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
new file mode 100644
index 0000000..9e70351
--- /dev/null
+++ b/deployment-configs/onf-demo-pod-openonugo-DT.yaml
@@ -0,0 +1,117 @@
+# 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 BBWF POD
+
+---
+
+kube_config: '/var/k8.conf'
+
+nodes:
+  -
+    ip: '10.128.100.70'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.71'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.72'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:61:80:ca'
+    ip: '10.128.100.80'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '31'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    name: 'edgecore'
+    ip: '10.111.0.3'
+    sship: '10.128.99.90'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '1'
+    serial: 'EC1904000654'
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+
+onus:
+  -
+    serial: 'ISKT71e80080'
+  -
+    serial: 'ALPHe3d1cf9d'
+
+hosts:
+  src:
+    -
+      ip: '10.128.100.72'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0.11'
+      container_type: null
+      container_name: null
+      onu: 'ISKT71e80080'
+      olt: 'EC1904000654'
+      c_tag: '11'
+      s_tag: '11'
+      power_switch_port: 6
+      onu_type: 'iskratel'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0.22'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf9d'
+      olt: 'EC1904000654'
+      c_tag: '22'
+      s_tag: '22'
+      power_switch_port: 1
+      onu_type: 'alpha'
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.11.11.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      dp_iface_name: null
+      dp_iface_ip_qinq: '10.22.22.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+
+web_power_switch:
+  ip: '10.128.100.75'
+  user: 'cord'
+  password: 'cord'
+  type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-openonugo.yaml b/deployment-configs/onf-demo-pod-openonugo.yaml
new file mode 100644
index 0000000..d3ed5d3
--- /dev/null
+++ b/deployment-configs/onf-demo-pod-openonugo.yaml
@@ -0,0 +1,123 @@
+# 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 BBWF POD
+
+---
+
+kube_config: '/var/k8.conf'
+
+nodes:
+  -
+    ip: '10.128.100.70'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.71'
+    user: 'cord'
+    pass: 'cord'
+  -
+    ip: '10.128.100.72'
+    user: 'cord'
+    pass: 'cord'
+
+fabric_switches:
+  -
+    mac: 'cc:37:ab:61:80:ca'
+    ip: '10.128.100.80'
+    user: 'root'
+    pass: 'onl'
+    bngPort: '31'
+    device_id: 'of:0000000000000001'
+
+olts:
+  -
+    name: 'edgecore'
+    ip: '10.111.0.3'
+    sship: '10.128.99.90'
+    user: 'root'
+    pass: 'onl'
+    fortygig: 'true'
+    aggPort: '1'
+    serial: 'EC1904000654'
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
+    oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
+
+onus:
+  -
+    serial: 'ISKT71e80080'
+  -
+    serial: 'ALPHe3d1cf9d'
+
+hosts:
+  src:
+    -
+      ip: '10.128.100.72'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0'
+      container_type: null
+      container_name: null
+      onu: 'ISKT71e80080'
+      olt: 'EC1904000654'
+      c_tag: '11'
+      s_tag: '99'
+      power_switch_port: 6
+      onu_type: 'iskratel'
+    -
+      ip: '10.128.100.71'
+      user: 'cord'
+      pass: 'cord'
+      dp_iface_name: 'ens255f0'
+      container_type: null
+      container_name: null
+      onu: 'ALPHe3d1cf9d'
+      olt: 'EC1904000654'
+      c_tag: '22'
+      s_tag: '99'
+      power_switch_port: 1
+      onu_type: 'alpha'
+  dst:
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.128.100.70'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f0
+      dp_iface_ip_qinq: '10.99.11.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+    -
+      ip: null
+      user: null
+      pass: null
+      noroot_ip: '10.128.100.70'
+      noroot_user: cord
+      noroot_pass: cord
+      dp_iface_name: ens6f0
+      dp_iface_ip_qinq: '10.99.22.254'
+      dp_iface_ip: null
+      dp_iface_gateway: null
+      container_type: null
+      container_name: null
+
+web_power_switch:
+  ip: '10.128.100.75'
+  user: 'cord'
+  password: 'cord'
+  type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 906098a..d3ed5d3 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -51,7 +51,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1904000654'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.9-dev-d4aeca5a2094f7dc7c519913ab1558348c546dab.deb
 
 onus:
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 296272b..6399bcd 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -42,7 +42,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1721000208'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
 
 onus:
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index a7bf6ca..baacc55 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -42,7 +42,7 @@
     fortygig: 'true'
     aggPort: '1'
     serial: 'EC1721000208'
-    oltDebVersion: openolt_asfvolt16-3.0.0-07ac2cb46d74b83b707fa654ee2e8d4d4de2372a.deb
+    oltDebVersion: openolt_asfvolt16-3.1.0-812c1126ece038da5c40d0830a09cb67ca36ea07.deb
     oltDebVersion23: openolt_asfvolt16-2.4.3-c636279643a1cac3128395cc9fc22977e8edc46d.deb
 
 onus:
diff --git a/deployment-configs/tucson-pod-DT.yaml b/deployment-configs/tucson-pod-DT.yaml
index 778c85e..e56a30f 100644
--- a/deployment-configs/tucson-pod-DT.yaml
+++ b/deployment-configs/tucson-pod-DT.yaml
@@ -50,6 +50,7 @@
       container_type: LXC
       container_name: voltha-client
       onu: ALPHe3d1ce7b
+      olt: EC1925000157
       c_tag: 11
       s_tag: 11
       onu_type: 'alpha'
@@ -62,6 +63,7 @@
       container_type: LXC
       container_name: voltha-client-ISKT71e801a0
       onu: ISKT71e801a0
+      olt: EC1925000157
       c_tag: 22
       s_tag: 22
       onu_type: 'iskratel'
@@ -74,6 +76,7 @@
       container_type: LXC
       container_name: voltha-client-ALPHe3d1cfac
       onu: ALPHe3d1cfac
+      olt: EC1925000157
       c_tag: 21
       s_tag: 21
       onu_type: 'alpha'
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index a650f10..2090749 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -50,6 +50,7 @@
       container_type: LXC
       container_name: voltha-client
       onu: ALPHe3d1ce7b
+      olt: EC1925000157
       c_tag: 11
       s_tag: 11
       onu_type: 'alpha'
@@ -62,6 +63,7 @@
       container_type: LXC
       container_name: voltha-client-ISKT71e801a0
       onu: ISKT71e801a0
+      olt: EC1925000157
       c_tag: 12
       s_tag: 11
       onu_type: 'iskratel'
@@ -74,6 +76,7 @@
       container_type: LXC
       container_name: voltha-client-ALPHe3d1cfac
       onu: ALPHe3d1cfac
+      olt: EC1925000157
       c_tag: 21
       s_tag: 21
       onu_type: 'alpha'
diff --git a/kubernetes-configs/flex-ocp-cord-openonugo.conf b/kubernetes-configs/flex-ocp-cord-openonugo.conf
new file mode 100644
index 0000000..0d43443
--- /dev/null
+++ b/kubernetes-configs/flex-ocp-cord-openonugo.conf
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "flex-ocp-cord"
+  cluster:
+    server: "https://10.192.20.45:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURneU56RTNNall3TkZvWERUTXdNRGd5TlRFM01qWXdORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU5BcFpLOWczYUVFCmJvbWs4TjhUV09lQXZnbVdEMHl0NFkrNjhOVnpzS010UHhEcm9najVuN\
+      2FTbGRCVDZlWUo1c255d1lOd1ZvVG4KYThPUmlrdmVNODR0OGlrWEFpcDgwdHVDc1NCK0ZVU1RQN\
+      zlXTjZsV29COThlTStlSjFqRHZaVmxCRldienpXTwo5TmVnaHZhQ3Z3QjlQcEJVZktmdGlIT1EwS\
+      TdtR2dxQVQrUTY2MXk3OFo2WmNXandCanl5eGdwMUt3U3JOaHZuCnVSK0FiWGkvWGM4SEI1OGw1d\
+      TVKN0oyV0xMa3Q2eVdLVklHcFVmZEZxSllzN3ZOaXpIZFR1VklLRGFsOXdVb0EKWmNMN1krTVplb\
+      XY0YWd1eElvZGg1b1o4V1RqcEpDNW1tSXNIZkJ5RkJaTjNwRncyU2N5bnVjVkxHL0tyN0F5TApve\
+      FUwY20vaGZEc0NBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSUZWVTZPUEpneGhacEJTNHRPTlBCT\
+      FJDVTJnZmgrMHB6YUoKU3grTUpubG1wOWMxL29qaHh5ZmtvT3BUOEhReU8wb0FlaDJaMUVZNzVMO\
+      XhxZlAydU56N2xRM0d6WCtMSHlUVwpZYW43em1obkd5cXdrMmNyRmRXSUcxZ21TSG5USzQwbmpDV\
+      FBYeFdVRTQxdXEybkt3cG5wWk85QktWZUtVVUVICm9IWndrNHZMTGo0cForRmp3Qi9XcGt2dWlFZ\
+      U5POHhYMjlOQkdEVnhubVJ3SWVxRUFTbG10TFpyNFl5ZTIvcFQKNm8yd2lwcjlDNERzd1VWWkhJZ\
+      3JBM1J3WjU0czRBSWlVc1FaZ3QrTDI3K2Y4RzhRSHdOMWtVaVNPSjFuMzVkagpscTJMMW1jMHRnN\
+      UJvU1lLcGhHZEZVdWN2c0Qxd0RqRG9jelcyOS8yNDR3eno4Zk5mcDA9Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "flex-ocp-cord"
+  user:
+    token: "kubeconfig-user-cvpsj.c-xvwg9:xcjwk4h2l8826w9ck4h6jwxkfqfq8g6zbmmrcr27gxbjznwkcdhg42"
+
+contexts:
+- name: "flex-ocp-cord"
+  context:
+    user: "flex-ocp-cord"
+    cluster: "flex-ocp-cord"
+
+current-context: "flex-ocp-cord"
diff --git a/kubernetes-configs/onf-demo-pod-openonugo.conf b/kubernetes-configs/onf-demo-pod-openonugo.conf
new file mode 100755
index 0000000..2bb1005
--- /dev/null
+++ b/kubernetes-configs/onf-demo-pod-openonugo.conf
@@ -0,0 +1,38 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "onf-demo-pod"
+  cluster:
+    server: "https://10.128.100.70:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
+      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
+      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
+      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
+      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
+      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
+      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
+      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
+      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
+      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
+      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
+      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
+      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
+      klDQVRFLS0tLS0K"
+
+users:
+- name: "onf-demo-pod"
+  user:
+    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+
+contexts:
+- name: "onf-demo-pod"
+  context:
+    user: "onf-demo-pod"
+    cluster: "onf-demo-pod"
+
+current-context: "onf-demo-pod"
diff --git a/kubernetes-configs/voltha/flex-ocp-cord-openonugo.yml b/kubernetes-configs/voltha/flex-ocp-cord-openonugo.yml
new file mode 100644
index 0000000..95b18f3
--- /dev/null
+++ b/kubernetes-configs/voltha/flex-ocp-cord-openonugo.yml
@@ -0,0 +1,78 @@
+# Copyright 2019 Ciena Corporation
+#
+# 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.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+#images:
+#  onos:
+#    repository: voltha/voltha-onos@sha256
+#    tag: 9f781ace4c6f4bf3b2e5ff9cb9f26aa4b328284da1d6b6523636dca1375d7666
+#  adapter_open_onu:
+#     repository: gcgirish/voltha-openonu-adapter
+#     tag: ttfix
+#  adapter_open_olt:
+#    repository: gcgirish/voltha-openolt-adapter
+#    tag: fixAction
+#  rw_core:
+#    repository: gcgirish/voltha-rw-core
+#    tag: delete-device
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+voltha-etcd-cluster:
+  clusterSize: 1
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+apps:
+  - org.onosproject.lldpprovider
+  - org.onosproject.openflow-base
+  - org.onosproject.gui2
+  - org.onosproject.drivers
+  - org.onosproject.mcast
+  - org.opencord.kafka
+  - org.opencord.sadis
+  - org.opencord.dhcpl2relay
+  - org.opencord.igmpproxy
+  - org.opencord.mcast
+  - org.opencord.olt
+  - org.opencord.aaa
+
+atomix:
+  persistence:
+    enabled: false
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml b/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml
new file mode 100644
index 0000000..06b0e92
--- /dev/null
+++ b/kubernetes-configs/voltha/onf-demo-pod-openonugo.yml
@@ -0,0 +1,83 @@
+# Copyright 2019 Ciena Corporation
+#
+# 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.
+
+defaults:
+  image_tag: master
+  image_pullPolicy: Always
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+#images:
+#  onos:
+#    repository: voltha/voltha-onos@sha256
+#    tag: 6f23767b85a6515bc465c4678c945d194551dd27abe2cf1b926a524b5e9eb3e6
+#  adapter_open_onu:
+#    repository: gcgirish/voltha-openonu-adapter
+#    tag: tpstate
+#  adapter_open_olt:
+#    repository: gcgirish/voltha-openolt-adapter
+#    tag: ofagentRestartCrashFix
+#  rw_core:
+#    repository: khagerma/voltha-rw-core
+#    tag: update-port-fix
+deployments:
+  etcdOperator: true
+  backupOperator: false
+  restoreOperator: false
+
+nodeAffinityConfig:
+  enabled: true
+  node_label_key: "in-band"
+  node_label_value: "yes"
+
+voltha-etcd-cluster:
+  clusterSize: 1
+onos_env:
+- name: POD_IP
+  valueFrom:
+  fieldRef:
+    fieldPath: status.podIP
+- name: NAMESPACE
+  valueFrom:
+  fieldRef:
+    fieldPath: metadata.namespace
+- name: ONOS_APPS
+  value: "drivers,openflow-base,hostprovider"
+
+apps:
+  - org.onosproject.lldpprovider
+  - org.onosproject.openflow-base
+  - org.onosproject.gui2
+  - org.onosproject.drivers
+  - org.onosproject.mcast
+  - org.opencord.kafka
+  - org.opencord.sadis
+  - org.opencord.dhcpl2relay
+  - org.opencord.igmpproxy
+  - org.opencord.mcast
+  - org.opencord.olt
+  - org.opencord.aaa
+
+atomix:
+  persistence:
+    enabled: false
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/tosca-configs/voltha/flex-ocp-cord-openonugo-onos-netcfg-switch.json b/tosca-configs/voltha/flex-ocp-cord-openonugo-onos-netcfg-switch.json
new file mode 100644
index 0000000..42a4c20
--- /dev/null
+++ b/tosca-configs/voltha/flex-ocp-cord-openonugo-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "Leaf-R1",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}
diff --git a/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json
new file mode 100644
index 0000000..66e893b
--- /dev/null
+++ b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch-inband.json
@@ -0,0 +1,41 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "Leaf-R1",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "ports" : {
+    "of:0000000000000001/16" : {
+      "interfaces" : [
+        { "name" : "voltha-intf", "vlan-untagged": 4093 }
+      ]
+    },
+    "of:0000000000000001/31" : {
+      "interfaces" : [
+        { "name" : "bng-intf", "vlan-tagged": [4093] }
+      ]
+    },
+    "of:0000000000000001/1" : {
+      "interfaces" : [
+        { "name" : "olt-intf", "vlan-tagged": [4093] }
+      ]
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}
diff --git a/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch.json b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch.json
new file mode 100644
index 0000000..42a4c20
--- /dev/null
+++ b/tosca-configs/voltha/onf-demo-pod-openonugo-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+  "devices": {
+    "of:0000000000000001" : {
+      "segmentrouting" : {
+        "name" : "Leaf-R1",
+        "ipv4NodeSid" : 101,
+        "ipv4Loopback" : "10.6.1.254",
+        "routerMac" : "00:00:00:00:01:80",
+        "isEdgeRouter" : true,
+        "adjacencySids" : []
+      },
+      "basic" : {
+        "driver" : "ofdpa3"
+      }
+    }
+  },
+  "apps": {
+    "org.opencord.dhcpl2relay" : {
+      "dhcpl2relay" : {
+        "useOltUplinkForServerPktInOut" : true
+      }
+    }
+  }
+}