diff --git a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
index fdeab14..18a6927 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.240'
+      ip: '10.35.90.18'
       user: 'cord'
       pass: 'cord'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -41,8 +41,8 @@
 
   olts:
     -
-      ip:  10.90.0.246
-      sship:  10.90.0.246
+      ip:  10.35.90.19
+      sship:  10.35.90.19
       user: root
       pass: onl
       fortygig: True
@@ -55,7 +55,7 @@
     src:
       # 1600G OLT
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.222
@@ -65,10 +65,10 @@
         olt: 722033738988
         c_tag: 222
         s_tag: 22
-        power_switch_port: 4
+        power_switch_port: 6
         uni_id: 1
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.333
@@ -78,7 +78,7 @@
         olt: 722033738988
         c_tag: 333
         s_tag: 33
-        power_switch_port: 8
+        power_switch_port: 5
         uni_id: 1
 
     dst:
@@ -89,7 +89,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -102,7 +102,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -112,7 +112,7 @@
         container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.25'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
index 699d73a..185ca12 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.241'
+      ip: '10.35.90.20'
       user: 'cord'
       pass: 'cord'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -42,8 +42,8 @@
   olts:
   # Gpon OLT
     -
-      ip:  10.90.0.245
-      sship:  10.90.0.245
+      ip:  10.35.90.21
+      sship:  10.35.90.21
       user: root
       pass: onl
       fortygig: True
@@ -56,7 +56,7 @@
     src:
       # 1600X OLT
       -
-        ip: 10.90.0.240
+        ip: 10.35.90.18
         user: cord
         pass: cord
         dp_iface_name: eth1.88
@@ -66,7 +66,7 @@
         olt: 722033038194
         c_tag: 88
         s_tag: 89
-        power_switch_port: 7
+        power_switch_port: 4
         uni_id: 1
 
     dst:
@@ -76,7 +76,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -86,7 +86,7 @@
         container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.25'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
index e14b1e3..5cc7615 100644
--- a/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-3200g-DT.yaml
@@ -25,7 +25,7 @@
 # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.90.0.242'
+      ip: '10.35.90.23'
       user: 'cord'
       pass: 'cord'
 
@@ -33,7 +33,7 @@
   # The switch is shared across 3 PODs, thus is externally controlled
   #   -
   #     mac: '8c:ea:1b:a7:29:72'
-  #     ip: 10.90.0.243
+  #     ip: 10.35.90.17
   #     user: root
   #     pass: onl
   #     bngPort: 31
@@ -42,8 +42,8 @@
   olts:
   # Gpon OLT
     -
-      ip:  10.90.0.244
-      sship:  10.90.0.244
+      ip:  10.35.90.24
+      sship:  10.35.90.24
       user: root
       pass: onl
       fortygig: True
@@ -56,7 +56,7 @@
     src:
       # 3200G ONU
       -
-        ip: 10.90.0.241
+        ip: 10.35.90.20
         user: cord
         pass: cord
         dp_iface_name: eth1.111
@@ -69,31 +69,31 @@
         power_switch_port: 2
         uni_id: 1
 
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.41
-        container_type: LXC
-        container_name: SCOMa0108af9
-        onu: SCOMa0108af9
-        olt: 722033538840
-        c_tag: 41
-        s_tag: 54
-        power_switch_port: 6
-        uni_id: 1
+#      - ip: 10.35.90.18
+#        user: cord
+#        pass: cord
+#        dp_iface_name: eth1.42
+#        container_type: LXC
+#        container_name: SCOMa0108af9
+#        onu: SCOMa0108af9
+#        olt: 722033538840
+#        c_tag: 42
+#        s_tag: 54
+#        power_switch_port: 6
+#        uni_id: 1
 
-      - ip: 10.90.0.240
-        user: cord
-        pass: cord
-        dp_iface_name: eth1.42
-        container_type: LXC
-        container_name: SCOMa0108aea
-        onu: SCOMa0108aea
-        olt: 722033538840
-        c_tag: 42
-        s_tag: 55
-        power_switch_port: 5
-        uni_id: 1
+#      - ip: 10.35.90.18
+#        user: cord
+#        pass: cord
+#        dp_iface_name: eth1.41
+#        container_type: LXC
+#        container_name: SCOMa0108aea
+#        onu: SCOMa0108aea
+#        olt: 722033538840
+#        c_tag: 41
+#        s_tag: 55
+#        power_switch_port: 5
+#        uni_id: 1
 
     dst:
       # 3200G OLT
@@ -102,7 +102,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: 10.90.0.241
+        noroot_ip: 10.35.90.20
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: enp3s0d1
@@ -111,34 +111,34 @@
         container_type: null
         container_name: null
 
-      - dp_iface_ip_qinq: 10.54.41.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
+#      - dp_iface_ip_qinq: 10.54.42.254
+#        ip: null
+#        user: null
+#        pass: null
+#        noroot_ip: 10.35.90.20
+#        noroot_user: cord
+#        noroot_pass: cord
+#        dp_iface_name: enp3s0d1
+#        dp_iface_ip: null
+#        dp_iface_gateway: null
+#        container_type: null
+#        container_name: null
 
-      - dp_iface_ip_qinq: 10.55.42.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.90.0.241
-        noroot_user: cord
-        noroot_pass: cord
-        dp_iface_name: enp3s0d1
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
+#      - dp_iface_ip_qinq: 10.55.41.254
+#        ip: null
+#        user: null
+#        pass: null
+#        noroot_ip: 10.35.90.20
+#        noroot_user: cord
+#        noroot_pass: cord
+#        dp_iface_name: enp3s0d1
+#        dp_iface_ip: null
+#        dp_iface_gateway: null
+#        container_type: null
+#        container_name: null
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.35.90.22'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 9023c15..cc3ba92 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -20,22 +20,22 @@
 
 nodes:
   -
-    ip: '10.128.100.70'
+    ip: '10.35.90.46'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.71'
+    ip: '10.35.90.47'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.72'
+    ip: '10.35.90.48'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
     mac: 'cc:37:ab:61:80:ca'
-    ip: '10.128.100.80'
+    ip: '10.35.90.44'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -44,8 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
+    ip: '10.35.90.45'
+    sship: '10.35.90.45'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -53,31 +53,32 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
-  -
-    serial: 'ISKT71e80080'
+#  -
+#    serial: 'ISKT71e80080'
   -
     serial: 'ALPHe3d1cf9d'
 
 hosts:
   src:
+#    -
+#      ip: '10.35.90.48'
+#      user: 'cord'
+#      pass: 'cord'
+#      dp_iface_name: 'eth1.11'
+#      container_type: LXC
+#      container_name: ISKT71e80080
+#      onu: 'ISKT71e80080'
+#      olt: 'EC1721000216'
+#      c_tag: '11'
+#      s_tag: '11'
+#      power_switch_port: 6
+#      onu_type: 'iskratel'
+#      uni_id: '1'
     -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1.11'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '11'
-      power_switch_port: 6
-      onu_type: 'iskratel'
-      uni_id: '1'
-    -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1.22'
@@ -91,27 +92,27 @@
       onu_type: 'alpha'
       uni_id: '1'
   dst:
-    -
-      ip: null
-      user: null
-      pass: null
-      dp_iface_name: null
-      dp_iface_ip_qinq: '10.11.11.254'
-      noroot_ip: 10.128.100.70
-      noroot_user: cord
-      noroot_pass: cord
-      dp_iface_name: ens6f0
-      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.11.11.254'
+#      noroot_ip: 10.35.90.46
+#      noroot_user: cord
+#      noroot_pass: cord
+#      dp_iface_name: ens6f0
+#      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'
-      noroot_ip: '10.128.100.70'
+      noroot_ip: '10.35.90.46'
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens6f0
@@ -121,7 +122,7 @@
       container_name: null
 
 web_power_switch:
-  ip: '10.128.100.75'
+  ip: '10.35.90.49'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/onf-demo-pod-gpon-DT.yaml b/deployment-configs/onf-demo-pod-gpon-DT.yaml
index 7a33cbe..1b40ef4 100644
--- a/deployment-configs/onf-demo-pod-gpon-DT.yaml
+++ b/deployment-configs/onf-demo-pod-gpon-DT.yaml
@@ -19,22 +19,22 @@
   # This tells the control node how to reach the Kubernetes nodes.
   nodes:
     -
-      ip: '10.128.100.70'
+      ip: '10.35.90.46'
       user: 'cord'
       pass: 'cord'
     -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
     -
