Merge "Revert "Temp remove Zyxel ONU from XGS-PON Zyxel DT pipeline""
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 320fa1a..7155679 100644
--- a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-TT.yaml
@@ -23,15 +23,15 @@
nodes:
-
- ip: '10.34.90.44'
+ ip: 'node-4.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.45'
+ ip: 'node-5.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.46'
+ ip: 'node-6.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
@@ -48,8 +48,8 @@
olts:
# XGSPON OLT
-
- ip: 10.34.90.53
- sship: 10.34.90.53
+ ip: zyxel-olt.berlin-lab.lfbroadband.org
+ sship: zyxel-olt.berlin-lab.lfbroadband.org
fortygig: False
aggPort: 6
user: root
@@ -61,74 +61,74 @@
hosts:
src:
-
- ip: '10.34.90.46'
- user: 'community'
- pass: 'admin'
- dp_iface_name: 'eth1.35'
+ ip: node-6.berlin-lab.lfbroadband.org
+ user: community
+ pass: admin
+ dp_iface_name: eth1.35
container_type: LXC
- container_name: ZYXE8CAC752C
- onu: 'ZYWN8cac752c'
- olt: 'S210Z14009247'
- c_tag: '801'
- s_tag: '211'
- power_switch_port: 4
- onu_type: 'zyxel'
- service_type: 'hsia'
- uni_id: '1'
+ container_name: ZYXE8CABE30B
+ onu: ZYXE8cabe30b
+ olt: S210Z14009247
+ c_tag: 801
+ s_tag: 111
+ power_switch_port: 5
+ onu_type: zyxel
+ service_type: hsia
+ uni_id: 1
-
- ip: '10.34.90.46'
- user: 'community'
- pass: 'admin'
- dp_iface_name: 'eth1.65'
+ ip: node-6.berlin-lab.lfbroadband.org
+ user: community
+ pass: admin
+ dp_iface_name: eth1.65
container_type: LXC
- container_name: ZYXE8CAC752C
- onu: 'ZYWN8cac752c'
- olt: 'S210Z14009247'
- c_tag: '444'
- s_tag: '433'
- power_switch_port: 4
- onu_type: 'zyxel'
- service_type: 'voip'
- uni_id: '1'
+ container_name: ZYXE8CABE30B
+ onu: ZYXE8cabe30b
+ olt: S210Z14009247
+ c_tag: 444
+ s_tag: 333
+ power_switch_port: 5
+ onu_type: zyxel
+ service_type: voip
+ uni_id: 1
-
- ip: '10.34.90.46'
- user: 'community'
- pass: 'admin'
- dp_iface_name: 'eth1.55'
+ ip: node-6.berlin-lab.lfbroadband.org
+ user: community
+ pass: admin
+ dp_iface_name: eth1.55
container_type: LXC
- container_name: ZYXE8CAC752C
- onu: 'ZYWN8cac752c'
- olt: 'S210Z14009247'
- c_tag: '55'
- s_tag: '655'
- power_switch_port: 4
- onu_type: 'zyxel'
- service_type: 'vod'
- uni_id: '1'
+ container_name: ZYXE8CABE30B
+ onu: ZYXE8cabe30b
+ olt: S210Z14009247
+ c_tag: 55
+ s_tag: 555
+ power_switch_port: 5
+ onu_type: zyxel
+ service_type: vod
+ uni_id: 1
-
- ip: '10.34.90.46'
- user: 'community'
- pass: 'admin'
- dp_iface_name: 'eth1.55'
+ ip: node-6.berlin-lab.lfbroadband.org
+ user: community
+ pass: admin
+ dp_iface_name: eth1.55
container_type: LXC
- container_name: ZYXE8CAC752C
- onu: 'ZYWN8cac752c'
- olt: 'S210Z14009247'
- c_tag: '55'
- s_tag: '650'
- power_switch_port: 4
- onu_type: 'zyxel'
- mcast_rg: '10.12.6.3/24'
+ container_name: ZYXE8CABE30B
+ onu: ZYXE8cabe30b
+ olt: S210Z14009247
+ c_tag: 55
+ s_tag: 550
+ power_switch_port: 5
+ onu_type: zyxel'
+ mcast_rg: '10.11.6.3/24'
mcast_grp_subnet_mask: '224.0.0.0/4'
- service_type: 'mcast'
- uni_id: '1'
+ service_type: mcast
+ uni_id: 1
dst:
-
ip: null
user: null
pass: null
- dp_iface_name: ens1f0
- dp_iface_ip_qinq: '10.12.1.254'
+ dp_iface_name: enp7s0
+ dp_iface_ip_qinq: 10.11.1.254
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
@@ -137,8 +137,8 @@
ip: null
user: null
pass: null
- dp_iface_name: ens1f0
- dp_iface_ip_qinq: '10.12.4.254'
+ dp_iface_name: enp7s0
+ dp_iface_ip_qinq: 10.11.4.254
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
@@ -147,11 +147,11 @@
ip: null
user: null
pass: null
- noroot_ip: '10.34.90.43'
+ noroot_ip: bng.berlin-lab.lfbroadband.org
noroot_user: community
noroot_pass: admin
- dp_iface_name: ens1f0
- dp_iface_ip_qinq: '10.12.5.254'
+ dp_iface_name: enp7s0
+ dp_iface_ip_qinq: 10.11.5.254
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
@@ -160,18 +160,18 @@
ip: null
user: null
pass: null
- bng_ip: '10.34.90.43'
+ bng_ip: bng.berlin-lab.lfbroadband.org
bng_user: community
bng_pass: admin
- dp_iface_name: ens1f0
- dp_iface_ip_qinq: '225.22.0.2'
+ dp_iface_name: enp7s0
+ dp_iface_ip_qinq: 225.22.0.2
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
container_name: null
web_power_switch:
- ip: '10.34.90.61'
+ ip: 'pdu01.berlin-lab.lfbroadband.org'
user: 'admin'
password: 'secret'
type: 'EPC'
\ No newline at end of file
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
index 1e79611..36af568 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
@@ -72,3 +72,13 @@
persistence:
enabled: false
+# Overwrite service endpoints for kafka and etcd to match the ones deployed in
+# voltha-infra
+services:
+ kafka:
+ cluster:
+ address: voltha-infra-kafka.infra.svc:9092
+
+ # Define connectivity to etcd
+ etcd:
+ address: voltha-infra-etcd.infra.svc:2379