Merge "[VOL-4314] Testing multi-uni TC1 - TC3 - TC4 - TC5 - TC8 - TC10"
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
index f57b83b..6b3d8e5 100644
--- a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
@@ -98,21 +98,7 @@
         olt: LBADTN2038AD991
         c_tag: 7
         s_tag: 37
-        power_switch_port: 3
-        uni_id: 1
-
-      -
-        ip: 10.34.90.40
-        user: community
-        pass: admin
-        dp_iface_name: eth1.7
-        container_type: LXC
-        container_name: ADTN20177888
-        onu: ADTN20177888
-        olt: LBADTN2038AD991
-        c_tag: 7
-        s_tag: 38
-        power_switch_port: 8
+        power_switch_port: 4
         uni_id: 1
 
     dst:
@@ -155,19 +141,6 @@
         dp_iface_gateway: null
         container_type: null
         container_name: null
-      -
-        dp_iface_ip_qinq: 10.38.7.254
-        ip: null
-        user: null
-        pass: null
-        noroot_ip: 10.34.90.43
-        noroot_user: community
-        noroot_pass: admin
-        dp_iface_name: ens3f0
-        dp_iface_ip: null
-        dp_iface_gateway: null
-        container_type: null
-        container_name: null
 
   web_power_switch:
     ip: '10.34.90.49'
diff --git a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
index 39dff1c..4125cd8 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600g-DT.yaml
@@ -68,7 +68,7 @@
         olt: 722033738988
         c_tag: 222
         s_tag: 22
-        power_switch_port: 4
+        power_switch_port: 6
         uni_id: 1
       -
         ip: 10.90.0.240
@@ -81,7 +81,20 @@
         olt: 722033738988
         c_tag: 333
         s_tag: 33
-        power_switch_port: 8
+        power_switch_port: 5
+        uni_id: 1
+      -
+        ip: 10.90.0.223
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.444
+        container_type: LXC
+        container_name: SCOMa0301e8d
+        onu: SCOMa0301e8d
+        olt: 722033738988
+        c_tag: 444
+        s_tag: 44
+        power_switch_port: 3
         uni_id: 1
 
     dst:
@@ -113,9 +126,22 @@
         dp_iface_gateway: null
         container_type: null
         container_name: null
+      -
+        dp_iface_ip_qinq: 10.44.44.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
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.90.0.251'
     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 ea03039..126ce37 100644
--- a/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
+++ b/deployment-configs/menlo-certification-pod-radisys-1600x-DT.yaml
@@ -69,7 +69,33 @@
         olt: 722033038194
         c_tag: 88
         s_tag: 89
-        power_switch_port: 7
+        power_switch_port: 4
+        uni_id: 1
+      -
+        ip: 10.90.0.223
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.89
+        container_type: LXC
+        container_name: SCOMa030230f
+        onu: SCOMa030230f
+        olt: 722033038194
+        c_tag: 89
+        s_tag: 90
+        power_switch_port: 2
+        uni_id: 1
+      -
+        ip: 10.90.0.223
+        user: cord
+        pass: cord
+        dp_iface_name: eth1.90
+        container_type: LXC
+        container_name: SCOMa030216a
+        onu: SCOMa030216a
+        olt: 722033038194
+        c_tag: 90
+        s_tag: 91
+        power_switch_port: 1
         uni_id: 1
 
     dst:
@@ -87,9 +113,35 @@
         dp_iface_gateway: null
         container_type: null
         container_name: null
+      -
+        dp_iface_ip_qinq: 10.90.89.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.91.90.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
 
   web_power_switch:
-    ip: '10.90.0.250'
+    ip: '10.90.0.251'
     user: 'cord'
     password: 'cord'
     type: 'DLI'
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml b/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
index 4e84a14..5bb33ca 100644
--- a/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
+++ b/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
@@ -26,7 +26,7 @@
   adapter_adtran_olt:
     registry: "10.34.90.43:443/"
     repository: "voltha-adtran-adapter"
-    tag: "1.7.0"
+    tag: "1.8.0"
 #  onos:
 #    repository: "andreacampanella/voltha-onos"
 #    tag: "app-update-sadis"