-      ip: '10.128.100.72'
+      ip: '10.35.90.48'
       user: 'cord'
       pass: 'cord'
 
   fabric_switches:
     -
       mac: 'cc:37:ab:61:80:ca'
-      ip: '10.128.100.80'
+      ip: '10.35.90.44'
       user: 'root'
       pass: 'onl'
       bngPort: '31'
@@ -52,14 +52,15 @@
       serial: EC1912001818
       oltDebVersion: openolt_asgvolt64-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
       board_technology: GPON
+      power_switch_port: 3
 
   hosts:
     src:
       #GPON ONU
       -
-        ip: 10.90.0.51
-        user: ubuntu
-        pass: null
+        ip: 10.35.90.27
+        user: cord
+        pass: cord
         dp_iface_name: eth1.7
         container_type: LXC
         container_name: SCOM00001ca7
@@ -75,7 +76,7 @@
         ip: null
         user: null
         pass: null
-        noroot_ip: '10.128.100.70'
+        noroot_ip: '10.35.90.46'
         noroot_user: cord
         noroot_pass: cord
         dp_iface_name: ens6f0
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index 25cd442..24c981f 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -20,22 +20,22 @@
 
 nodes:
   -
-    ip: '10.128.100.70'
+    ip: '10.35.90.46'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.71'
+    ip: '10.35.90.47'
     user: 'cord'
     pass: 'cord'
   -
-    ip: '10.128.100.72'
+    ip: '10.35.90.48'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
     mac: 'cc:37:ab:61:80:ca'
-    ip: '10.128.100.80'
+    ip: '10.35.90.44'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -44,8 +44,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '10.128.99.90'
-    sship: '10.128.99.90'
+    ip: '10.35.90.45'
+    sship: '10.35.90.45'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -53,31 +53,32 @@
     serial: 'EC1721000216'
     oltDebVersion: openolt_asfvolt16-3.4.9-e2a9597f3d690fe3a0ea0df244571dfc9e8c2833-40G-NNI.deb
     board_technology: XGS-PON
+    power_switch_port: 2
 
 onus:
-  -
-    serial: 'ISKT71e80080'
+#  -
+#    serial: 'ISKT71e80080'
   -
     serial: 'ALPHe3d1cf9d'
 
 hosts:
   src:
+#    -
+#      ip: '10.35.90.48'
+#      user: 'cord'
+#      pass: 'cord'
+#      dp_iface_name: 'eth1'
+#      container_type: LXC
+#      container_name: ISKT71e80080
+#      onu: 'ISKT71e80080'
+#      olt: 'EC1721000216'
+#      c_tag: '11'
+#      s_tag: '99'
+#      power_switch_port: 6
+#      onu_type: 'iskratel'
+#      uni_id: '1'
     -
-      ip: '10.128.100.72'
-      user: 'cord'
-      pass: 'cord'
-      dp_iface_name: 'eth1'
-      container_type: LXC
-      container_name: ISKT71e80080
-      onu: 'ISKT71e80080'
-      olt: 'EC1721000216'
-      c_tag: '11'
-      s_tag: '99'
-      power_switch_port: 6
-      onu_type: 'iskratel'
-      uni_id: '1'
-    -
-      ip: '10.128.100.71'
+      ip: '10.35.90.47'
       user: 'cord'
       pass: 'cord'
       dp_iface_name: 'eth1'
@@ -91,24 +92,24 @@
       onu_type: 'alpha'
       uni_id: '1'
   dst:
+#    -
+#      ip: null
+#      user: null
+#      pass: null
+#      noroot_ip: '10.35.90.46'
+#      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.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_ip: '10.35.90.46'
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens6f0
@@ -119,7 +120,7 @@
       container_name: null
 
 web_power_switch:
-  ip: '10.128.100.75'
+  ip: '10.35.90.49'
   user: 'cord'
   password: 'cord'
   type: 'DLI'
diff --git a/deployment-configs/onf-soak-pod-DT.yaml b/deployment-configs/onf-soak-pod-DT.yaml
index 03d6969..fde241f 100644
--- a/deployment-configs/onf-soak-pod-DT.yaml
+++ b/deployment-configs/onf-soak-pod-DT.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -40,8 +40,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -60,7 +60,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0.11'
@@ -73,7 +73,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1.12'
@@ -90,7 +90,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
@@ -103,7 +103,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f0
diff --git a/deployment-configs/onf-soak-pod-openonugo.yaml b/deployment-configs/onf-soak-pod-openonugo.yaml
index 02b12d3..d6d6c71 100644
--- a/deployment-configs/onf-soak-pod-openonugo.yaml
+++ b/deployment-configs/onf-soak-pod-openonugo.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/deployment-configs/onf-soak-pod.yaml b/deployment-configs/onf-soak-pod.yaml
index 02b12d3..d6d6c71 100644
--- a/deployment-configs/onf-soak-pod.yaml
+++ b/deployment-configs/onf-soak-pod.yaml
@@ -20,13 +20,13 @@
 
 nodes:
   -
-    ip: '10.128.90.90'
+    ip: '10.35.90.43'
     user: 'cord'
     pass: 'cord'
 
 fabric_switches:
   -
-    ip: '192.168.100.44'
+    ip: '10.35.90.41'
     user: 'root'
     pass: 'onl'
     bngPort: '31'
@@ -35,8 +35,8 @@
 olts:
   -
     name: 'edgecore'
-    ip: '192.168.100.112'
-    sship: '192.168.100.112'
+    ip: '10.35.90.42'
+    sship: '10.35.90.42'
     user: 'root'
     pass: 'onl'
     fortygig: 'true'
@@ -54,7 +54,7 @@
 hosts:
   src:
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f0'
@@ -67,7 +67,7 @@
       s_tag: '222'
       uni_id: '1'
     -
-      ip: '10.128.90.90'
+      ip: '10.35.90.43'
       user: 'cord'
       pass: 'cord'
       # dp_iface_name: 'ens6f1'
@@ -84,7 +84,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
@@ -97,7 +97,7 @@
       ip: null
       user: null
       pass: null
-      noroot_ip: 10.128.90.90
+      noroot_ip: 10.35.90.43
       noroot_user: cord
       noroot_pass: cord
       dp_iface_name: ens1f1
diff --git a/deployment-configs/tucson-pod.yaml b/deployment-configs/tucson-pod.yaml
index 7122512..e24c5a3 100644
--- a/deployment-configs/tucson-pod.yaml
+++ b/deployment-configs/tucson-pod.yaml
@@ -26,7 +26,7 @@
 # Since we're running kind-voltha, the nodes are reached on localhost.
 nodes:
   -
-    ip: 127.0.0.1
+    ip: 10.35.90.27
     user: 'cord'
     pass: 'cord'
 
@@ -35,8 +35,8 @@
 
 olts:
   -
-    ip: 192.168.2.22
-    sship: 192.168.2.22
+    ip: 10.35.90.28
+    sship: 10.35.90.28
     user: root
     pass: onl
     fortygig: True
@@ -56,7 +56,7 @@
       c_tag: 11
       s_tag: 11
       onu_type: 'alpha'
-      power_switch_port: 2
+#      power_switch_port: 2
       uni_id: 1
     -
       ip: 127.0.0.1
@@ -70,7 +70,7 @@
       c_tag: 12
       s_tag: 11
       onu_type: 'iskratel'
-      power_switch_port: 3
+#      power_switch_port: 3
       uni_id: 1
     -
       ip: 127.0.0.1
@@ -84,7 +84,7 @@
       c_tag: 21
       s_tag: 21
       onu_type: 'alpha'
-      power_switch_port: 4
+#      power_switch_port: 4
       uni_id: 1
 
   dst:
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf b/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf
index 95bfe02..9a6e128 100644
--- a/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf
+++ b/kubernetes-configs/menlo-certification-pod-radisys-1600g.conf
@@ -3,31 +3,31 @@
 clusters:
 - name: "voltha-certification-pod-1"
   cluster:
