Adding files for GPON berlin
Change-Id: Ibba69cfcd2c3f785fb38d5346c49006dede5d7bb
diff --git a/deployment-configs/dt-berlin-pod-gpon.yaml b/deployment-configs/dt-berlin-pod-gpon.yaml
new file mode 100644
index 0000000..76ee5d4
--- /dev/null
+++ b/deployment-configs/dt-berlin-pod-gpon.yaml
@@ -0,0 +1,124 @@
+---
+
+ # 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
+ #GPON
+ oltPort: 2
+ device_id: 'of:0000000000000001'
+
+ olts:
+ # Gpon OLT
+ -
+ ip: 10.34.90.50
+ user: root
+ pass: onl
+ fortygig: False
+ serial: EC1912001814
+
+ 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
+ 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
+ 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
+ c_tag: 7
+ s_tag: 32
+ power_switch_port: 4
+
+ 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
+
+ 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 f9b1416..f8c6ab8 100644
--- a/deployment-configs/dt-berlin-pod.yaml
+++ b/deployment-configs/dt-berlin-pod.yaml
@@ -36,8 +36,6 @@
bngPort: 157
#XGSPON
oltPort: 1
- #GPON
- #oltPort: 2
device_id: 'of:0000000000000001'
olts:
@@ -48,13 +46,6 @@
pass: onl
fortygig: False
serial: 'EC1729003539'
-# Gpon OLT
- # -
- # ip: 10.34.90.50
- # user: root
- # pass: onl
- # fortygig: False
- # serial: ASGvOLT640000000
hosts:
src:
@@ -81,17 +72,6 @@
c_tag: 7
s_tag: 11
power_switch_port: 8
- #GPON ONU
- # -
- # ip: 127.0.0.1
- # user: community
- # pass: admin
- # dp_iface_name: eno4
- # container_type: null
- # container_name: null
- # onu: SCOM00001c82
- # c_tag: 22
- # s_tag: 22
dst:
-
diff --git a/kubernetes-configs/dt-berlin-pod-gpon.conf b/kubernetes-configs/dt-berlin-pod-gpon.conf
new file mode 100755
index 0000000..9f4d6de
--- /dev/null
+++ b/kubernetes-configs/dt-berlin-pod-gpon.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUN5RENDQWJDZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01ETXlNekUyTlRBME9Gb1hEVE13TURNeU1URTJOVEEwT0Zvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBTW5HCkorRDArQXFrVTFxYjIxUjNCZDhlRnJZM09ZRFNPWUM0eG8vMyt4bkFYRThHZTFzK1RmVXJ4K3laSTVpSExXQlkKUUlvQzNpNmQwWlJaK1dBeEZoWW1XMFR1eDYvcFozbGJnbTk0VWEzZ1BmTGRyYjdjVms5bW4rWlJtem1KSm10Sgp0SUdsbWxLdTNJRmZBaHVnSEQyNVJWYmpIaHBRdUVEZkpCK05kU01FNDAzYThPUEJVNGZhRWRRRVB3dkpaYzB0CjlOVDdwaktNK01iMkRhZ2NGSG10K1kvT1RXNFJnNG13NWkvZ1Zyb1crc1cwWWJldW9mVFV1ejdWcFRoM3ZPRTUKdCtCaU93SjFHNFNDaU5US0xHeStGVUkwYjc1VHZnaHJDdlRlK0xTZWRJUG9mRlcvS1k0alRTamVzcWRpUW5MVQo0UHZqU0cyUFlrMG04RFYrTmhzQ0F3RUFBYU1qTUNFd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFHMUdQSDB0cVVCNlBNUDVhSm4zVFIzaVpYMEsKVDhGRVFDUUlWa01MTnBQM1FMSm1XejFyWUtjNGpMSnluUk5pcmZUWVFEUkVmS2k3dmVTVi9tV3lVbmJUVHpDMQptUXdnSkdzU1AzbWM2dEFPdVIrWmk1eFVUVEVTOVRUZkl4ZnN1MC9vVW5kNUY2NGFXRTVCcVgyb0NWaFRZdGRVCjB1K1JPZzN6bXBqbTdka2YwbVRENU1RazhyY1RYclBKME5BRFExcEN5Y0xJTy83VFZJUGtYL2ZKV2NxU3NzU0IKWkJDWnpXbDN1WXNRcFIzNDhOQzFxcytYWDRXTk5rMVhXYkF4RFpLNng1L2RXUS96NnBGWmdHOGQvQjZZMVdsYwpHTWtaODdkbHdtOUpFcXhsVzlYdmlBSkt4bDhzd0hNVVVaeEFXRlRDSlJzZVh1N2FGRUN0VG5rbGNGOD0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ server: https://127.0.0.1:37238
+ name: voltha-minimal
+contexts:
+- context:
+ cluster: voltha-minimal
+ user: kubernetes-admin
+ name: kubernetes-admin@voltha-minimal
+current-context: kubernetes-admin@voltha-minimal
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+ user:
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM4akNDQWRxZ0F3SUJBZ0lJSXZDRWU0eUNVeEl3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURBek1qTXhOalV3TkRoYUZ3MHlNVEF6TWpNeE5qVXdOVEphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQXhNWmxob2R4TzBCbkRXR1gKamZGeDJSUTJ5R2lhQVJNL3l5K09LSFhiOTZSVDNxeVNaYnBwd1pDanZNQU8wVnNFTCtUZ211czR5dWtCQ3RIcQpKY05NK29VZ0Q2MFU5TURFVVV5R0pFdnB1VXZxODBieGdVbngvLzkxcTg4SFBDNVM4R3JQRGxReWVkVzZFM2c2CnFoNWRmU3lQelZST2RiMnNmTTNYSjI3eXh5UjNSallDWG9ZbVo4MGttQTRFYVI0NTM5RUNHV3lSNVB4VU5QVVgKVVJuWFdhSDhJcklIUUVhMVFTMkZCV0NDSzlWN1NRUVpzYjdwcDdwaTFEUEJ1cng2MFR3UThjVG9YWnhodi9Ebwp5TUJSekhTTURBTTE1ejVrZmo5bCsyMzlyQUErUjRLRWpPd2xUbnpZZ1RQZzlMNXZ5ZkR0UWlUL0RPaWJuU0tlCmMxWUhNUUlEQVFBQm95Y3dKVEFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0RRWUpLb1pJaHZjTkFRRUxCUUFEZ2dFQkFMK0FueXkxRFJYT3I4bzZJRkdRdUlkYmYzWTV6ZVpselUvcApTTmdaQWwzSTNqcnBsTmRXeW5hZmlZdENYbzhHUlFEMCtCSmxYaG40Y09pbkhBa2xuK09jSkk0TTV0cmlLcUlUCmN4enhoZnFKcGsybWo5NTFQMGZqVjZJeXcwNU93dVhobWRhcmt2WVlmbmdVZXpNMW9pMUsyNnYvNDZPUDdkbUYKWHRUelFuU2hvenNYOXhqZURWSnl4N2cwOHRBRjlnQ0E3OTFPcGtYUE1yS1NQOWRHcHFXd1ZLRDFsL1JxbzR3TwpDTEt6Y1JObi9FVSsyeEpnSkRxeU54OStaU0NidzNLRHNsT1IzKytGODU3RnA1aWJUSlZveFYzUHBwRDRjWnd0CkdzSjBPSWZ4YUtoNDQvL3VpcS90dGhHb2hsbmlEZHF4bmIxbU5lVlVXWFRJaUtvZlRxdz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcEFJQkFBS0NBUUVBeE1abGhvZHhPMEJuRFdHWGpmRngyUlEyeUdpYUFSTS95eStPS0hYYjk2UlQzcXlTClpicHB3WkNqdk1BTzBWc0VMK1RnbXVzNHl1a0JDdEhxSmNOTStvVWdENjBVOU1ERVVVeUdKRXZwdVV2cTgwYngKZ1VueC8vOTFxODhIUEM1UzhHclBEbFF5ZWRXNkUzZzZxaDVkZlN5UHpWUk9kYjJzZk0zWEoyN3l4eVIzUmpZQwpYb1ltWjgwa21BNEVhUjQ1MzlFQ0dXeVI1UHhVTlBVWFVSblhXYUg4SXJJSFFFYTFRUzJGQldDQ0s5VjdTUVFaCnNiN3BwN3BpMURQQnVyeDYwVHdROGNUb1haeGh2L0RveU1CUnpIU01EQU0xNXo1a2ZqOWwrMjM5ckFBK1I0S0UKak93bFRuellnVFBnOUw1dnlmRHRRaVQvRE9pYm5TS2VjMVlITVFJREFRQUJBb0lCQUFhc3NCN3JFelV1VHhDTwpJZVRucnJQdFVwcGpxZTJsYUlHTTRHYVE4T0FxaThtKzBzeHVrVTNHaVRkSzBIWGJmMzNjWnAzNm9wZUhaY2luCkxDa1J3ZGV4a2svVjBDTXBNcitMTi9XZE9aVldkT2JCbmttRFo1a0dZa2hzb2xNeFF4RHlub2xlNDhOc00zNmIKa21uWTA5VCtJUGFYQ0g1SDY4VGorb3RVNFJsT0hSOGVwYytRVmV5TW8yUDB0RW1YelBBZ2JVcmVUMzN0UVBjSQpKNVUxQ1ZwSjJLNWJjMzRlWGxydkF5VHpmczRXL3hyVEw4TXZpSE12Y0xBcmJmVkVSbkZXNVl1MGlib3ltcmd5ClBJazQxRkcyUEdCbm05NUtpeHIwVFZBZ0tmSE1GbFBSSXYzTDhnVHBYUVVqWnVpLzlJWU9tQ1VBbGdYNzhTRmIKOEUrK01BRUNnWUVBM0ttUTljTnIzUGRlcnloUUdkSTY0TC9Va01jcUNCbEZTdkRDV3E0M1NrcjdlQXEzMXFnagpiSWY0NVROcTBqUnJQalhNajBkYmt2eVo3TVZ0bE5FVVJXZUlyL3hrTEZ3SkhodGwxeitCektMa1IvZVQ2MGJuCkk5M0hHUm1PYU8zRDREQXJNdHE3M0pmVjJQMGdvanJvejA5VllnMEg5VzFWRFkxRG01SXB1REVDZ1lFQTVFbUcKcDdPZFpjZ2VVSVJZTTh2M2NLQTdZd0hzbG0rZDFDVVhYNHVxb2xNSVNrS1NOOGlpMDVJOVFKWlpOcUxMcENuZQpyMWJHNE9SOUxlWERneFpQNmlTUTJCUlluNWVYRXZRQ0xLazNidC9NSTRmeEM0ZkRyKzNQY2dlWFFLNVhFZnROCnlHN3hVQm1sUjFGYk51Q29ydDliMWxhS2I3UlBJd3RCdmJTTWZ3RUNnWUFpdGRXa295SGpkMUlBa1lIUUhmNisKL2MzdEhEY2pZUDVDWkk3ZC9zdVp0eVBKWlQ0MzJPa0JtSDN4Wjk0a3hMUWQ3QTZLZHpvVGJBSzJlUFBjMWVxdgpaRExmSS8rSjdzeE1YUmp1L0FGcDlER2VsSFpES3pzT3JFTTJVb3ZSTzUxMU5YNkdHRncydmZlWWszQy90QzZNCjliakRuTE1reXhiMjg4S3Z4UlVrOFFLQmdRQ1Q5L0IyM041RnJidXdkc2Z3OHVEMHVIY2x5b1orVCtTZU1GaUIKRHJkUU5iK20ycFdKNE50aGhXVjhhcmR5eVh4emNNd3RISE1XTENQVFR4MDE1NDF1OTdxR3hGRlpTRm1jNkZwTQpkblkrd0lMQitRaE5iL2R3SGhXYkZMNStKMEs2bmdnaHhYOVdhdmtOUy9keWo1WG1tMUlja01WMGVBdmZiQmwxCmpBU1JBUUtCZ1FERDBjeGQ2a245eWF3eDhxWC8vUnFwTTNLenkva0pqODBERFQrMnBJLzFubEZ1czV6d2w4Wk8KTDkxZ0V5d3ZuY0hmNFI5SDdyZEg5SUhDL1VtSi9OWHNzK3Z0emc4QW82YWtkZWFEcWlkRHdMbmxiYWVmSlI3egpTNmluUStmRk1sMjdPTHlVSlBZZ3gxZVJrVDFaWllSUVhQQVZnYXYrYnFPVTdFdVFnNDZSNnc9PQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
\ No newline at end of file
diff --git a/tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json b/tosca-configs/voltha/dt-berlin-pod-gpon-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/dt-berlin-pod-gpon-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
+ }
+ }
+ }
+}