Update ONUs for Berlin tests

* Move ONU SCOMA030600F (Glasfaser Modem 2) to the Radisys OLT and
  update power port.
* Update power ports for ALPHA ONUs.
* Fix references to wrong PDUs in some cases.

Signed-off-by: Cristina de Francisco <cristina.defrancisco@bisdn.de>
Change-Id: Idf45f2f7be9ae1fcf0c460e0e077f0feaae1d325
diff --git a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
index 200a740..4179b09 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
@@ -71,7 +71,7 @@
       olt: S210Z14009247
       c_tag: 801
       s_tag: 111
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: hsia
       uni_id: 1
@@ -86,7 +86,7 @@
       olt: S210Z14009247
       c_tag: 444
       s_tag: 333
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: voip
       uni_id: 1
@@ -101,7 +101,7 @@
       olt: S210Z14009247
       c_tag: 55
       s_tag: 555
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       service_type: vod
       uni_id: 1
@@ -116,7 +116,7 @@
       olt: S210Z14009247
       c_tag: 55
       s_tag: 550
-      power_switch_port: 7
+      power_switch_port: 6
       onu_type: alpha
       mcast_rg: '10.11.6.3/24'
       mcast_grp_subnet_mask: '224.0.0.0/4'