-    server: "https://10.90.0.240:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURFeE1ERTRNell3TVZvWERUTXlNREV3T0RFNE16WXdNVm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.18:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXlORFV5TjFvWERUTXlNRFl3TnpJeU5EVXlOMW93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU1zZlhQUFdEem5ICkNaN2hDQUFIdTdHVDNMc09DWFFwdjNTZnExSlh6T2FvaVMzMTdlTG4vT\
-      EVaVWhwblljWHVzaFZJV3RqSGhvZmkKR25YTHJoazdZRWZJc3RPdmQ4VS9yOEZZQUg3V2FldVY1R\
-      y9XZkFJSzJkbEh2RXkzbzdBdlNMTFJwaTkzd0NDcwpvN1JIVXVxL3h1VUR3QStIaTMrTjNabHNlY\
-      VUyR0wvSkhQUXlnS3JTVTFsenlnSHk5QUZFL2g5Rll6L25JMHQzCk9OVWZvaGJBanhmUWR3UWpDV\
-      ndxNEIyNmRCSHprZDF5NDJnTHhyS0tvOWp5YmsvZkhWaUZTSGlDclpUUXU4OG0KNEJyTU9mSHhxU\
-      TZ4UlhFOFhHeDBwK3hSY1MwSXVpZ2pzQkdpWUZBMXAxYnQyeFFpdHF6Z2ZMRmNkNWdBSXV2KwpyO\
-      W1qT3pERzhNa0NBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBS3NQOE9xN1JnZzNOQmhrVEdEMkY0M\
-      WJObHhsaWJSLy8vTUMKSlNhTXpqQmIrSmlKRTQ2Q29GRERVYW1XbGxpUlRZLy83SVFGeFJVVklQb\
-      Dg3aGo4dEZ6NW9HMXFUR25RZ3NMSAp5cG1kaVRodmNtajFXbjMvNHhrZUJQaFdtcnlNWjNxOGJiW\
-      jRaVm1hTnpWZkVOVjZWS1RLQTJMaDVWS2lOVlBqCngrSVRnTDhjS21JM1IvakQ2bnUwNzNIOEZna\
-      TR6U2lWdmp1Rk9UdTV6ZzZSa0RJZ2o3SzZFNDd4UHNUOXppSEgKMnQ0Wk9Dd3FqTmQwWHl0aDJWO\
-      UtOOFcvZFhjOTZ1QlBRSk55ZWI5UHZSRThMckJFZUQ0Uk9OL2JGdGFZTDlDdwptdXZ2RWpBRXcxT\
-      kJwT0p1YVBYWnVzb1k3V0VjT01BNVJjV1RCVDZqejlINTIyYklaaE09Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5DR1QyUmZlNjFVCkNkcCtIV3QyK0R4WDRobktnb1R6M05LOWJLVWxTbFVFU1dvUDV3MS9oN\
+      VROd0lxbW5XOVJuTWIwcnNRNWQ0SmMKTVMyUnQ2cmZzYll5ZUlBdFV6ejlGSmRDNTN3YzFRdVNaU\
+      URiY3F5Ly80QXZnTmVrMERYUnBnQVNTVlZ5VytKawpwZnd1VitERzI0dmFEK25OVkZTdE40UEl4W\
+      jJPaGc0TFNVNUhGdnRqb3ZPOGJmSW1RYVVEbXdOZTNYV3RuMmNICjBmeE53NFRKMTdHYWVmUEZMT\
+      UFuN3I2STV3VmdOM0tCTGZUc01LNldIWnlnM0FoOFl3Z0cyVFY1a2VyOWlocHYKcWpkMTNzSGZkO\
+      DlmV3lnRFNtR0ZnVEhOTE1HSzVHS3VMUElHKzM5K3ZOSGNGK1l3OER2R2xTK041eE1WcXdnOAo0N\
+      DMxMzlIN1J6OENBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGRWpvTTlCYU1WeStJZHd2enN2V1EvaUhKMEUrTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQXNzb3NvZEk3clY5MlJycEIySnF4cFFJYjA4N2ZyVVpsaUNaT\
+      UVFR0VYck1qMGQra0xJODFoaTk4TgpOU0JST2ExVU5UM2hrSVJCR2thUjB6QkQ4THNsMHFnQlcvM\
+      2kxWGRJRVppd2tSeEVvSDFZbEQ4dzBqWVNkSk1GCmF0dDN5Z1dWK3A0bUkwYWM3NUhCK3U2a3o2N\
+      25iM2QvbGhqRU9EeFBEV2g3Q1V2S3RqT2xUZTYrUGtIUDgxSWYKQ0dLNTArUytLNnd4c0xsdzg4a\
+      lJlbGd6RkZvelMrUS96R0FPT3JvRGJrRWwxYmdON1o1VnU0cUN1UktiT0x5dwpMVHFQajN0QkxXQ\
+      1FQN0laQjA0TVJYN09nanVnM1oyVENSZ0Q5ZjdpVEpZUnhOcVE0akFqU3drNnN6T1N6Wmw0CkRlV\
+      nk4Z2w5bVhEeHJubjVXR05vS084djhNQi8KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "voltha-certification-pod-1"
   user:
-    token: "kubeconfig-user-cvpsj.c-drkdz:4q2gzwgskd8nqvv4rmph4lpf49hwg2ldnhjw2967mfr9hgshskffms"
+    token: "kubeconfig-user-cvpsj.c-jsl7w:g9kcbnrtx9zkjxj26l92sslxpqpbnrtgrmghq6l7ssz88qz6lxjtwf"
 
 
 contexts:
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-1600x.conf b/kubernetes-configs/menlo-certification-pod-radisys-1600x.conf
index 78666c9..0d48b23 100644
--- a/kubernetes-configs/menlo-certification-pod-radisys-1600x.conf
+++ b/kubernetes-configs/menlo-certification-pod-radisys-1600x.conf
@@ -3,31 +3,31 @@
 clusters:
 - name: "voltha-certification-pod-2"
   cluster:
-    server: "https://10.90.0.241:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURFeE1ERTRNell4TVZvWERUTXlNREV3T0RFNE16WXhNVm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.20:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXlORFUxTTFvWERUTXlNRFl3TnpJeU5EVTFNMW93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU1LMXNmaGFrdkJnCldRVlVQTy8waXFpTTNGd0NncSt3TnVlTitHeER0N3M0a1VKazBvdHQ0c\
-      XhQaFRjbDBIb1VSbnNyczJtRUlxSWcKOUJDVGh5NnV5UnY0S1lqOThDTG05T2xMUkpYOFVZNTFuN\
-      lNscE0rNVp0cUVJcWQ0ZzZ4MG5NMFlYWXR5VHhCNQpqV1ZwbCtQRzRDTTBHM0JzQTJiRXMwZVJoc\
-      XVkM1IzT2NVU1ZFY2htaVowL29WM3RGNWpORThzcmRlYzl1ZkozCkxiUHRhcForMmwrdy9yTU4rT\
-      XNDVnRldUk1WTRST1FLU0IzOUN4QmNrY3pUZnNYSHFlTmZiSnpobG5FVVpoV0gKdEluWEh4VjJuO\
-      UZmVjdmd0ZRQXorY09EWjl6RUw1OVljTXpjKzQrWERoMkpUb3d0d1BmNjFOcDdkL3RBaGJDZApTN\
-      09zSUNaeDJyY0NBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQnBlbWFXNVhLaXV0OE4xTldKUkdtN\
-      G9hbFlVTFpGeGRnTWYKYnBGbHMwbzkrU2pmMkVxR0t3YjZodXdMWVJmV0dOWlZHcjNFQkNaSVgwN\
-      npHU1NndE1ocm5SWHZzWkpWMGduMwpPNmpHdzJVejJDOU5mUEJFdXhKWXcra3lLb08xVFlVbFR1d\
-      lNrd3ZuZEFabEFSOURORUpGZDltZG9lcjFtV04xCktrYVJ5M1hwcnplV2R6TEVMSGYrdFRzZ0k3U\
-      1pseThSRnV4NTQwWlg5U3hNTlRDdkFjV1dNNnk2c0lkSkRSOG8KSFFkbnArRnQ3L3VyeTMzTmVte\
-      Fd4VjdHTFB5dEhENmpxZ295czduSnVzd25FVVdvbkM4NkdUcVZGSlV5VDZYegpNVWdUZGNJTXEwe\
-      jAyVGR6ZnVJVHpQYlNUbTdvVEFiTGlLeXluK2pOeEtRZVdpWHdFNms9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5oNXlZNHFSK2Q3CkN4R0JMaXhQTjhJYWJHdm8ycHdhYkF2MGpOU0hkYmFTZlRqSDE0c2xGQ\
+      VRmMWREYXo4Qi9leUdlSkZxZkFBSG8KOUZVS0dXVStrWi9WRitUdFBRNXl2d0hqQkMxbTIvb3lBc\
+      mVIYkZ6OW5SMWNZUE1CczFVNjZFUDRxOWVQQXpOMgo1YkVFcjdUejFTOGZyVWx6OU5JaFhFQWsrb\
+      083N3h4VCt1Wm9jeEowNlg4NXhSV0FFSG9WKzhHOHplUkt4WHVCCm1MVjZvcEFTN3k2MjJPOVNZb\
+      2ZHMFNNMVM5amMrNXZyU0U5eTR2c1dSUVFoeFJaMU0zV2lzTStuQUNESGtBYUEKd3ZsSHVQVE9jS\
+      TU3d3c3YkY1dXRBNCtsbjkvcGxuL0RhTEh2cmlIZHl2cG1WU05oTUpVL0pzVW5FRm9xZS9DYgp3N\
+      VVWQmhzKzhZVUNBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQmZqVi9SbkVKYTJUMzNueW8yZzI3ZjN2azZlTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRRElmRDVUbUxNWThxUlVPdW9oMXZjTUpwcS9aTFJVTmttaWszM\
+      HUvVnBaVTAxVDFWOWZWT0llU1YxRwpwZ1UzMlFoV3NCSXZ0ZkwwNGplTGpmWVdQeURrQUxrV0FHc\
+      TJBTHNEZFk3MFd0allJY3BtL1VFUEhtYkw5YmtuCk9MWHBOM3ZxUkMrMTJQemptclBVaUxrTW9vY\
+      0J0VW4wNlhJWitoYmgwSkRoZFRNQVBXUGtpcXJNdStpMnJ3WTcKeDA5cS8xamxremVXcTdrcktWd\
+      zNXMFQrUnNvWXp1VFRkcld4ZTk1ZzhBdjFtL2JFVEpPL3h5YmRrQ2g0MkxkUApqUTA2UnZtaUdLT\
+      XRsMEFqQTFtaGdvWWhudDI2NFFrOTF4NjdLZjFrWDAxY2plWmZkVzJBMk1pV2tPZURDL1dnClVsT\
+      ktSN2V4ajQvV0NRYURnRVYrZFZiUXhmRmsKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "voltha-certification-pod-2"
   user:
