Merge "Move to 3.3.2 version of the deb package for openolt agent in master"
diff --git a/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
new file mode 100644
index 0000000..2df64e1
--- /dev/null
+++ b/deployment-configs/dt-berlin-pod-gpon-adtran-DT.yaml
@@ -0,0 +1,135 @@
+---
+
+ # 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.40'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.41'
+ user: 'community'
+ pass: 'admin'
+ -
+ ip: '10.34.90.42'
+ 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'
+
+ olts:
+ # Gpon OLT
+ -
+ ip: 10.34.90.52
+ sship: 10.34.90.52
+ fortygig: False
+ aggPort: 3
+ serial: LBADTN2038AD991
+
+ hosts:
+ src:
+ #GPON ONU
+ -
+ ip: 10.34.90.41
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: SCOMA0302125
+ onu: SCOMA0302125
+ olt: LBADTN2038AD991
+ c_tag: 7
+ s_tag: 35
+ -
+ ip: 10.34.90.41
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: SCOMA030210E
+ onu: SCOMA030210E
+ olt: LBADTN2038AD991
+ c_tag: 7
+ s_tag: 36
+ -
+ ip: 10.34.90.41
+ user: community
+ pass: admin
+ dp_iface_name: eth1.7
+ container_type: LXC
+ container_name: SCOM00001C0F
+ onu: SCOM00001C0F
+ olt: LBADTN2038AD991
+ c_tag: 7
+ s_tag: 37
+
+ dst:
+ -
+ dp_iface_ip_qinq: 10.35.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.36.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.37.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
+
diff --git a/kubernetes-configs/dt-berlin-pod-gpon-adtran.conf b/kubernetes-configs/dt-berlin-pod-gpon-adtran.conf
new file mode 100755
index 0000000..4d3974b
--- /dev/null
+++ b/kubernetes-configs/dt-berlin-pod-gpon-adtran.conf
@@ -0,0 +1,19 @@
+apiVersion: v1
+clusters:
+- cluster:
+ certificate-authority-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSUM1ekNDQWMrZ0F3SUJBZ0lCQURBTkJna3Foa2lHOXcwQkFRc0ZBREFWTVJNd0VRWURWUVFERXdwcmRXSmwKY201bGRHVnpNQjRYRFRJd01UQXpNREUyTXpBeE1sb1hEVE13TVRBeU9ERTJNekF4TWxvd0ZURVRNQkVHQTFVRQpBeE1LYTNWaVpYSnVaWFJsY3pDQ0FTSXdEUVlKS29aSWh2Y05BUUVCQlFBRGdnRVBBRENDQVFvQ2dnRUJBS3FBCmhicFZ4OTg2c2oxTmE2emF5dUp0RG1vaDd4dm5XMFpBYVBxWmtyU29GdFNYT2taRUZxelF5blpQa0sxN1FkeU8KMi9JVmpqbWVsVnVsU0xBMEJIa0VNM3RBOGh1OGYxZnNab0NESUViZ2V1b0tFZmlqMTAyUmJEbjIyaE05TzZmVAp5emp5dVVNaWx4U3d3ci8xOUJXYWpDemc5WWhtRUFIdE5PWGFSWHlUV3VpSXlvTkhreWdpN0wreWdRUzJ6eGdPCkFQdVNzWkEyWXNIMkhHVjZBWDdCTm4zTnJCWkNEbjZtZlFsSXlqZzNPdmRJOWhaWHJKand5RDl1UUtyVVlYTWsKUElBZ2VUdU9IU0VMMnVhdUE5ellVYlFMekdOYlF1TlRsWXFvZmJ4eXk1Z3lhc2JwTnhUeXRQUTFJWDY5Vkc2SAorQmxXMkF1Qm00UzIrczVBVUFzQ0F3RUFBYU5DTUVBd0RnWURWUjBQQVFIL0JBUURBZ0trTUE4R0ExVWRFd0VCCi93UUZNQU1CQWY4d0hRWURWUjBPQkJZRUZIMm4zc1B2WHllR0ZXSXViUFdDVkRqRVVWajNNQTBHQ1NxR1NJYjMKRFFFQkN3VUFBNElCQVFBS3RqVHNlYWdNSDhIWkkrUnExL1ZGdktyQXZwYTNxbFRNZDZHTmZ3VkxXZVNYNTRabQpqQXB0OGsxTE4yNzdaWCsvQmJvdFNpblF0K2VoOVVNWFEyTkt5UFRROHR5QzFXSDFzUFFrVWlsd1FVT1Q0Z3RsCmpYck9kdEZaV0lZMFJIMTg1a2VSVGoyZXFtRTJFWHFyMEhWdFMxUUVGb1RqTUtURGxadUxjUWRHY0doQllTcmEKNlpTZys3cHljUHZSSFJBM08wVXpaRXlNKzlGdkYvbmMveFpjQjVPdGkrV0RNaEE2YldVdmMrWVo5a0tZb3RlTAoyYW5zdWJjenZNdnE1eFRJNjQ1YXQ4NDluRkVyTnBWUHV4WmtzWmhIVFpFMEROM1B1dHluK0hwS0lLNkdyaHVrCmlYQlcwaktmL1JkejlnMXFiRVg5Tk1yM0ZCb1JSZ25ObHh0NgotLS0tLUVORCBDRVJUSUZJQ0FURS0tLS0tCg==
+ server: https://10.34.90.40:6443
+ name: kubernetes
+contexts:
+- context:
+ cluster: kubernetes
+ user: kubernetes-admin
+ name: kubernetes-admin@kubernetes
+current-context: kubernetes-admin@kubernetes
+kind: Config
+preferences: {}
+users:
+- name: kubernetes-admin
+ user:
+ client-certificate-data: LS0tLS1CRUdJTiBDRVJUSUZJQ0FURS0tLS0tCk1JSURFekNDQWZ1Z0F3SUJBZ0lJT2hVWHZaT0lQYmt3RFFZSktvWklodmNOQVFFTEJRQXdGVEVUTUJFR0ExVUUKQXhNS2EzVmlaWEp1WlhSbGN6QWVGdzB5TURFd016QXhOak13TVRKYUZ3MHlNVEV3TXpBeE5qTXdNVFphTURReApGekFWQmdOVkJBb1REbk41YzNSbGJUcHRZWE4wWlhKek1Sa3dGd1lEVlFRREV4QnJkV0psY201bGRHVnpMV0ZrCmJXbHVNSUlCSWpBTkJna3Foa2lHOXcwQkFRRUZBQU9DQVE4QU1JSUJDZ0tDQVFFQWxjdjRpUUpPUkN0Rm4vbkMKcnJzcDRHLzk5bTNocENhZ0Qway9Lb3lkUjBVNmU0UFBoeGNZbEdCMHFqT051ZE42bFhYbjdsVHJDS0syc3V6ZQo4dVovZ0Naei9qSTRGWnQ5aUhCcy9vNEFRUVZMcW1qdEpINEE0b2ExeHp6WHFWZ3VNYkxXcS85UURXMSsyUXIwClZwMTR5T0xPSkZKR3FyNDQwUEZHYlE2OHdjSTV4STRNVkJJSG1leXp0eWJ5RGhnZjA4cVNvQmFNQ3hENEVRVUIKaUFhMjE1bkd5UnJzWmVtZWZEdFFBcDJFV0xCMmVicFFwaE1sTFlldFMrVGVQQTE1ZUV6YzlIRVFuNS9zTHE2eApYb3BTTVZnR0NNZGU3di80LzRkcTZ0MGZ2cnh1cVJYT2YvbVdzNHBlaFdVb29qK3k0Zkw5QWdCYVBxQmxzZ21zCkFjUXZpUUlEQVFBQm8wZ3dSakFPQmdOVkhROEJBZjhFQkFNQ0JhQXdFd1lEVlIwbEJBd3dDZ1lJS3dZQkJRVUgKQXdJd0h3WURWUjBqQkJnd0ZvQVVmYWZldys5Zko0WVZZaTVzOVlKVU9NUlJXUGN3RFFZSktvWklodmNOQVFFTApCUUFEZ2dFQkFFYWxiOGRpMFR4NVNJaWZNSXNSNmMwbU5jRllsdGRudE56VVZXMUp3Q3U1Z1YxaWZ4NldhOTg2Ci9BK1QreVpIWEMyOWJlSi9HNzIvRVVvSDZkekMvWGJIL01tWFBpVEVvSjlucDdaVVF3a2tRVFJseFJFNXdNNG0Kd0F3eEJ5b20wWHRXOHJ6ZktWbmkrOVpOaEFiL0d2WWRGOXdqNzkzTTBZUmlnRVIzUy9wT1F3SmFTWHhpSDFMSwpBZ25mQTJTTUZlb0tmMXFsenM4SHlXdTVidFkyenkreUVibmJmSDFIbWVMTEZBTXlQbUU1d1hFK3oyR1hoMVgvCi85bDBWQ3d0a3ZGRlBiN2xYUE5ZOVlrc0thZnlBSjN4OEJ2MkdaNVpxQzB0eldCZGVyVDVkNDdLRUZteGlLQ0EKV2UvSkpuRFBmYzRreHVyUTkydVpPdDB4N1ZBazJjbz0KLS0tLS1FTkQgQ0VSVElGSUNBVEUtLS0tLQo=
+ client-key-data: LS0tLS1CRUdJTiBSU0EgUFJJVkFURSBLRVktLS0tLQpNSUlFcFFJQkFBS0NBUUVBbGN2NGlRSk9SQ3RGbi9uQ3Jyc3A0Ry85OW0zaHBDYWdEMGsvS295ZFIwVTZlNFBQCmh4Y1lsR0IwcWpPTnVkTjZsWFhuN2xUckNLSzJzdXplOHVaL2dDWnovakk0Rlp0OWlIQnMvbzRBUVFWTHFtanQKSkg0QTRvYTF4enpYcVZndU1iTFdxLzlRRFcxKzJRcjBWcDE0eU9MT0pGSkdxcjQ0MFBGR2JRNjh3Y0k1eEk0TQpWQklIbWV5enR5YnlEaGdmMDhxU29CYU1DeEQ0RVFVQmlBYTIxNW5HeVJyc1plbWVmRHRRQXAyRVdMQjJlYnBRCnBoTWxMWWV0UytUZVBBMTVlRXpjOUhFUW41L3NMcTZ4WG9wU01WZ0dDTWRlN3YvNC80ZHE2dDBmdnJ4dXFSWE8KZi9tV3M0cGVoV1Vvb2oreTRmTDlBZ0JhUHFCbHNnbXNBY1F2aVFJREFRQUJBb0lCQUFDV1lTNGdYVEExUHp1bQpYaFlUVTlHMmZyZDFyTm5ZOE8yK2Fzbis3U3IzWVloVWR2N2ZuMUFOcE1kNkZrY3hSaHpKN3BQbnIxaEVVeFVXCmlyVkhKQjdiaDc3cWNYL2NNVHpVdkFpdmc5NjlaNU9PZjhlUjJ1MElmRFFBMEJPdzdkVnlEeGR6azl2Sm55SzQKd1VhSnJZeVVIeHpUV2NXWG8xOW1ZdEZRcW5yVUI1Ni9zbDJ1ZllPUFFWUWFYK0tSUm9xWVR1Q0kreFFMTldwRgpvOGpVSlFUUGc5Z3NkaHdXZXJEZU16WVE0MWh2UkxqbE50T2xyeSsxZEd2K0p2a3l6SHZLZ1pTMythWWFRVkx2CmRJaGNCKzBhS3EyejJvRFB0OVNTL2dxS2NQS2pyYk5VelBENG81bSszeVpYZGk3YW4vT1lTZDdIUUFwUUpKd3IKRkJLNjVnVUNnWUVBd1ZYcXJnYS83THNuejk2RXVWZGU3anc4N0VtL0dWNnl3OUQvU25kZ0dXZ3dXeGVpdk9XUgoxaXRsczB3MEhWcVB5ak8rd1hXM29CdTNuZTNpS3pKK0hPYUFRUThOQWlxTnE2SUFiZDhjK2ZRdFBHdnBCY1IxCkZIWnYxVnNCRzJUdkU5b0hnR2FZQVhrSEI5TWJsdHF4c3lQTU5RMlhqVnVCb1U5cjVNUzhQUE1DZ1lFQXhsbG4KZk0zMlJLZzJqdEgwNlJVeG5Veit2R2hwdzFWcnNVZnZ2cEU0TXVWcXdxb3hMZlZNRExPT3p6L0dvSElQbFRNZQpzeS9aTWdBOWdIcFRhdmZiWWZWcm5hb1JBMnd6c2VxSThRRmJJVkgrTGxtWmFYQU12bVJwcGZiNWFkK25LZjFmCnR1cjdhUVJBdEI1QkUvU1NMVmhQS0lLN3FIZGJtendVRXlJcUVKTUNnWUVBcFBOVHpmU3VUU0VFLzZKZlpPNTUKYlJOeCt6dVVVdVhyNll2b05EV1RoVG5TZi9XemdDeng5Mk9CV3E5NmkwelgvM0dVbitSNnJaellWV00vb3hGcQpiZWZ2cHhKYlMrellnSVl3alkxZFlKa0crMVVxTkNTQXE5dTg0TERMU2Y4Y3g3Z3V6RXM4QjQybUJQUUZ4dmlCCndsQ1ppdTQwem9NekgxanV1ZmxzalNjQ2dZRUF3QVZSa0p0OExKK0VvZU5VN0VsZVRPQjdSRDc1Rk9lZmFITXkKQUJWcWlLdGRIYlBTQktJU3k4RVJJa2FscmpKK0wzemIzYkVXM2JjcDB6V1ppRmNIaGVBb0hPekZwOENhazBWdwo2WkRjZm5kNFVicmdNQmtQM1Vvc2xVVngxRE4zQzhtRlhmcERCam5kd2dJQUVxZVUxRjFIMVBvclhqNmU2cnZRCjIyMFp1QTBDZ1lFQWlBenRab281U3pOMFlTOFV3elRGR2VDbGZPY21xa2dzVllNWXRKUk9MSEpCNlcvRUl2alAKR1BpcnUxTGV1L3ZEdWl3dGhCQ3dsRUFTY29qcVhXV0dveHVianZXRFJXWlFQKysxc3lhUy94YjBreURkOExjeAo2a0NJaWdobk9VWFpiOHhoOWd5cFgwNHFlV0hBWU1SZVRoUE5HQ2d2VUxLQ0h6UlJmUG5vb0FrPQotLS0tLUVORCBSU0EgUFJJVkFURSBLRVktLS0tLQo=
diff --git a/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml b/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
new file mode 100644
index 0000000..cfee07c
--- /dev/null
+++ b/kubernetes-configs/voltha/dt-berlin-pod-gpon-adtran.yml
@@ -0,0 +1,66 @@
+# 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.
+
+defaults:
+ image_tag: master
+ image_pullPolicy: Always
+
+onosSshPort: 30115
+onosApiPort: 30120
+onosOfPort: 31653
+
+individualOpenFlowNodePorts: true
+
+images:
+ adapter_adtran_olt:
+ registry: "10.34.90.43:443/"
+
+
+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
+
diff --git a/tosca-configs/voltha/dt-berlin-pod-gpon-adtran-onos-netcfg-switch.json b/tosca-configs/voltha/dt-berlin-pod-gpon-adtran-onos-netcfg-switch.json
new file mode 100644
index 0000000..5ddbebd
--- /dev/null
+++ b/tosca-configs/voltha/dt-berlin-pod-gpon-adtran-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
+ }
+ }
+ }
+}