Merge "Fixing web-power-switch address on demo-pod configs"
diff --git a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
index 307f4c2..3149537 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-DT.yaml
@@ -37,14 +37,15 @@
user: 'community'
pass: 'admin'
- fabric_switches:
- -
- mac: '8c:ea:1b:a7:29:72'
- ip: 10.34.90.55
- user: root
- pass: onl
- bngPort: 157
- device_id: 'of:0000000000000001'
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
olts:
# Gpon OLT
diff --git a/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
index 16b42fc..7503559 100644
--- a/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-gpon-adtran-DT.yaml
@@ -37,14 +37,15 @@
user: 'community'
pass: 'admin'
- fabric_switches:
- -
- mac: '8c:ea:1b:a7:29:72'
- ip: 10.34.90.55
- user: root
- pass: onl
- bngPort: 157
- device_id: 'of:0000000000000001'
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
olts:
# Gpon OLT
@@ -56,6 +57,7 @@
serial: LBADTN2038AD991
type: adtranolt
user: hsvroot
+ pass: BOSCO
board_technology: GPON
hosts:
diff --git a/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml b/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml
new file mode 100644
index 0000000..417f53d
--- /dev/null
+++ b/deployment-configs/berlin-community-pod-1-gpon-fttb-DT.yaml
@@ -0,0 +1,105 @@
+---
+
+ # Copyright 2020-present Open Networking Foundation
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # Automated deployment configuration for Tucson pod
+
+ # Change default values in tests
+ ONOS_REST_PORT: 30120
+ ONOS_SSH_PORT: 30115
+ OLT_PORT: 9191
+ KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+ nodes:
+ -
+ ip: '10.34.90.43'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.41'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.42'
+ user: 'community'
+ pass: 'admin'
+
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
+
+ olts:
+ # Gpon OLT
+ -
+ ip: 10.34.90.50
+ sship: 10.34.90.50
+ user: root
+ pass: onl
+ fortygig: False
+ aggPort: 2
+ serial: EC1912001823
+ oltDebVersion: openolt_asgvolt64-3.7.2-c1ad0bc2b63253e74f23d394765cd93bc17a59a2-with-debug.deb
+ board_technology: GPON
+
+ hosts:
+ src:
+ #GPON ONU
+ -
+ #ip: 10.34.90.45
+ #user: community
+ #pass: admin
+ #dp_iface_name: eth1
+ #container_type: LXC
+ #container_name: DPURG4152434120360A24
+ onu: ADTN21133f28
+ olt: EC1912001823
+ power_switch_port: 8
+ service:
+ -
+ name: DPU_MGMT_TRAFFIC
+ c_tag: '4090'
+ s_tag: '60'
+ -
+ name: FTTB_SUBSCRIBER_TRAFFIC
+ c_tag: '101'
+ s_tag: '3101'
+ uni_id: 1
+ dst:
+ -
+ dp_iface_ip_qinq: 10.31.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.61'
+ user: 'admin'
+ password: 'secret'
+ type: 'EPC'
diff --git a/deployment-configs/berlin-community-pod-1-kubespray.yaml b/deployment-configs/berlin-community-pod-1-kubespray.yaml
index 64f9c39..3bb0324 100644
--- a/deployment-configs/berlin-community-pod-1-kubespray.yaml
+++ b/deployment-configs/berlin-community-pod-1-kubespray.yaml
@@ -41,18 +41,18 @@
user: 'community'
pass: 'admin'
-fabric_switches:
- -
- mac: '??'
- ip: 10.34.90.55
- user: root
- pass: onl
- bngPort: 32
- #XGSPON
- oltPort: 1
- #GPON
- #oltPort: 2
- device_id: 'of:0000000000000001'
+fabric_switches: []
+# -
+# mac: '??'
+# ip: 10.34.90.55
+# user: root
+# pass: onl
+# bngPort: 32
+# #XGSPON
+# oltPort: 1
+# #GPON
+# #oltPort: 2
+# device_id: 'of:0000000000000001'
olts:
# XGS-PON OLT
@@ -74,12 +74,12 @@
src:
#XGSPON ONU
-
- ip: 127.0.0.1
+ ip: 10.34.90.43
user: community
pass: admin
dp_iface_name: eno3
- container_type: null
- container_name: null
+ container_type: lxc
+ container_name: ALPHe3a69d03
onu: ALPHe3d1cf5c
c_tag: 11
s_tag: 11
diff --git a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
index 3a51849..047028a 100644
--- a/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
+++ b/deployment-configs/berlin-community-pod-1-multi-olt-DT.yaml
@@ -37,14 +37,15 @@
user: 'community'
pass: 'admin'
- fabric_switches:
- -
- mac: '8c:ea:1b:a7:29:72'
- ip: 10.34.90.55
- user: root
- pass: onl
- bngPort: 157
- device_id: 'of:0000000000000001'
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
olts:
# Gpon OLT
@@ -90,7 +91,7 @@
#XGSPON ONU
-
- ip: 127.0.0.1
+ ip: 10.34.90.43
user: community
pass: admin
dp_iface_name: eth1.7
@@ -103,7 +104,7 @@
power_switch_port: 6
uni_id: 1
-
- ip: 127.0.0.1
+ ip: 10.34.90.43
user: community
pass: admin
dp_iface_name: eth1.7
diff --git a/deployment-configs/berlin-community-pod-1.yaml b/deployment-configs/berlin-community-pod-1.yaml
index acf137a..defb198 100644
--- a/deployment-configs/berlin-community-pod-1.yaml
+++ b/deployment-configs/berlin-community-pod-1.yaml
@@ -37,14 +37,15 @@
user: 'community'
pass: 'admin'
-fabric_switches:
- -
- mac: '8c:ea:1b:a7:29:72'
- ip: 10.34.90.55
- user: root
- pass: onl
- bngPort: 157
- device_id: 'of:0000000000000001'
+fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ #-
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
olts:
# XGS-PON OLT
@@ -64,12 +65,12 @@
src:
#XGSPON ONU
-
- ip: 127.0.0.1
+ ip: 10.34.90.43
user: community
pass: admin
dp_iface_name: eth1
container_type: LXC
- container_name: voltha-client
+ container_name: ALPHe3d1cf5c
onu: ALPHe3d1cf5c
olt: EC1729003539
c_tag: 11
@@ -77,12 +78,12 @@
power_switch_port: 6
uni_id: 1
-
- ip: 127.0.0.1
+ ip: 10.34.90.43
user: community
pass: admin
dp_iface_name: eth1
container_type: LXC
- container_name: voltha-client-dt
+ container_name: ALPHe3a69d03
onu: ALPHe3a69d03
olt: EC1729003539
c_tag: 7
diff --git a/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
new file mode 100644
index 0000000..18e7df4
--- /dev/null
+++ b/deployment-configs/berlin-community-pod-2-gpon-zyxel-DT.yaml
@@ -0,0 +1,125 @@
+---
+
+ # Copyright 2020-present Open Networking Foundation
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # Automated deployment configuration for Tucson pod
+
+ # Change default values in tests
+ ONOS_REST_PORT: 30120
+ ONOS_SSH_PORT: 30115
+ OLT_PORT: 9191
+ KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+ nodes:
+ -
+ ip: '10.34.90.44'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.45'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.46'
+ user: 'community'
+ pass: 'admin'
+
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
+
+ olts:
+ # Gpon OLT
+ -
+ ip: 10.34.90.53
+ sship: 10.34.90.53
+ fortygig: False
+ aggPort: 6
+ user: root
+ pass: onl
+ serial: S210Z14009247
+ oltDebVersion: openolt_sda3016ss-3.7.2-dev-gpon.deb
+ board_technology: GPON
+
+ hosts:
+ src:
+ #GPON ONU
+ -
+ ip: 10.34.90.45
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: SCOM00001C90
+ onu: SCOM00001c90
+ olt: S210Z14009247
+ c_tag: 7
+ s_tag: 42
+ power_switch_port: 6
+ uni_id: 1
+ -
+ ip: 10.34.90.45
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: SCOMA030600F
+ onu: SCOMa030600f
+ olt: S210Z14009247
+ c_tag: 7
+ s_tag: 43
+ power_switch_port: 7
+ uni_id: 1
+
+ dst:
+ -
+ dp_iface_ip_qinq: 10.42.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
+ -
+ dp_iface_ip_qinq: 10.43.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.61'
+ user: 'admin'
+ password: 'secret'
+ type: 'EPC'
diff --git a/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
new file mode 100644
index 0000000..65fba58
--- /dev/null
+++ b/deployment-configs/berlin-community-pod-2-xgspon-zyxel-DT.yaml
@@ -0,0 +1,99 @@
+---
+
+ # Copyright 2020-present Open Networking Foundation
+ #
+ # Licensed under the Apache License, Version 2.0 (the "License");
+ # you may not use this file except in compliance with the License.
+ # You may obtain a copy of the License at
+ #
+ # http://www.apache.org/licenses/LICENSE-2.0
+ #
+ # Unless required by applicable law or agreed to in writing, software
+ # distributed under the License is distributed on an "AS IS" BASIS,
+ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+
+ # Automated deployment configuration for Tucson pod
+
+ # Change default values in tests
+ ONOS_REST_PORT: 30120
+ ONOS_SSH_PORT: 30115
+ OLT_PORT: 9191
+ KUBERNETES_CONF: $HOME/.kube/kind-config-voltha-minimal
+
+# This tells the control node how to reach the Kubernetes nodes.
+ nodes:
+ -
+ ip: '10.34.90.44'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.45'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.46'
+ user: 'community'
+ pass: 'admin'
+
+ fabric_switches: []
+ # The switch is shared across 2 PODs, thus is externally controlled
+ # -
+ # mac: '8c:ea:1b:a7:29:72'
+ # ip: 10.34.90.55
+ # user: root
+ # pass: onl
+ # bngPort: 157
+ # device_id: 'of:0000000000000001'
+
+ olts:
+ # XGSPON OLT
+ -
+ ip: 10.34.90.53
+ sship: 10.34.90.53
+ fortygig: False
+ aggPort: 6
+ user: root
+ pass: onl
+ serial: S210Z14009247
+ oltDebVersion: openolt_sda3016ss-3.7.2-dev-xgspon-20220520.deb
+ board_technology: XGSPON
+
+ hosts:
+ src:
+ #xgspon ONU
+ -
+ ip: 10.34.90.46
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: ZYXE8CAC752C
+ onu: ZYWN8cac752c
+ olt: S210Z14009247
+ c_tag: 7
+ s_tag: 41
+ power_switch_port: 4
+ uni_id: 1
+
+ dst:
+ -
+ dp_iface_ip_qinq: 10.41.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.61'
+ user: 'admin'
+ password: 'secret'
+ type: 'EPC'
diff --git a/kubernetes-configs/berlin-community-pod-1-gpon-fttb.conf b/kubernetes-configs/berlin-community-pod-1-gpon-fttb.conf
new file mode 100755
index 0000000..c1a8a7a
--- /dev/null
+++ b/kubernetes-configs/berlin-community-pod-1-gpon-fttb.conf
@@ -0,0 +1,98 @@
+apiVersion: v1
+kind: Config
+clusters:
+- name: "berlin-community-pod-1"
+ cluster:
+ server: "https://rancher.opencord.org/k8s/clusters/c-ntcbj"
+- name: "berlin-community-pod-1-node-3"
+ cluster:
+ server: "https://10.34.90.43:6443"
+ certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+ WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+ FdOaE1CNFhEVEl5TURNeU9URTNNelExTkZvWERUTXlNRE15TmpFM016UTFORm93RWpFUU1BNEdBM\
+ VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+ 0VCQUxPZ09NN2xKWVdjCnhoVkpFNWtJVXZOR1RoMmtIVnkxcFhDMGhTL0c3Q3A0SzI3MldoV3N2T\
+ DZUQzZCSUZZZ2FRSTZPNTNIdFQ4aTcKUUJjTDNJdG5DVzBKZy9wSzFaUm1WeWRaM0ZHMnBCRE1FN\
+ URuRzQrT25NaWN0Q2RTQjkyeFFydklzZ2hXczBRcgp3RmRMRE8zZk5pU1dWRFJnaTZwS1JWVDVVT\
+ 1pzWDFVNDF1a0lKM25HQ2J6Rlk2T2did0g1NFV5bDh5VWtNMm5GCnJRUEFjTXhZZ010YkdkZlBuN\
+ EU3cVB1QkZRWkJFdTd1TmZvUWJVY21UUnkxaXN6UE5seTBzYlBKQlVYY0xQcSsKazlkSjF2UzFhc\
+ lJQYUQ2ckE0dHp0ZFdRNms4KzU0RVVFb25WV1pmZXJwSTdNODhTZk82YjRqMFozems0Q3VnRApvd\
+ kFacEVyUFNvTUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+ UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRGE2OW9JQjJXSTZMMythRHFjbjA3M\
+ FZJZFdlb1hlK3NmalYKeS9wTE5TRVdYS21oUDFtTHB0czJOaWIwUE5UTjVna1dGVlE0Tkk3YTA4Q\
+ XZFdUlFUXVPWVFPSndJK0xCZUFwbgptbVg1SkVUR3A0NGJBTlUybStVWktyblFjNnR4UTh6WC85M\
+ VcyMnhyZ2JkZ3ZrcGR1UmczZ1hiMGRyS1RXVkdlCkZmMFE2KzRaOUd6QlNOMTd4WFk3NVEzQkNWU\
+ WNIVWNDR0NuOHJvUFRoL0lEcjF6STJPNXdhM0Qvc1NVTEN2dGIKRkZDYUE2dmF4RzIyQkJKOTd5Z\
+ 0JMa1BadGtnbG1vRVYvalZ5SGI2cVU5QlExWUx3ZTFxNW5PanJXaFRBbVJjUApUUmpMM1FkYWMwM\
+ lhxVEVOalFvWU0zUVdUUVZPKzg2MnNQYlhkUWtjb0drTjNkV2J4U009Ci0tLS0tRU5EIENFUlRJR\
+ klDQVRFLS0tLS0K"
+- name: "berlin-community-pod-1-node-2"
+ cluster:
+ server: "https://10.34.90.42:6443"
+ certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+ WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+ FdOaE1CNFhEVEl5TURNeU9URTNNelExTkZvWERUTXlNRE15TmpFM016UTFORm93RWpFUU1BNEdBM\
+ VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+ 0VCQUxPZ09NN2xKWVdjCnhoVkpFNWtJVXZOR1RoMmtIVnkxcFhDMGhTL0c3Q3A0SzI3MldoV3N2T\
+ DZUQzZCSUZZZ2FRSTZPNTNIdFQ4aTcKUUJjTDNJdG5DVzBKZy9wSzFaUm1WeWRaM0ZHMnBCRE1FN\
+ URuRzQrT25NaWN0Q2RTQjkyeFFydklzZ2hXczBRcgp3RmRMRE8zZk5pU1dWRFJnaTZwS1JWVDVVT\
+ 1pzWDFVNDF1a0lKM25HQ2J6Rlk2T2did0g1NFV5bDh5VWtNMm5GCnJRUEFjTXhZZ010YkdkZlBuN\
+ EU3cVB1QkZRWkJFdTd1TmZvUWJVY21UUnkxaXN6UE5seTBzYlBKQlVYY0xQcSsKazlkSjF2UzFhc\
+ lJQYUQ2ckE0dHp0ZFdRNms4KzU0RVVFb25WV1pmZXJwSTdNODhTZk82YjRqMFozems0Q3VnRApvd\
+ kFacEVyUFNvTUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+ UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRGE2OW9JQjJXSTZMMythRHFjbjA3M\
+ FZJZFdlb1hlK3NmalYKeS9wTE5TRVdYS21oUDFtTHB0czJOaWIwUE5UTjVna1dGVlE0Tkk3YTA4Q\
+ XZFdUlFUXVPWVFPSndJK0xCZUFwbgptbVg1SkVUR3A0NGJBTlUybStVWktyblFjNnR4UTh6WC85M\
+ VcyMnhyZ2JkZ3ZrcGR1UmczZ1hiMGRyS1RXVkdlCkZmMFE2KzRaOUd6QlNOMTd4WFk3NVEzQkNWU\
+ WNIVWNDR0NuOHJvUFRoL0lEcjF6STJPNXdhM0Qvc1NVTEN2dGIKRkZDYUE2dmF4RzIyQkJKOTd5Z\
+ 0JMa1BadGtnbG1vRVYvalZ5SGI2cVU5QlExWUx3ZTFxNW5PanJXaFRBbVJjUApUUmpMM1FkYWMwM\
+ lhxVEVOalFvWU0zUVdUUVZPKzg2MnNQYlhkUWtjb0drTjNkV2J4U009Ci0tLS0tRU5EIENFUlRJR\
+ klDQVRFLS0tLS0K"
+- name: "berlin-community-pod-1-node-1"
+ cluster:
+ server: "https://10.34.90.41:6443"
+ certificate-authority-data: "LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQ\
+ WFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKT\
+ FdOaE1CNFhEVEl5TURNeU9URTNNelExTkZvWERUTXlNRE15TmpFM016UTFORm93RWpFUU1BNEdBM\
+ VVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ\
+ 0VCQUxPZ09NN2xKWVdjCnhoVkpFNWtJVXZOR1RoMmtIVnkxcFhDMGhTL0c3Q3A0SzI3MldoV3N2T\
+ DZUQzZCSUZZZ2FRSTZPNTNIdFQ4aTcKUUJjTDNJdG5DVzBKZy9wSzFaUm1WeWRaM0ZHMnBCRE1FN\
+ URuRzQrT25NaWN0Q2RTQjkyeFFydklzZ2hXczBRcgp3RmRMRE8zZk5pU1dWRFJnaTZwS1JWVDVVT\
+ 1pzWDFVNDF1a0lKM25HQ2J6Rlk2T2did0g1NFV5bDh5VWtNMm5GCnJRUEFjTXhZZ010YkdkZlBuN\
+ EU3cVB1QkZRWkJFdTd1TmZvUWJVY21UUnkxaXN6UE5seTBzYlBKQlVYY0xQcSsKazlkSjF2UzFhc\
+ lJQYUQ2ckE0dHp0ZFdRNms4KzU0RVVFb25WV1pmZXJwSTdNODhTZk82YjRqMFozems0Q3VnRApvd\
+ kFacEVyUFNvTUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93U\
+ UZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBRGE2OW9JQjJXSTZMMythRHFjbjA3M\
+ FZJZFdlb1hlK3NmalYKeS9wTE5TRVdYS21oUDFtTHB0czJOaWIwUE5UTjVna1dGVlE0Tkk3YTA4Q\
+ XZFdUlFUXVPWVFPSndJK0xCZUFwbgptbVg1SkVUR3A0NGJBTlUybStVWktyblFjNnR4UTh6WC85M\
+ VcyMnhyZ2JkZ3ZrcGR1UmczZ1hiMGRyS1RXVkdlCkZmMFE2KzRaOUd6QlNOMTd4WFk3NVEzQkNWU\
+ WNIVWNDR0NuOHJvUFRoL0lEcjF6STJPNXdhM0Qvc1NVTEN2dGIKRkZDYUE2dmF4RzIyQkJKOTd5Z\
+ 0JMa1BadGtnbG1vRVYvalZ5SGI2cVU5QlExWUx3ZTFxNW5PanJXaFRBbVJjUApUUmpMM1FkYWMwM\
+ lhxVEVOalFvWU0zUVdUUVZPKzg2MnNQYlhkUWtjb0drTjNkV2J4U009Ci0tLS0tRU5EIENFUlRJR\
+ klDQVRFLS0tLS0K"
+
+users:
+- name: "berlin-community-pod-1"
+ user:
+ token: "kubeconfig-user-cvpsj.c-ntcbj:kmsvcmwbdw6m9prljs9cv9cchrc5f8qmc6ddtjkvchf4cmbl84sgmj"
+
+
+contexts:
+- name: "berlin-community-pod-1"
+ context:
+ user: "berlin-community-pod-1"
+ cluster: "berlin-community-pod-1"
+- name: "berlin-community-pod-1-node-3"
+ context:
+ user: "berlin-community-pod-1"
+ cluster: "berlin-community-pod-1-node-3"
+- name: "berlin-community-pod-1-node-2"
+ context:
+ user: "berlin-community-pod-1"
+ cluster: "berlin-community-pod-1-node-2"
+- name: "berlin-community-pod-1-node-1"
+ context:
+ user: "berlin-community-pod-1"
+ cluster: "berlin-community-pod-1-node-1"
+
+current-context: "berlin-community-pod-1"
diff --git a/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf b/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf
new file mode 100755
index 0000000..80ee24b
--- /dev/null
+++ b/kubernetes-configs/berlin-community-pod-2-gpon-zyxel.conf
@@ -0,0 +1,18 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQWFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURNeU9URTNOVGcwTWxvWERUTXlNRE15TmpFM05UZzBNbG93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQVBGNDNzMUw4R1M0CnhibFh0WFREVGRHOXFLY3hLaHRHdjYvRDk2QS9SOVdoM2V0cU8rS242ZFpoN0EwQ2Uzamp1QnVxeGxBd252b3AKQUNUcUs2V3ZuQ3lDRWd1eWQwajhUYmRoQ3ZrZ3hBekRFT1VFSHVMQUo4S1UxZUkwNm04NXFHdzRBbjlkRjNBRApyV1A5NGJPVklTbEFqYjdJcHRVZmt1WDQvQTcyeTBrTFVaR3ZxYzgxWjNMalAvbFhSMDcwRmV5MVpMQm1RWFpyCnFsQWdFS2RzVktrV2V4L0VHTllma1ozVjhLSmlFN1dQOVg5QU5CQVJKOVp4U01xMStuekcva0RlcHk4SHJiQWIKTTcyb0NESmJURDJuSWtvZ0tXQjNnbUMva0tyVThVdWJsVzVFTTFsR3IvdEdENHpkWnAvbW54YzUvL1VkSFhZaApBV1ZFQXJralI4TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQnBybVp3TldhaFUrSGVZRUNVS2k1eVRPdkc2bnpoODZVV3gKVzV3YlRxN2VrYjhrVkRncDE0elg0YW9ZWXBZOFJIbzE2V2d5RFJ2OXJsdzdrTEpnRmtJNXpiU1hFMDlrajhzTwp4SUxra0EybktRNVlXT1I1T3E2NVU5dXNhSkFpRGtQUkZsMlFhWGpyTUFMYnpQVUsxTTNIbWJ3VHM5bjh4RWoxCnd5MUc3Ui94NUdjdk1FcHNPZjhCcXlqMTJBWjIwbS8rUG9iYkpGM0NVOXYzem5HNUZienpNMWtvUGNXVkcvSUcKZHdia3cwRi9rdFNQOUN5UjE1a3FaM2JmbDJNcFJIdkFqYWg1VjhldWZPSXlrUC91KzJ3L0ZyU0NUd2JQckVuSAp3SDhmbVNkSWsrcGFmVjB1MENHZmtuYzRvcnppdzNkbGJBMWZ6NDVyRHo3ZXFIc0FPTm89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+ server: https://10.34.90.45:6443
+ name: berlin-community-pod-2
+contexts:
+- context:
+ cluster: berlin-community-pod-2
+ user: berlin-community-pod-2
+ name: berlin-community-pod-2
+current-context: berlin-community-pod-2
+kind: Config
+preferences: {}
+users:
+- name: berlin-community-pod-2
+ user:
+ token: kubeconfig-user-cvpsj.c-pvspc:2qt49qgjm26md74jlnckjv99kzz7prvqbfqbtrng4d2mnr5lhvrrxr
diff --git a/kubernetes-configs/berlin-community-pod-2-xgspon-zyxel.conf b/kubernetes-configs/berlin-community-pod-2-xgspon-zyxel.conf
new file mode 100755
index 0000000..80ee24b
--- /dev/null
+++ b/kubernetes-configs/berlin-community-pod-2-xgspon-zyxel.conf
@@ -0,0 +1,18 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN3akNDQWFxZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFTTVJBd0RnWURWUVFERXdkcmRXSmwKTFdOaE1CNFhEVEl5TURNeU9URTNOVGcwTWxvWERUTXlNRE15TmpFM05UZzBNbG93RWpFUU1BNEdBMVVFQXhNSAphM1ZpWlMxallUQ0NBU0l3RFFZSktvWklodmNOQVFFQkJRQURnZ0VQQURDQ0FRb0NnZ0VCQVBGNDNzMUw4R1M0CnhibFh0WFREVGRHOXFLY3hLaHRHdjYvRDk2QS9SOVdoM2V0cU8rS242ZFpoN0EwQ2Uzamp1QnVxeGxBd252b3AKQUNUcUs2V3ZuQ3lDRWd1eWQwajhUYmRoQ3ZrZ3hBekRFT1VFSHVMQUo4S1UxZUkwNm04NXFHdzRBbjlkRjNBRApyV1A5NGJPVklTbEFqYjdJcHRVZmt1WDQvQTcyeTBrTFVaR3ZxYzgxWjNMalAvbFhSMDcwRmV5MVpMQm1RWFpyCnFsQWdFS2RzVktrV2V4L0VHTllma1ozVjhLSmlFN1dQOVg5QU5CQVJKOVp4U01xMStuekcva0RlcHk4SHJiQWIKTTcyb0NESmJURDJuSWtvZ0tXQjNnbUMva0tyVThVdWJsVzVFTTFsR3IvdEdENHpkWnAvbW54YzUvL1VkSFhZaApBV1ZFQXJralI4TUNBd0VBQWFNak1DRXdEZ1lEVlIwUEFRSC9CQVFEQWdLa01BOEdBMVVkRXdFQi93UUZNQU1CCkFmOHdEUVlKS29aSWh2Y05BUUVMQlFBRGdnRUJBQnBybVp3TldhaFUrSGVZRUNVS2k1eVRPdkc2bnpoODZVV3gKVzV3YlRxN2VrYjhrVkRncDE0elg0YW9ZWXBZOFJIbzE2V2d5RFJ2OXJsdzdrTEpnRmtJNXpiU1hFMDlrajhzTwp4SUxra0EybktRNVlXT1I1T3E2NVU5dXNhSkFpRGtQUkZsMlFhWGpyTUFMYnpQVUsxTTNIbWJ3VHM5bjh4RWoxCnd5MUc3Ui94NUdjdk1FcHNPZjhCcXlqMTJBWjIwbS8rUG9iYkpGM0NVOXYzem5HNUZienpNMWtvUGNXVkcvSUcKZHdia3cwRi9rdFNQOUN5UjE1a3FaM2JmbDJNcFJIdkFqYWg1VjhldWZPSXlrUC91KzJ3L0ZyU0NUd2JQckVuSAp3SDhmbVNkSWsrcGFmVjB1MENHZmtuYzRvcnppdzNkbGJBMWZ6NDVyRHo3ZXFIc0FPTm89Ci0tLS0tRU5EIENFUlRJRklDQVRFLS0tLS0K
+ server: https://10.34.90.45:6443
+ name: berlin-community-pod-2
+contexts:
+- context:
+ cluster: berlin-community-pod-2
+ user: berlin-community-pod-2
+ name: berlin-community-pod-2
+current-context: berlin-community-pod-2
+kind: Config
+preferences: {}
+users:
+- name: berlin-community-pod-2
+ user:
+ token: kubeconfig-user-cvpsj.c-pvspc:2qt49qgjm26md74jlnckjv99kzz7prvqbfqbtrng4d2mnr5lhvrrxr
diff --git a/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml
new file mode 100644
index 0000000..ab9e3e8
--- /dev/null
+++ b/kubernetes-configs/voltha/berlin-community-pod-1-gpon-fttb.yml
@@ -0,0 +1,74 @@
+# Copyright 2019 Ciena Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+global:
+ image_tag: master
+ image_pullPolicy: Always
+onos-classic:
+ image:
+ tag: master
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+#images:
+# onos:
+# repository: "andreacampanella/voltha-onos"
+# tag: "olt-required-drivers"
+
+deployments:
+ etcdOperator: true
+ backupOperator: false
+ restoreOperator: false
+
+voltha-etcd-cluster:
+ clusterSize: 1
+onos_env:
+- name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+- name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+- name: ONOS_APPS
+ value: "drivers,openflow-base,hostprovider"
+
+apps:
+ - org.onosproject.lldpprovider
+ - org.onosproject.openflow-base
+ - org.onosproject.gui2
+ - org.onosproject.drivers
+ - org.onosproject.mcast
+ - org.opencord.kafka
+ - org.opencord.sadis
+ - org.opencord.dhcpl2relay
+ - org.opencord.igmpproxy
+ - org.opencord.mcast
+ - org.opencord.olt
+ - org.opencord.aaa
+
+atomix:
+ persistence:
+ enabled: false
+
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml b/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml
new file mode 100644
index 0000000..ab9e3e8
--- /dev/null
+++ b/kubernetes-configs/voltha/berlin-community-pod-2-gpon-zyxel.yml
@@ -0,0 +1,74 @@
+# Copyright 2019 Ciena Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+global:
+ image_tag: master
+ image_pullPolicy: Always
+onos-classic:
+ image:
+ tag: master
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+#images:
+# onos:
+# repository: "andreacampanella/voltha-onos"
+# tag: "olt-required-drivers"
+
+deployments:
+ etcdOperator: true
+ backupOperator: false
+ restoreOperator: false
+
+voltha-etcd-cluster:
+ clusterSize: 1
+onos_env:
+- name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+- name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+- name: ONOS_APPS
+ value: "drivers,openflow-base,hostprovider"
+
+apps:
+ - org.onosproject.lldpprovider
+ - org.onosproject.openflow-base
+ - org.onosproject.gui2
+ - org.onosproject.drivers
+ - org.onosproject.mcast
+ - org.opencord.kafka
+ - org.opencord.sadis
+ - org.opencord.dhcpl2relay
+ - org.opencord.igmpproxy
+ - org.opencord.mcast
+ - org.opencord.olt
+ - org.opencord.aaa
+
+atomix:
+ persistence:
+ enabled: false
+
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml b/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml
new file mode 100644
index 0000000..ab9e3e8
--- /dev/null
+++ b/kubernetes-configs/voltha/berlin-community-pod-2-xgspon-zyxel.yml
@@ -0,0 +1,74 @@
+# Copyright 2019 Ciena Corporation
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+global:
+ image_tag: master
+ image_pullPolicy: Always
+onos-classic:
+ image:
+ tag: master
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+#images:
+# onos:
+# repository: "andreacampanella/voltha-onos"
+# tag: "olt-required-drivers"
+
+deployments:
+ etcdOperator: true
+ backupOperator: false
+ restoreOperator: false
+
+voltha-etcd-cluster:
+ clusterSize: 1
+onos_env:
+- name: POD_IP
+ valueFrom:
+ fieldRef:
+ fieldPath: status.podIP
+- name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ fieldPath: metadata.namespace
+- name: ONOS_APPS
+ value: "drivers,openflow-base,hostprovider"
+
+apps:
+ - org.onosproject.lldpprovider
+ - org.onosproject.openflow-base
+ - org.onosproject.gui2
+ - org.onosproject.drivers
+ - org.onosproject.mcast
+ - org.opencord.kafka
+ - org.opencord.sadis
+ - org.opencord.dhcpl2relay
+ - org.opencord.igmpproxy
+ - org.opencord.mcast
+ - org.opencord.olt
+ - org.opencord.aaa
+
+atomix:
+ persistence:
+ enabled: false
+
+
+# Customization for BBSIM
+kafka_broker: 'voltha-kafka.voltha.svc.cluster.local:9092'
+pon_ports: 1
+onus_per_pon_port: 1
diff --git a/tosca-configs/voltha/berlin-community-pod-1-gpon-fttb-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-1-gpon-fttb-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/berlin-community-pod-1-gpon-fttb-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+ "devices": {
+ "of:0000000000000001" : {
+ "segmentrouting" : {
+ "name" : "agg-switch",
+ "ipv4NodeSid" : 101,
+ "ipv4Loopback" : "10.6.1.254",
+ "routerMac" : "00:00:00:00:01:80",
+ "isEdgeRouter" : true,
+ "adjacencySids" : []
+ },
+ "basic" : {
+ "driver" : "ofdpa3"
+ }
+ }
+ },
+ "apps": {
+ "org.opencord.dhcpl2relay" : {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ }
+ }
+}
diff --git a/tosca-configs/voltha/berlin-community-pod-2-gpon-zyxel-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-2-gpon-zyxel-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/berlin-community-pod-2-gpon-zyxel-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+ "devices": {
+ "of:0000000000000001" : {
+ "segmentrouting" : {
+ "name" : "agg-switch",
+ "ipv4NodeSid" : 101,
+ "ipv4Loopback" : "10.6.1.254",
+ "routerMac" : "00:00:00:00:01:80",
+ "isEdgeRouter" : true,
+ "adjacencySids" : []
+ },
+ "basic" : {
+ "driver" : "ofdpa3"
+ }
+ }
+ },
+ "apps": {
+ "org.opencord.dhcpl2relay" : {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ }
+ }
+}
diff --git a/tosca-configs/voltha/berlin-community-pod-2-xgspon-zyxel-onos-netcfg-switch.json b/tosca-configs/voltha/berlin-community-pod-2-xgspon-zyxel-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/berlin-community-pod-2-xgspon-zyxel-onos-netcfg-switch.json
@@ -0,0 +1,24 @@
+{
+ "devices": {
+ "of:0000000000000001" : {
+ "segmentrouting" : {
+ "name" : "agg-switch",
+ "ipv4NodeSid" : 101,
+ "ipv4Loopback" : "10.6.1.254",
+ "routerMac" : "00:00:00:00:01:80",
+ "isEdgeRouter" : true,
+ "adjacencySids" : []
+ },
+ "basic" : {
+ "driver" : "ofdpa3"
+ }
+ }
+ },
+ "apps": {
+ "org.opencord.dhcpl2relay" : {
+ "dhcpl2relay" : {
+ "useOltUplinkForServerPktInOut" : true
+ }
+ }
+ }
+}