-    token: "kubeconfig-user-cvpsj.c-fxdxv:jcwqbhwdpx5psm6vkz8st2mlrmmvzlsb5xjwg9p9lk9wp9n8dvd79t"
+    token: "kubeconfig-user-cvpsj.c-w4n67:7bhk7b25dmkfdnvdfbdjqhlgt4jrpf4prshzkxz92m26k6n85dm47j"
 
 
 contexts:
diff --git a/kubernetes-configs/menlo-certification-pod-radisys-3200g.conf b/kubernetes-configs/menlo-certification-pod-radisys-3200g.conf
index 82fa5d0..0cf89e1 100644
--- a/kubernetes-configs/menlo-certification-pod-radisys-3200g.conf
+++ b/kubernetes-configs/menlo-certification-pod-radisys-3200g.conf
@@ -3,31 +3,31 @@
 clusters:
 - name: "voltha-certification-pod-3"
   cluster:
-    server: "https://10.90.0.242:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURFeE1ERTRNell4TlZvWERUTXlNREV3T0RFNE16WXhOVm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.23:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXlORFl3T0ZvWERUTXlNRFl3TnpJeU5EWXdPRm93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU1Fbnp2ZjJWWW9yCkJ1a2tMd0tVb0dhNzZNb2RJSlRoVDg5VEgzL0l5dENtL3pEY05rQllQZ\
-      jRoRDd3V2NNa3VibUFvRVFIUUNwR0oKTTlQSjE1UEFoa2I5YXIwRk8xRWEyZEJSZklPaEFTUDBPT\
-      k9JNlcyQUk0RzBFT0RPZDBKQXlLNVUzdzhuTEFTawpjWTlxd1VXS3VPc21JQnh6MDllQ3o3VHpmO\
-      E9rWXNWQlNaU0o1STgxTUxSeWlxYTJDVWZkWTJLd2x0bXE4NlpHCnlNUEN4V0JEbnFZWk4vdTdya\
-      klVRmhJTFQvK2l2a1MzSjI0VUpJZEMzZDYvRjdUL1cvVmNadVJCdXU1bVM5WnMKSXpTWlAyS3BvR\
-      DBXNDI1M2Zxa0RnWEhNTmMvTkxSM3ptaEpGS0FqQzg5TEZvM0NuVnpGN2xCWWptdFVyaGFNNApoS\
-      kJCaXpCZldza0NBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSFZUalpXZXVSajAzdURCL0ZhdU8ye\
-      ENPcFdTT2Mxb1FxTnYKMW4zZlRsMnNBVCtid3J6L1NpbzlVUWswYVVKWkxQWjVwVWJpVGtTOE81V\
-      lRicVhoZFMrKzlaVXpabEZZSEtMSgpLVVIvWDRMQXN6NmoyZTErTGc3bzhOV051ZUorbEpuZzhhU\
-      kZacTFRd005RTdjTS9PanB5T3UvOWxTMXE5RVVzCk40cnRNVFZhZ0ttRjZ3M00xV1doMThNbHpPO\
-      HB4TlZYTC9Na3BocDlndER5REtIbGtQRWdqdEJwendtTGtyL2kKN0YvME1RTDI1c0RNdzlaaHhTQ\
-      mNPSWJVYUdvM2ZNM2FLMTU0QjF4TVRCR0xOdFNvam55ZUZGaCtDSHZrU2FRVwpJR3NXWTBxbE1Lc\
-      FkvY1dON1l0YnBvRmxhVG1saHFudFQxS2RQeGc1eUg4VjRDMnU4TDg9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU9pbFZ3UzJMVm9GCmxIVm1CcTRuUXdWa1dwa1hjUXZFQ0hqd2VNV081bkN3b0xEdTNyT0g5d\
+      1FySXZoaEpvNk5IdVBNaU1LVk9UaFkKQ25Kek1yTWdqYm9oVHlka0piSUFMTmFjTVFzWGlQNEh6S\
+      lVEMW12RDZTKy9CSGhqOWpjaCtnZU9iSnZwQlFUVwoyVTJneXlOU0V5cFlpcDdIMk9FamVnREpte\
+      HAwWmJWMXFCaEQ5QU14amp1Vy8vbVBtT1ZKVUI4RElnRGlkN1BXCmJxWUN1QjFYVmhjeGNFd0RTY\
+      i9jOUJiTTU5bThQU2FValg4Mm5CaWpiSE1qV2ZxdDZQTGM2bFVkRGdGOTlIdVEKMHFaL3NtOFZ4V\
+      jZEQlVtQ1l2ek5pNzU0TDNYN2gwS3VJU1R5Z2I2RG0zcklERWluK216QzlSekc3SWxtekVaKwpFb\
+      nlGNzFKbjlXVUNBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQS9mR2dYQWMxNE81b1g4TkJyLzNhN2pDTFpVTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQUFKa2E0ZGVtOW5tbUtHQnljbE5PZmJ4blZFbTd1TFpXVFZBS\
+      3BhSVZMbnJhcGhwa05ITEtrN3dLYwpRbXhtRlAyRWsxSmZnWVI0aFozU2VkUGhGeUVMVzgrK3dua\
+      DZKd2RBSU9iSlNKTGYwRlRGWGorRS8vUThiT3N3CmxvSW9TUXEvOWtmeWZic055Rk1qVFhjWW9Rc\
+      1BDd0Y5T1grRHo2MFJjZkRsanA1ZEZNRTZTWmJjdmJER215VE0KMHZpck0rdmVxNDVma0VFejZNO\
+      EFFV2F3RTFSandPK2ovaC8wNnd5ejBodUNWM1pzZkJEOHVXR2drNEtkSnVYNwpJc0ZXREVoWHJXd\
+      GV5d1liYTJvaHRjMDJoT25tNzZESm9SZG15L2JHMERFV0dNUS95RElBYjMyZkZMd0N4SlFzCk01a\
+      jBLcVZQOHpVT2dmTHVlREpnaDBEb2ZrSFIKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "voltha-certification-pod-3"
   user:
-    token: "kubeconfig-user-cvpsj.c-ckdjd:ts6j7lx5qxpnxlz67ffbgzkpdzhvfxfc446mh77sm77jzlmhpdtbrv"
+    token: "kubeconfig-user-cvpsj.c-rwn4g:s22bdbhllx8tg7nn225444lwc7k58llx9x5fkt9tv8vwhnwnb6nb8k"
 
 
 contexts:
