Merge "Add alpha XGS-PON ONUSs to xgspon-zyxel-DT configuration"
diff --git a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
index fc3e853..9ae135e 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
@@ -25,15 +25,15 @@
# This tells the control node how to reach the Kubernetes nodes.
nodes:
-
- ip: '10.34.90.43'
+ ip: 'node-3.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.41'
+ ip: 'node-1.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.42'
+ ip: 'node-2.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
@@ -50,31 +50,31 @@
olts:
# Gpon OLT
-
- ip: 10.34.90.50
- sship: 10.34.90.50
+ ip: radisys-olt.berlin-lab.lfbroadband.org
+ sship: radisys-olt.berlin-lab.lfbroadband.org
user: root
pass: onl
fortygig: False
- aggPort: 2
- serial: EC1912001823
- oltDebVersion: openolt_asgvolt64-3.7.4-3b190f027136e845c5850a5b1a97897ce2b74ebf-100G-NNI.deb
+ aggPort: 1
+ serial: 722033038194
+ oltDebVersion: openolt_rlt-1600x-w-3.10.1-05bf9d424f4fae480cb0fe2c13ffbde5b6be27ee.deb
board_technology: GPON
hosts:
src:
#GPON ONU
-
- ip: 10.34.90.43
+ ip: node-3.berlin-lab.lfbroadband.org
user: community
pass: admin
dp_iface_name: eth1.7
container_type: LXC
- container_name: SCOM00001c82
+ container_name: SCOM00001C82
onu: SCOM00001c82
- olt: EC1912001823
+ olt: 722033038194
c_tag: 7
s_tag: 31
- power_switch_port: 1
+ power_switch_port: 4
uni_id: 1
dst:
-
@@ -82,17 +82,17 @@
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_name: enp7s0
dp_iface_ip: null
dp_iface_gateway: null
container_type: null
container_name: null
web_power_switch:
- ip: '10.34.90.48'
+ ip: 'pdu02.berlin-lab.lfbroadband.org'
user: 'admin'
password: 'secret'
type: 'EPC'
diff --git a/deployment-configs/berlin-community-pod-1-gpon-TT.yaml b/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
index 5d0535f..0d163ae 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-TT.yaml
@@ -25,15 +25,15 @@
# This tells the control node how to reach the Kubernetes nodes.
nodes:
-
- ip: '10.34.90.43'
+ ip: 'node-3.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.41'
+ ip: 'node-1.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
-
- ip: '10.34.90.42'
+ ip: 'node-2.berlin-lab.lfbroadband.org'
user: 'community'
pass: 'admin'
@@ -50,30 +50,30 @@
olts:
# Gpon OLT
-
- ip: 10.34.90.50
- sship: 10.34.90.50
+ ip: radisys-olt.berlin-lab.lfbroadband.org
+ sship: radisys-olt.berlin-lab.lfbroadband.org
user: root
pass: onl
fortygig: False
- aggPort: 2
- serial: EC1912001823
- oltDebVersion: openolt_asgvolt64-3.7.4-3b190f027136e845c5850a5b1a97897ce2b74ebf-100G-NNI.deb
+ aggPort: 1
+ serial: 722033038194
+ oltDebVersion: openolt_rlt-1600x-w-3.10.1-05bf9d424f4fae480cb0fe2c13ffbde5b6be27ee.deb
board_technology: GPON
hosts:
src:
-
- ip: 10.34.90.43
+ ip: node-3.berlin-lab.lfbroadband.org
user: community
pass: admin
dp_iface_name: eth1.35
container_type: LXC
- container_name: SCOM00001c82
+ container_name: SCOM00001C82
onu: SCOM00001c82
- olt: EC1912001823
+ olt: 722033038194
c_tag: 801
s_tag: 111
- power_switch_port: 1
+ power_switch_port: 4
onu_type: 'scom'
service_type: 'hsia'
uni_id: 1
@@ -93,17 +93,17 @@
# service_type: 'hsia'
# uni_id: 1
-
- ip: 10.34.90.43
+ ip: node-3.berlin-lab.lfbroadband.org
user: community
pass: admin
dp_iface_name: eth1.65
container_type: LXC
- container_name: SCOM00001c82
+ container_name: SCOM00001C82
onu: SCOM00001c82
- olt: EC1912001823
+ olt: 722033038194
c_tag: 444
s_tag: 333
- power_switch_port: 1
+ power_switch_port: 4
onu_type: 'scom'
service_type: 'voip'
uni_id: 1
@@ -123,17 +123,17 @@
# service_type: 'voip'
# uni_id: 1
-
- ip: 10.34.90.43
+ ip: node-3.berlin-lab.lfbroadband.org
user: community
pass: admin
dp_iface_name: eth1.55
container_type: LXC
- container_name: SCOM00001c82
+ container_name: SCOM00001C82
onu: SCOM00001c82
- olt: EC1912001823
+ olt: 722033038194
c_tag: 55
s_tag: 555
- power_switch_port: 1
+ power_switch_port: 4
onu_type: 'scom'
service_type: 'vod'
uni_id: 1
@@ -153,29 +153,29 @@
# service_type: 'vod'
# uni_id: 1
-
- ip: '10.34.90.43'
- user: 'community'
- pass: 'admin'
- dp_iface_name: 'eth1.55'
+ ip: node-3.berlin-lab.lfbroadband.org
+ user: community
+ pass: admin
+ dp_iface_name: eth1.55
container_type: LXC
- container_name: SCOM00001c82
- onu: 'SCOM00001c82'
- olt: 'EC1912001823'
- c_tag: '55'
- s_tag: '550'
- power_switch_port: 1
+ container_name: SCOM00001C82
+ onu: SCOM00001c82
+ olt: 722033038194
+ c_tag: 55
+ s_tag: 550
+ power_switch_port: 4
onu_type: 'scom'
mcast_rg: '10.11.6.3/24'
mcast_grp_subnet_mask: '224.0.0.0/4'
service_type: 'mcast'
- uni_id: '1'
+ uni_id: 1
dst:
-
#HSI
ip: null
user: null
pass: null
- dp_iface_name: ens1f0
+ dp_iface_name: enp7s0
dp_iface_ip_qinq: '10.11.1.254'
dp_iface_ip: null
dp_iface_gateway: null
@@ -197,10 +197,10 @@
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_name: enp7s0
dp_iface_ip_qinq: '10.11.4.254'
dp_iface_ip: null
dp_iface_gateway: null
@@ -225,10 +225,10 @@
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_name: enp7s0
dp_iface_ip_qinq: '10.11.5.254'
dp_iface_ip: null
dp_iface_gateway: null
@@ -253,7 +253,7 @@
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: null
@@ -264,7 +264,7 @@
container_name: null
web_power_switch:
- ip: '10.34.90.48'
+ ip: 'pdu02.berlin-lab.lfbroadband.org'
user: 'admin'
password: 'secret'
type: 'EPC'
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 5bb33ca..1e79611 100644
--- a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-adtran.yml
@@ -24,9 +24,9 @@
images:
adapter_adtran_olt:
- registry: "10.34.90.43:443/"
+ registry: "registry.berlin-lab.lfbroadband.org/"
repository: "voltha-adtran-adapter"
- tag: "1.8.0"
+ tag: "2.11.2"
# onos:
# repository: "andreacampanella/voltha-onos"
# tag: "app-update-sadis"