[VOL-2655] Adding berlin POD config to support multiple OLTs and adjusting remaining pod configs.
Change-Id: I2b4b305b902d5310816ecd3f81abbca6d2c767c8
diff --git a/deployment-configs/dt-berlin-pod-gpon-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
index e8e3db7..57f13a4 100644
--- a/deployment-configs/dt-berlin-pod-gpon-DT.yaml
+++ b/deployment-configs/dt-berlin-pod-gpon-DT.yaml
@@ -34,8 +34,6 @@
user: root
pass: onl
bngPort: 157
- #GPON
- oltPort: 2
device_id: 'of:0000000000000001'
olts:
@@ -45,7 +43,9 @@
user: root
pass: onl
fortygig: False
+ aggPort: 2
serial: EC1912001814
+ oltDebVersion: openolt_asgvolt64.deb
hosts:
src:
@@ -58,6 +58,7 @@
container_type: LXC
container_name: voltha-client-gpon-1
onu: SCOM00001c82
+ olt: EC1912001814
c_tag: 7
s_tag: 31
power_switch_port: 1
@@ -69,6 +70,7 @@
container_type: LXC
container_name: voltha-client-gpon-2
onu: SCOM00001c89
+ olt: EC1912001814
c_tag: 7
s_tag: 32
power_switch_port: 2
@@ -80,6 +82,7 @@
container_type: LXC
container_name: voltha-client-gpon-3
onu: SCOM00001c96
+ olt: EC1912001814
c_tag: 7
s_tag: 33
power_switch_port: 4
diff --git a/deployment-configs/dt-berlin-pod-multi-olt.yaml b/deployment-configs/dt-berlin-pod-multi-olt.yaml
new file mode 100644
index 0000000..0b7d0da
--- /dev/null
+++ b/deployment-configs/dt-berlin-pod-multi-olt.yaml
@@ -0,0 +1,180 @@
+---
+
+ # 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: '127.0.0.1'
+
+ fabric_switches:
+ -
+ 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
+ user: root
+ pass: onl
+ fortygig: False
+ aggPort: 2
+ serial: EC1912001814
+ oltDebVersion: openolt_asgvolt64.deb
+ # XGS-PON OLT
+ -
+ ip: 10.34.90.51
+ user: root
+ pass: onl
+ fortygig: False
+ aggPort: 1
+ serial: EC1729003539
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
+
+ hosts:
+ src:
+ #GPON ONU
+ -
+ ip: 127.0.0.1
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: voltha-client-gpon-1
+ onu: SCOM00001c82
+ olt: EC1912001814
+ c_tag: 7
+ s_tag: 31
+ power_switch_port: 1
+ -
+ ip: 10.34.90.42
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: voltha-client-gpon-2
+ onu: SCOM00001c89
+ olt: EC1912001814
+ c_tag: 7
+ s_tag: 32
+ power_switch_port: 2
+ -
+ ip: 10.34.90.42
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: voltha-client-gpon-3
+ onu: SCOM00001c96
+ olt: EC1912001814
+ c_tag: 7
+ s_tag: 33
+ power_switch_port: 4
+ #XGSPON ONU
+ -
+ ip: 127.0.0.1
+ user: community
+ pass: admin
+ dp_iface_name: eth1
+ container_type: LXC
+ container_name: voltha-client
+ onu: ALPHe3d1cf5c
+ olt: EC1729003539
+ c_tag: 11
+ s_tag: 11
+ power_switch_port: 6
+ -
+ ip: 127.0.0.1
+ user: community
+ pass: admin
+ dp_iface_name: eth1
+ container_type: LXC
+ container_name: voltha-client-dt
+ onu: ALPHe3a69d03
+ olt: EC1729003539
+ c_tag: 7
+ s_tag: 11
+ power_switch_port: 8
+
+ dst:
+ -
+ dp_iface_ip_qinq: 10.31.7.254
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+ -
+ dp_iface_ip_qinq: 10.32.7.254
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+ -
+ dp_iface_ip_qinq: 10.33.7.254
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+ -
+ dp_iface_ip_qinq: 10.11.2.254
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+ -
+ dp_iface_ip_qinq: 10.11.7.254
+ ip: null
+ user: null
+ pass: null
+ dp_iface_name: null
+ dp_iface_ip: null
+ dp_iface_gateway: null
+ container_type: null
+ container_name: null
+
+ web_power_switch:
+ ip: '10.34.90.48'
+ user: 'admin'
+ password: 'secret'
+ type: 'EPC'
\ No newline at end of file
diff --git a/deployment-configs/dt-berlin-pod.yaml b/deployment-configs/dt-berlin-pod.yaml
index f8c6ab8..f866aa1 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -34,8 +34,6 @@
user: root
pass: onl
bngPort: 157
- #XGSPON
- oltPort: 1
device_id: 'of:0000000000000001'
olts:
@@ -45,7 +43,10 @@
user: root
pass: onl
fortygig: False
+ aggPort: 1
serial: 'EC1729003539'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
+
hosts:
src:
@@ -58,6 +59,7 @@
container_type: LXC
container_name: voltha-client
onu: ALPHe3d1cf5c
+ olt: EC1729003539
c_tag: 11
s_tag: 11
power_switch_port: 6
@@ -69,6 +71,7 @@
container_type: LXC
container_name: voltha-client-dt
onu: ALPHe3a69d03
+ olt: EC1729003539
c_tag: 7
s_tag: 11
power_switch_port: 8
diff --git a/deployment-configs/flex-ocp-cord.yaml b/deployment-configs/flex-ocp-cord.yaml
index 49d4df0..f93ee72 100644
--- a/deployment-configs/flex-ocp-cord.yaml
+++ b/deployment-configs/flex-ocp-cord.yaml
@@ -39,7 +39,6 @@
user: 'root'
pass: 'onl'
bngPort: '3'
- oltPort: '10'
device_id: 'of:0000000000000001'
olts:
@@ -48,7 +47,9 @@
user: 'root'
pass: 'onl'
fortygig: 'true'
+ aggPort: '10'
serial: 'EC1838000853'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
onus:
-
@@ -64,6 +65,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1cfa7'
+ olt: 'EC1838000853'
c_tag: '901'
s_tag: '111'
power_switch_port: 5
@@ -75,6 +77,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1cea3'
+ olt: 'EC1838000853'
c_tag: '801'
s_tag: '111'
power_switch_port: 1
@@ -86,6 +89,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1ceb7'
+ olt: 'EC1838000853'
c_tag: '101'
s_tag: '222'
power_switch_port: 2
diff --git a/deployment-configs/infosys-pod.yaml b/deployment-configs/infosys-pod.yaml
index 7744ab9..1cc847b 100644
--- a/deployment-configs/infosys-pod.yaml
+++ b/deployment-configs/infosys-pod.yaml
@@ -31,7 +31,6 @@
user: 'root'
pass: 'onl'
bngPort: '3'
- oltPort: '10'
device_id: 'of:0000000000000001'
olts:
@@ -40,7 +39,9 @@
user: 'root'
pass: 'onl'
fortygig: 'true'
+ aggPort: '10'
serial: 'EC1917000121'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
onus:
-
@@ -55,6 +56,7 @@
dp_iface_name: 'ens10'
container_type: null
container_name: null
+ olt: 'EC1917000121'
onu: 'ISKT71e82118'
c_tag: '222'
s_tag: '111'
diff --git a/deployment-configs/onf-demo-pod-DT.yaml b/deployment-configs/onf-demo-pod-DT.yaml
index 3e48654..ab28cad 100644
--- a/deployment-configs/onf-demo-pod-DT.yaml
+++ b/deployment-configs/onf-demo-pod-DT.yaml
@@ -39,7 +39,6 @@
user: 'root'
pass: 'onl'
bngPort: '31'
- oltPort: '1'
device_id: 'of:0000000000000001'
olts:
@@ -49,7 +48,9 @@
user: 'root'
pass: 'onl'
fortygig: 'true'
+ aggPort: '1'
serial: 'EC1904000654'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
onus:
-
@@ -67,6 +68,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1cf9d'
+ olt: 'EC1904000654'
c_tag: '22'
s_tag: '22'
-
@@ -77,6 +79,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1ced5'
+ olt: 'EC1904000654'
c_tag: '33'
s_tag: '33'
dst:
diff --git a/deployment-configs/onf-demo-pod.yaml b/deployment-configs/onf-demo-pod.yaml
index f7d9c7f..0873c15 100644
--- a/deployment-configs/onf-demo-pod.yaml
+++ b/deployment-configs/onf-demo-pod.yaml
@@ -39,7 +39,6 @@
user: 'root'
pass: 'onl'
bngPort: '31'
- oltPort: '1'
device_id: 'of:0000000000000001'
olts:
@@ -49,7 +48,9 @@
user: 'root'
pass: 'onl'
fortygig: 'true'
+ aggPort: '1'
serial: 'EC1904000654'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
onus:
-
@@ -67,6 +68,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1cf9d'
+ olt: 'EC1904000654'
c_tag: '22'
s_tag: '99'
-
@@ -77,6 +79,7 @@
container_type: null
container_name: null
onu: 'ALPHe3d1ced5'
+ olt: 'EC1904000654'
c_tag: '33'
s_tag: '99'
dst:
diff --git a/deployment-configs/onlab-pod1.yaml b/deployment-configs/onlab-pod1.yaml
index 3d274d4..8f31c71 100644
--- a/deployment-configs/onlab-pod1.yaml
+++ b/deployment-configs/onlab-pod1.yaml
@@ -39,7 +39,6 @@
user: 'root'
pass: 'onl'
bngPort: '31'
- oltPort: '1'
device_id: 'of:0000000000000001'
olts:
@@ -48,7 +47,9 @@
user: 'root'
pass: 'onl'
fortygig: 'true'
+ aggPort: '1'
serial: 'EC1721000216'
+ oltDebVersion: openolt_asfvolt16-2.3.0-bc6e0853e0e8bf6bd7e4223d4a7ee0dd35ce634d.deb
onus:
-
@@ -73,6 +74,7 @@
container_type: 'LXC'
container_name: 'ALPHe3d1cfde'
onu: 'ALPHe3d1cfde'
+ olt: 'EC1721000216'
c_tag: '112'
s_tag: '111'