diff --git a/kubernetes-configs/onf-demo-pod-gpon.conf b/kubernetes-configs/onf-demo-pod-gpon.conf
index 2bb1005..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod-gpon.conf
+++ b/kubernetes-configs/onf-demo-pod-gpon.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-demo-pod-openonugo.conf b/kubernetes-configs/onf-demo-pod-openonugo.conf
index 2bb1005..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod-openonugo.conf
+++ b/kubernetes-configs/onf-demo-pod-openonugo.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-demo-pod.conf b/kubernetes-configs/onf-demo-pod.conf
index 50d881c..2d99306 100755
--- a/kubernetes-configs/onf-demo-pod.conf
+++ b/kubernetes-configs/onf-demo-pod.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.71:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-p4-demo-pod.conf b/kubernetes-configs/onf-p4-demo-pod.conf
index 2bb1005..2d99306 100644
--- a/kubernetes-configs/onf-p4-demo-pod.conf
+++ b/kubernetes-configs/onf-p4-demo-pod.conf
@@ -3,31 +3,32 @@
 clusters:
 - name: "onf-demo-pod"
   cluster:
-    server: "https://10.128.100.70:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl3TURneU5qSXpNVFl5TkZvWERUTXdNRGd5TkRJek1UWXlORm93RWpFUU1BNEdBM\
+    server: "https://10.35.90.46:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXhOVEEwTmxvWERUTXlNRFl3TnpJeE5UQTBObG93RWpFUU1BNEdBM\
       VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQU5pSThRbkd6d1J4CmltNnhZN3VWMHhETGhhb1AwQVZxdU51aGc5TzhNaVZnbm9BaldKS0VBe\
-      lRxYkhLeVFrKy9ab3hUcTdVYmR4cHIKdytVbTJ2disyQ1ZpYWNGc3JLS094bVRyeW4rWEgzQ1VuV\
-      3ZBZ3NaNVBLdThVRVhjbkFhQWZkTy84bGxVdyt3bQozMis2WTAzYXNWbVR1MkJQN1B4Y2RWQWVqb\
-      XpxTU5vejF5S0h2Y0M5QTBTbjVrUkE1dE50MnBudjgwOHRHcEhtClZYWWh5VlhDNFJZbE9PdjdiY\
-      XJPeGtWSEg4N2VhRForZnlPam9peGVnbFN6cUVNK3FTaTlVdFBYQjIyZHNCdnUKNE93MVV3TGwvT\
-      XNBbDVKK3o1NDdsYzU3Nlc3WXE1OVlCU0FMTU56dzBXdk9IbThGM0IzVkNodjNJTUJ1cGVubApOU\
-      21ZODV3cHNMOENBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRHFadlVQTGs3ZHhsaVlFSVhieXgvW\
-      i9NaStZTjZHK2I1ajkKT3UxSDJiWkFVaXU2by92RVc3UlRZa1IzSmJmNkVWTk5DRDdzS1cyaUhme\
-      WgrdDI3ZGhaem5qcnlZNUhNTE53TApJci9iNnBDRVcrdkEvM2VuREQwaUlKdGdNa3ZvOXdMUDNib\
-      lcvRktOTmlIT2lKMnhHSEJiV2IwYkVkL1hpSGwyCmgweDMvQ2dOQUp4M09JY0tHaDVaRFJEaVREV\
-      0tGWEx6aHdmODBlQ2gyem1vU2ZuMHlOeG8xcXR6VnlWakFWUnIKY2NCUVk1L1VWZnQwYTNQZ2xyM\
-      nh3bFMybjAwTnhTOTFwbE51OW5Gd3RYZW4vaDIwUUhFOUpQQ25zSld6eU9XSgpBV2xyYUJwSVBUa\
-      nhLTkdud0pjV1RuUVk2WkdIZGV5VnNMdXF4RnhHS0pVc2QxZlBBU289Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
+      0VCQU5EMXRTQmtLM1Z1CkxjelNHTWx6anN3RjNSRXkrUDU2N1BES0xCUjJ3UHRvanNYdzQ2QkhPa\
+      VlaNlpuVEtoaFBybk1yV3ZVcUdrSU8KdFpINDZtcDVwd3JERXcvQmJqbm9taUpTMnZJQU5Edkh5T\
+      GxmRmNSdmxiV1lLMTd2S1lPTm9xK3FYa0FGbVRXWQpMYU5qaGlGRWZibGZERnRyeTBhcjROM21LR\
+      XRWMXJ1eWpzMUl2RWhIL3diTVhpOXNORkFTRGFjaEswaHMwUWlzCi9acU4xUkx3Ull4My8vd2FhM\
+      mRxRWZPb2Q4dXpJRHdIU09tUjh4cWlERnFzbFFmR3hjT3RzSFB3RzBRSWtYRXEKRmw2WGdqUEJsS\
+      HFlMDVNaktVZmxsWFZXaWNkMDdoaVdQZytXeU05aXRaVlM1MzJJa3RrYnp6L1ZmdUtwWjZkQwpWQ\
+      UF0dW1EQ0pkc0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGQWg4ZG1tc1NlZHVBOFpHMXlmb2FLNWlkcklDTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQkg2dWpGeVdReWMyWlh5Ukd5c1RSZUExZHJsYVRvbE94c0pXS\
+      zZXYXpqZ0dWbEdzMWR2c3dMbElpMgpPSFU1dWE5WHFKUHZ3Z0JZRzNiTG11MnpQTkhiSzR2TEVjV\
+      jQ4ODY3bEZWY2R4SzlKbmxzOG1FdHo0WktQSTFlClZVYnZhc3JOQ0t4anh2UE83ZG5pdkRBbU95b\
+      StFbWFzL2prZDVJejRLenRDNnREbTVTM0o5WnhqVStZL1JHME0KV3V5YTM2aWxkMGt5VU5TUkFVe\
+      mdtdUNGMjJHMWJjaWVLSlhMUmZMbk5CTGhnTUkyc3FBNmh6NXVtNVZpUklBWQp6b2NnNjJzVVUzO\
+      Ss2bWlUWExrbTY1Y2JFaWhZdlFxQlMxWkZKRWoxTDMyeU9ZNm9ldWJnU29RVXh4eHpQNmRRCnNhR\
+      jFpQWN5di9RQ3YzQWt1VW9mczZDOEpxaGoKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
 
 users:
 - name: "onf-demo-pod"
   user:
-    token: "kubeconfig-user-cvpsj.c-xchtj:4575q847j9kchbjfhhl8cxsnpw884bjssswvtgjvnbwmjlgszgp7gk"
+    token: "kubeconfig-user-cvpsj.c-579zh:njzq6cs26ssdjxtqmmdwbhzxwwhdjhv45tdpmbldctvks7wqwr5swr"
+
 
 contexts:
 - name: "onf-demo-pod"
diff --git a/kubernetes-configs/onf-soak-pod-openonugo.conf b/kubernetes-configs/onf-soak-pod-openonugo.conf
index e22dbc3..be62aee 100644
--- a/kubernetes-configs/onf-soak-pod-openonugo.conf
+++ b/kubernetes-configs/onf-soak-pod-openonugo.conf
@@ -1,47 +1,18 @@
 apiVersion: v1
-kind: Config
 clusters:
-- name: "onf-soak-pod"
-  cluster:
-    server: "https://rancher.opencord.org/k8s/clusters/c-7wvvq"
-- name: "onf-soak-pod-node1"
-  cluster:
-    server: "https://10.128.90.90:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURNd016RTRNakF5TWxvWERUTXlNREl5T1RFNE1qQXlNbG93RWpFUU1BNEdBM\
-      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQUt5M21sS3poSEkrClBsK1VnZkNlMldoTlNRajU0bGk4dWhrRldlTDM0anFDNU8ycFhoWm9sT\
-      jdrVFcwL3BJQWQvN043NVlhZDVkUkQKcWZ1YjRUMVdvNW13N01NWnpIbFNwK2VvYzhEOU1PQnFFK\
-      1J0K3hqTlJpVVNCRDZPYnNGWkk3dmxzOXZNTHRXUwp4NmtOcXMxVDZDNXNPUXJUMXZ6aHZnb3V0M\
-      FVsdDdJRjB0b1ZRbndPSFV6NkxFTmR6MTFJVEwwdW4zR01mMnFFCnppbzJscmZkVHJZNnZZYURyV\
-      E5tUnl1VU5sNmxEenJ3MmMwM1RDSzhzZGI0QWlYZlZWZGVGWHM5WW1tbWJoVU4KYm1OcXVVNXQxQ\
-      0pCR3VEOVVRbGZTTEU3enpSMmxNNGZtd3NiNlVJVTdkM1h2WGJDZG05UmpBeklRd0p5RUJ0aQoyM\
-      WgzZ0k4SFByRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSXhsV0RVU29RdklWaEplYVVwYXBIM\
-      0hXZnZNNE9PcXU3QTEKSllYMU03RGFuVy85WkNJeHVTSnNMendHYkY0ZDM5bk8ydFlZOUR0Z3Qyc\
-      jVSNEdZc01qZzBzY0NJU0h3K0NLaQpERE5UMXVRV283aWtEd0tCdVJDUS9JVW5WTFMwWWhFeGUra\
-      UxwNkhXd0xCU3hpR0hNMnhVaG1KVjBxNGU1R2M0CmtZVkxIOXlVVm9xbVFNRVVjY1RrdkM4VDl3N\
-      DJPUE1QbkJhYkNuKzE0c1kzZzNFU2hJWjdFbzNMUURPUVJQQUkKZHNkdUhxSm5icFY0Sjg5NGlNa\
-      TMyNmJISUc4UHBkWjhhaGpVSkFpa2pnTFIxS1phNjVKSjJ0ZVNCV05WUGxPYgpweTMzdzAvRFlhe\
-      DF0ZWVjcUhocXl2alFaTE1jL3R5Q01qaGMyR3lzUkhaMi9qUFcwNTg9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
-
-users:
-- name: "onf-soak-pod"
-  user:
-    token: "kubeconfig-user-cvpsj.c-7wvvq:wdcbrgtnj96m4qsf2cvqcxb9z7rklgmswmfhn92xdb7p2wwhdf78xp"
-
-
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQWNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURZeE1ESXhNell4TVZvWERUTXlNRFl3TnpJeE16WXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUoyQlR5ZlFPdncyCjJKSTRKUlUxSmZhaFI5ZUJKTitSYnpGV01VZnM3SWg2QmVHVHNyekRWUGFJM2JGS2JQaExkUjV4M1ZyM1lVbzEKa013WGZEU2xscXArOWNBNEZJMWZOeUhEYjhCYXBZb0FvYTNEaEJzNmJ1T0EvVUlSOVA3MHk4Z0thaGZpSlk1Ngo1ZHBMNVpTVHM2VmhxRHp3OEVYaDBMVWtWeWJ4WVlWQzNPbW91eG9iQ3FETHNVcGZON0lqK3M5eXNvU2tkRnp4Ck5wWlI0MlJuZHd3eXV1MkdjYVpqME5KUzZtNTBLVnEvcW1RZVNEclNPU3pueGt6Nkc3aTJMNWZ5dlJINVF2dk0KUHBQa01jZmxUUEpjN0pQNHFSTW9kNk5kV2RHdnhqRnZoZkxOYmg1SjZBc0FmSDNObm1Ibld4UVVHT3k3cjdUMQptYXpHQ3hFVVN6Y0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGRkxWSHRzQ0xwK2hsWng4TVByUE1uUHVrNW9xTUEwR0NTcUdTSWIzRFFFQkN3VUEKQTRJQkFRQ09vcW5ZL3pLWXhJNFl0OUFtSnZIbHhCU21XU0k5eWJLeUg4SFRlUHBFNnF2S1VmSkZRbXZjM2hTVApua0MvbGVJT1JrWHVEWUNlcnI3MFZCMzdycUthbm9QcjlNaGNIbkxDNEhaRjB4LzlYTjhiTDhLZFh3UTlzSm9ZCi95ZkNMWGZ2TTh5dDhibEpEMzhGVzRIRVppTzd4WU1qVG1UZVFvL0VJWTdXYjgrdGRhTjkxa3A5akJ4Y3NzRW8KNGxrazdicFU4NGFNOFNVYklPYThXQkFtSEora2Q4VkFTbHBNWDNFc2UvSGpQSUtiN3RkY0xZTWxFMGw0Zk5ocAo4UFVoY3JrZlBOMmVJYitIKzNCenVDanpvbGh3U3RtZWpwM0kzQUZUejNyNWlwM1FoSFZySXhJY2p4UWtzV0tQCmVTci96eWdYSFZmTk5MNGJZaEhzaVRkWE1ZMFUKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.35.90.43:6443
+  name: onf-soak-pod
 contexts:
-- name: "onf-soak-pod"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod"
-- name: "onf-soak-pod-node1"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod-node1"
-
-current-context: "onf-soak-pod"
-
+- context:
+    cluster: onf-soak-pod
+    user: onf-soak-pod
+  name: onf-soak-pod
+current-context: onf-soak-pod
+kind: Config
+preferences: {}
+users:
+- name: onf-soak-pod
+  user:
+    token: kubeconfig-user-cvpsj.c-vbfjz:hlkw8pzd4qdvqqf9r9h9w86vtn664kt55zjxdcm7sk4lxl2mwchpxj
diff --git a/kubernetes-configs/onf-soak-pod.conf b/kubernetes-configs/onf-soak-pod.conf
index e22dbc3..be62aee 100644
--- a/kubernetes-configs/onf-soak-pod.conf
+++ b/kubernetes-configs/onf-soak-pod.conf
@@ -1,47 +1,18 @@
 apiVersion: v1
-kind: Config
 clusters:
-- name: "onf-soak-pod"
-  cluster:
-    server: "https://rancher.opencord.org/k8s/clusters/c-7wvvq"
-- name: "onf-soak-pod-node1"
-  cluster:
-    server: "https://10.128.90.90:6443"
-    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
-      WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
-      FdOaE1CNFhEVEl5TURNd016RTRNakF5TWxvWERUTXlNREl5T1RFNE1qQXlNbG93RWpFUU1BNEdBM\
-      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
-      0VCQUt5M21sS3poSEkrClBsK1VnZkNlMldoTlNRajU0bGk4dWhrRldlTDM0anFDNU8ycFhoWm9sT\
-      jdrVFcwL3BJQWQvN043NVlhZDVkUkQKcWZ1YjRUMVdvNW13N01NWnpIbFNwK2VvYzhEOU1PQnFFK\
-      1J0K3hqTlJpVVNCRDZPYnNGWkk3dmxzOXZNTHRXUwp4NmtOcXMxVDZDNXNPUXJUMXZ6aHZnb3V0M\
-      FVsdDdJRjB0b1ZRbndPSFV6NkxFTmR6MTFJVEwwdW4zR01mMnFFCnppbzJscmZkVHJZNnZZYURyV\
-      E5tUnl1VU5sNmxEenJ3MmMwM1RDSzhzZGI0QWlYZlZWZGVGWHM5WW1tbWJoVU4KYm1OcXVVNXQxQ\
-      0pCR3VEOVVRbGZTTEU3enpSMmxNNGZtd3NiNlVJVTdkM1h2WGJDZG05UmpBeklRd0p5RUJ0aQoyM\
-      WgzZ0k4SFByRUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
-      UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBSXhsV0RVU29RdklWaEplYVVwYXBIM\
-      0hXZnZNNE9PcXU3QTEKSllYMU03RGFuVy85WkNJeHVTSnNMendHYkY0ZDM5bk8ydFlZOUR0Z3Qyc\
-      jVSNEdZc01qZzBzY0NJU0h3K0NLaQpERE5UMXVRV283aWtEd0tCdVJDUS9JVW5WTFMwWWhFeGUra\
-      UxwNkhXd0xCU3hpR0hNMnhVaG1KVjBxNGU1R2M0CmtZVkxIOXlVVm9xbVFNRVVjY1RrdkM4VDl3N\
-      DJPUE1QbkJhYkNuKzE0c1kzZzNFU2hJWjdFbzNMUURPUVJQQUkKZHNkdUhxSm5icFY0Sjg5NGlNa\
-      TMyNmJISUc4UHBkWjhhaGpVSkFpa2pnTFIxS1phNjVKSjJ0ZVNCV05WUGxPYgpweTMzdzAvRFlhe\
-      DF0ZWVjcUhocXl2alFaTE1jL3R5Q01qaGMyR3lzUkhaMi9qUFcwNTg9Ci0tLS0tRU5EIENFUlRJR\
-      klDQVRFLS0tLS0K"
-
-users:
-- name: "onf-soak-pod"
-  user:
-    token: "kubeconfig-user-cvpsj.c-7wvvq:wdcbrgtnj96m4qsf2cvqcxb9z7rklgmswmfhn92xdb7p2wwhdf78xp"
-
-
+- cluster:
+    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQWNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURZeE1ESXhNell4TVZvWERUTXlNRFl3TnpJeE16WXhNVm93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQUoyQlR5ZlFPdncyCjJKSTRKUlUxSmZhaFI5ZUJKTitSYnpGV01VZnM3SWg2QmVHVHNyekRWUGFJM2JGS2JQaExkUjV4M1ZyM1lVbzEKa013WGZEU2xscXArOWNBNEZJMWZOeUhEYjhCYXBZb0FvYTNEaEJzNmJ1T0EvVUlSOVA3MHk4Z0thaGZpSlk1Ngo1ZHBMNVpTVHM2VmhxRHp3OEVYaDBMVWtWeWJ4WVlWQzNPbW91eG9iQ3FETHNVcGZON0lqK3M5eXNvU2tkRnp4Ck5wWlI0MlJuZHd3eXV1MkdjYVpqME5KUzZtNTBLVnEvcW1RZVNEclNPU3pueGt6Nkc3aTJMNWZ5dlJINVF2dk0KUHBQa01jZmxUUEpjN0pQNHFSTW9kNk5kV2RHdnhqRnZoZkxOYmg1SjZBc0FmSDNObm1Ibld4UVVHT3k3cjdUMQptYXpHQ3hFVVN6Y0NBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGRkxWSHRzQ0xwK2hsWng4TVByUE1uUHVrNW9xTUEwR0NTcUdTSWIzRFFFQkN3VUEKQTRJQkFRQ09vcW5ZL3pLWXhJNFl0OUFtSnZIbHhCU21XU0k5eWJLeUg4SFRlUHBFNnF2S1VmSkZRbXZjM2hTVApua0MvbGVJT1JrWHVEWUNlcnI3MFZCMzdycUthbm9QcjlNaGNIbkxDNEhaRjB4LzlYTjhiTDhLZFh3UTlzSm9ZCi95ZkNMWGZ2TTh5dDhibEpEMzhGVzRIRVppTzd4WU1qVG1UZVFvL0VJWTdXYjgrdGRhTjkxa3A5akJ4Y3NzRW8KNGxrazdicFU4NGFNOFNVYklPYThXQkFtSEora2Q4VkFTbHBNWDNFc2UvSGpQSUtiN3RkY0xZTWxFMGw0Zk5ocAo4UFVoY3JrZlBOMmVJYitIKzNCenVDanpvbGh3U3RtZWpwM0kzQUZUejNyNWlwM1FoSFZySXhJY2p4UWtzV0tQCmVTci96eWdYSFZmTk5MNGJZaEhzaVRkWE1ZMFUKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+    server: https://10.35.90.43:6443
+  name: onf-soak-pod
 contexts:
-- name: "onf-soak-pod"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod"
-- name: "onf-soak-pod-node1"
-  context:
-    user: "onf-soak-pod"
-    cluster: "onf-soak-pod-node1"
-
-current-context: "onf-soak-pod"
-
+- context:
+    cluster: onf-soak-pod
+    user: onf-soak-pod
+  name: onf-soak-pod
+current-context: onf-soak-pod
+kind: Config
+preferences: {}
+users:
+- name: onf-soak-pod
+  user:
+    token: kubeconfig-user-cvpsj.c-vbfjz:hlkw8pzd4qdvqqf9r9h9w86vtn664kt55zjxdcm7sk4lxl2mwchpxj
diff --git a/kubernetes-configs/tucson-pod.conf b/kubernetes-configs/tucson-pod.conf
index b9eeaf0..461ae5c 100644
--- a/kubernetes-configs/tucson-pod.conf
+++ b/kubernetes-configs/tucson-pod.conf
@@ -1,19 +1,39 @@
 apiVersion: v1
-clusters:
-- cluster:
-    certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRFNU1URXdOREl3TlRVek9Wb1hEVEk1TVRFd01USXdOVFV6T1Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTmNrCm9VUWFiVEh0MVVZSG1kOUpRejE0QzVFWWVlb1ZKaGY3a2tCSFpWZ1c2RytvdzZ1YWRXUVVNYTBocVF6REFMSFkKWTA2bXRwNXYwMTA1Z1hXVU1INXFIcVk3UStSUEdBUGFKZUZpcUpJRHFBMHhieXNpcGJxZHRETit6dTQ1REF5aQpIdXE5b09tSlZkSncwamdSUXNwREFtdUdBSnlXOWZVN1NKWjQ3Mko0U3JNbFdCR1JvYUlCY3lVOUlHWHc2N2Y3CjhNZzgzeWJncUZ4S3VLQ2J6b2dydWRteEg2d09KMURGL1U3d2dRZUh0MnlxNU1meUJPSlkxeitxb0w4UWJxVVAKMGFBc2ZaWmtkU3VKTVZWTlRTdnZScUhtcTNtWlZlT1dVOHE1VjBCSmtQL3U4M0U2UlE5WlVmaExCUTRzOENQeQoxR0FWRWZteGlLY25WbjJ3K0dNQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFMd2VEcEp6amVKa1gxemdXSjkvYlhEeXBDQ1kKWDdxUWlVamJNeXhzTmx4cWZHcXB3R21xdXF0SCtiK3ovelZQWlQ1LzNaaEhLaGNoWks2ajdPQklNeVkzMENuVQphVjVWYWZvajhxbkU0YnNwV1dPV2NIWnh5UkRVdEwyc3E4UGEwdS9IR1hqVjNSbkxDNWxrRWhvem5qdEIwYnhKCnk0cTM4RE5pR1c5YUlyYmZqMVVTOWpvL0h4VCs4TlVLZHZyRCs5QkdLNkZVQWxKZkl5Q1FvT1daWUx4VlJ5WDAKT0hQclVRRmF1MXVucTF1cC9uVmlSVERYSVZKZ1YwWDBlazZ3YUpzRG5HektpWnMyVG9CakxCdlVWLzlHT28vUgpkbHY1SHd5aE4zN0xMWkU3cFc1RDA5c25zbzVkSk5CZTNQWkY1THNXT2JLUlhla3owMlNkczVTMTQrOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    server: https://127.0.0.1:35135
-  name: voltha-minimal
-contexts:
-- context:
-    cluster: voltha-minimal
-    user: kubernetes-admin
-  name: kubernetes-admin@voltha-minimal
-current-context: kubernetes-admin@voltha-minimal
 kind: Config
-preferences: {}
+clusters:
+- name: "onf-dev-pod"
+  cluster:
+    server: "https://10.35.90.27:6443"
+    certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM0VENDQ\
+      WNtZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+      FdOaE1CNFhEVEl5TURZeE1ESXpNRE14TkZvWERUTXlNRFl3TnpJek1ETXhORm93RWpFUU1BNEdBM\
+      VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+      0VCQUxiektwM2N6cWV4CjJmT2NxQ3hhaU5tZXplRkFueWUwYVp3ZEs3MWJQRzBzTUZIdXBiK2VpO\
+      FVIaHFsSGZhT0xZZS9GTUduWUprYWcKQTh4TjRQR1N2M3BZZFlIMVNqbFFoWGlYdmxCcnZ3VmMvR\
+      EdhaGdpVkVURlFtNVJBd3JnaFNWTFAzeEhZQ3JyUgozRG9OZFV6WDBvMTBnZ0hrMmtqc2VSZlBEc\
+      0ZRT2YzWEtLWWZJLzNpNWFhVWtGQUpKV3NTbm5QaHF1aFYyb0xQClhrT0VEUGMwUTU1aXgyc2YyO\
+      EgrSHdKVFlpbDl6R3M2WlNrdjl6VDBRaFFJWHRDRVpXaDJueE9GVEs5NHN3akUKWWlMVVNWNEcva\
+      HpnajVLMlVpR0NJUElyMUFzb0prVjdlTE4yZWhMMm93eWNBL3hGZlZ5dWNPOGFiN2ppcGNpZwp4Z\
+      HdyK28rY2YxOENBd0VBQWFOQ01FQXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+      UZNQU1CCkFmOHdIUVlEVlIwT0JCWUVGTUE5ckRVcXl1YVh0bFFkd3RQQkdNdENzNnkvTUEwR0NTc\
+      UdTSWIzRFFFQkN3VUEKQTRJQkFRQXErbEJBL3JPcmF2ZWIvd1UvSW1zMWFscWJBbUNSVW5GV0pST\
+      C9QT3VpYy9XcWo5UDMwWE9iLzc0LwptQ1dzUkJLMXZpN1VoNU5JQ042TzhqeGE5VENOU0RLSm02L\
+      2FCR0Fna3gwejkrM08xS1JTRWdndzNQYitrbWUrCjNJZkc2SXo1MU1UdjEvalNsZ0dPREtwRTFQc\
+      TI3U1hkMWN2Wm9PZDJhN1doakNrMGs4bTJtZ1c4c1VYN1dZYTEKMlFsVVp2OFgzYXVyOHJ3cUg1W\
+      ExFMGh2SGprRkxZakV5clJjbm0zTjkxa05vMUQxdXpzZytjZmIvdXZsekR6Zwpxd3VlVDNWQXFJS\
+      2NtYlpnMkQ3T3h1cXRyakhPRU4ySzcwdXJlQ1dwc1pIbWpHSDJuK1EwNFVWM28vU3dLVWN0ClBhc\
+      Gx0K2VqWFRtR1lxdi9Jc0htcnFobzhndDkKLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo="
+
 users:
-- name: kubernetes-admin
+- name: "onf-dev-pod"
   user:
-    client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJU1JMWXJyWko5T3N3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB4T1RFeE1EUXlNRFUxTXpsYUZ3MHlNREV4TURNeU1EVTFOREphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXkxcmt2RkFwYlhRRjQwTSsKU1hGRkU5dTNINTdWUWlzdENSVnlzUHh3c1FGTkRRTlNKZ044dFpQMitCWjZlUlNiTWU4YWprK2lmRXMyV29GYQpHNkJ2akxDWms3RnNwTzAyK3EyVVZFNzZEWWpMOHQ1ZEpMSVdFbEd6OEpkb2JONzlMU0VCMmtoYlZuQzFzRE5wCjFPemcrOE52TXd5KzloUXhGTUhNcklCa0dQNW05alZvR0c2R1F1U0VFWGpFRUJ0bFpDNHhDMm51ZlcrTDB1bEUKYVhiY1FCYWYyWXVSKzBEYkIzR29rVjBiR1pCUDNtRTg1L3NMVjkzT1dLRkltT0xBRGdyZ3hrTkdKSFl5SlhDUApreXVEbHJSYjVPVzY4UmVFd01FQ2ZFUmdnLzZxeXRDRDRpMkM0MENPZkpKbmNjY21CUkVKUEJ6cWp1eXk0dXNQCnFzZE9MUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFLUmZsK0tSTGN5c3QrRzBkNkI1QXJsN3dYeFM0RFhFcXErQQoySUVCNUpJUDBBUkhISkIrUVh2Vm9EK0JyQzJVRStVdXM4M1dVUmZITHU4c245ODcxMnZJSVhXSUUrd0dIZVVoCnJmKzR2dEplMlptMHY4eUttdlBnZU9HV3ROYmlkc0d4MGFYUFQzWGlsVjFBcFNvRWRlVlkwL0hrL2hBUGQxNDMKZlpFRXpCUG1uTUoyQWJPRjlxbzRJa1dCVy9EOTZkbTcwOTdCN3BlMVYvZTF1U3Z3UnJ6Unk4Ly9LMmJGSUJqaQpzUGU5M0RRMFdrRzY1RHpxYXpkbUFGeWV4aEZsS3hnRGswaTFmQlFpWUJzRnVyeE9WdGZuRDc4QjJCUUVXSDI2CjJwSUNyejc1MXVLcERidDljcmFWcWM4c0JZWXpFYlBxbCtLSWF4RWM3QzQyVDJsa0hoZz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
-    client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeTFya3ZGQXBiWFFGNDBNK1NYRkZFOXUzSDU3VlFpc3RDUlZ5c1B4d3NRRk5EUU5TCkpnTjh0WlAyK0JaNmVSU2JNZThhamsraWZFczJXb0ZhRzZCdmpMQ1prN0ZzcE8wMitxMlVWRTc2RFlqTDh0NWQKSkxJV0VsR3o4SmRvYk43OUxTRUIya2hiVm5DMXNETnAxT3pnKzhOdk13eSs5aFF4Rk1ITXJJQmtHUDVtOWpWbwpHRzZHUXVTRUVYakVFQnRsWkM0eEMybnVmVytMMHVsRWFYYmNRQmFmMll1UiswRGJCM0dva1YwYkdaQlAzbUU4CjUvc0xWOTNPV0tGSW1PTEFEZ3JneGtOR0pIWXlKWENQa3l1RGxyUmI1T1c2OFJlRXdNRUNmRVJnZy82cXl0Q0QKNGkyQzQwQ09mSkpuY2NjbUJSRUpQQnpxanV5eTR1c1Bxc2RPTFFJREFRQUJBb0lCQUd3OFNyYTRhL1JuNXFKWgpyaE5sQ0lGVFZwcXI3WkkwYk5vQzRuSzFTajNNRlhpeHBjMjUyV3pEL3BWNVVXS1V4eTNDdC8yN0FSN3E0VmsyCnRBRTBXV3NtcS9kaVhoTkNkeHJodkt0TEJlaWlRUHRadzNXK20rVFFPOWY0bm9vai9kbEJVajBlZWc3K0dwWlkKSnlJL21sZ21ZMDltbjFWVzFmRFlYZG9LMUR4QVo3QlBuWEx1OFVSQ2QxSkQySU5qdUJRWHdZSi9rYXV6NHE5VwpnSmk1ZEtKWW45RlhoUGg4L3JPbkdKdXg4d3hMQktuWnZHbGhMK24zd2k2bjNIUzZvWEZ5MjB0dEw0V28vdUVsCm8wQm5rMWhwaTlNUlJIZ0YyVmppQ1B6SDUvS3JnMktDWXJuRjhNWFIrOEZZYlNVZ2F1M0VYVkJUT01oYVlRWGsKNWJ0Q1ZvRUNnWUVBekhiTGkvdkFlYS8wTEpwK0ZESHNyMDlTcVp4eHBmckM0ZVhyUmYvNVhNTEFONTVrZU1YVwp1K0hmaWQ1N0g1M25HVm9QZDRrV0tHeFJqNUM3MVJ3NjdMMXVDZkJDei8yNlM2ekovMGF6Y1B2d1hTcEViVlNKClNjSnpNQWNBYkhpVnUxaG1SUFYvalBHTFN6by9WOCtDNXJWQ3BJdnlNUXo5RjY1UlRuRTBNREVDZ1lFQS9weUsKTmtaNjZNZXhtSllBQmlweXJMQmJxK0NSOGxPRVltUCtQbW9BNmxVbmlmWWtNSjYrbVk2WUFQL09iUHlYc2V4eApUK3hnK3RuK3lxeWppZG9hVUNMeWI2bHJ4OUJWeTdaUE1tcmovTktKSW1DbFJRZXovSzM5ZlhPU0p4TnhXSEJjCm5aRkdQZGJNTVdhYmR0NHZoWUE0T3BZZnhFVUsrSU1LYlNJVzJyMENnWUFYdlI4cTFJTG5YZmR5aWtsakhOekgKQ2VXbURhVGdTWG9BOGtuYnFibVEvSWVHclp3cXJZV2Q4TDZjYWpsUFZXejBjNUZpSm9kdEVBNTBKYkM1TUhyaQo2NmR2L2ZZejRkaVVXcTVsTmhjMVlmcnBSalFGb1pBREFWR1FYTysrcUUxeUgvUlh3MDBZMXg1K0VIZzBRTUtJCitMaVJGREo5WVcydEp5OEhkWHRDc1FLQmdRQ0xoS3dYNGJjb0o0VWgzOUJUa0o4V0VlMnAyWDBnRkxQT1ZvelQKRnJNNXRUL2RVWXV6T01tb3k0SnZ5YjBMNjc0VU9VUStUNEUwOUkreDc3Z05xZjRSTzVVdHF1RHN0VFRPVkRCQgpxR0VXQVNnME5sRlo2a2F1aDRrSVhYUVJCWTV1citPUVZETHhYK3EwaDAxWmJaY015SjRIUEl4YnVKbXlZOXdxCndTdFU0UUtCZ1FDdHdDakJ0RzQ1VzB1MmpxZng2bVNwcm1qVFpsT3BvT2psMW9ZZThMV0JqSGh6czE2NE1yR0kKVDQ5YVJ0QWpkTUZub1prbHRScFdYL2xncktjdThHSWtKbU4wUmxkTE85cTRXdXY0ZjRRRTg1WWVna3lUYWV6ZQpPVEVOUVRkNElYSmM2MVFpNWNQNDdhcnFLbytiUXpKbUpIWUp2ZUxlNmtBdTd2TkxVMnpLa3c9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
+    token: "kubeconfig-user-cvpsj.c-chchj:rnf84zmf6rjv2jxz76t27lqtlsh9pcx9w6nngwf22xxz8xhlc5bxms"
+
+
+contexts:
+- name: "onf-dev-pod"
+  context:
+    user: "onf-dev-pod"
+    cluster: "onf-dev-pod"
+
+current-context: "onf-dev-pod"