From 91cb0c72c7597f62f9360e6cf19c2d34242edd9b Mon Sep 17 00:00:00 2001 From: "k.kedron" Date: Mon, 2 Aug 2021 07:46:57 +0200 Subject: Extend CNF to add sFTP Service&Configuration Issue-ID: INT-1945 Signed-off-by: Krystian Kedron Change-Id: I1d960f25e502d9ea4ea5063e3072e54270ee022e --- .../oran-sim-cba-data-dictionary/ftp-host.json | 27 +++++++++++++++ .../oran-sim-cba-data-dictionary/ftp-port.json | 27 +++++++++++++++ .../oran-sim-cba/Definitions/data_types.json | 7 ++++ .../Definitions/resources_definition_types.json | 38 ++++++++++++++++++++++ .../oran-sim-cba/Templates/ves-mapping.json | 21 ++++++++++++ .../oran-sim-cba/Templates/ves-template.vtl | 2 ++ .../resources/oran-sim-csar/MANIFEST.json | 4 +-- .../o-ran-simulator/templates/_deployment.tpl | 8 +++++ .../templates/a1-pe-sim-deployment.yaml | 2 ++ .../oran-sim-csar/o-ran-simulator/values.yaml | 28 ++++++++++++---- 10 files changed, 156 insertions(+), 8 deletions(-) create mode 100644 operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-host.json create mode 100644 operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-port.json diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-host.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-host.json new file mode 100644 index 0000000..6d13d10 --- /dev/null +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-host.json @@ -0,0 +1,27 @@ +{ + "name": "ftp-host", + "tags": "ftp-host", + "data_type": "string", + "description": "Host name or IP address of the FTP server", + "entry_schema": "string", + "updatedBy": "Krystian Kedron ", + "definition": { + "tags": "ftp-host", + "name": "ftp-host", + "property": { + "description": "Host name or IP address of the FTP server", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + } +} diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-port.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-port.json new file mode 100644 index 0000000..c79b0cb --- /dev/null +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/ftp-port.json @@ -0,0 +1,27 @@ +{ + "name": "ftp-port", + "tags": "oran, a1pesim", + "data_type": "string", + "description": "Port value of the FTP server", + "entry_schema": "string", + "updatedBy": "Krystian Kedron ", + "definition": { + "tags": "oran, a1pesim", + "name": "ftp-port", + "property": { + "description": "Port value of the FTP server", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + } +} diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/data_types.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/data_types.json index 8e48f70..4bff88f 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/data_types.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/data_types.json @@ -11,6 +11,13 @@ "vnf-id": { "type": "string" }, + "ftp-host": { + "type": "string" + }, + "ftp-port": { + "type": "string", + "default": "32022" + }, "cells-payload": { "type": "string", "default": "" diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/resources_definition_types.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/resources_definition_types.json index f5fb852..d8b5733 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/resources_definition_types.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/resources_definition_types.json @@ -73,6 +73,44 @@ } } }, + "ftp-host": { + "tags": "oran, a1pesim", + "name": "ftp-host", + "property": { + "description": "Host address of the FTP server", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, + "ftp-port": { + "tags": "oran, a1pesim", + "name": "ftp-port", + "property": { + "description": "Port value of the FTP server", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, "oran_name": { "tags": "oran_name", "name": "oran_name", diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-mapping.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-mapping.json index 423617d..62792b4 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-mapping.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-mapping.json @@ -74,6 +74,27 @@ "dictionary-source": "default", "dependencies": [] }, + { + "name": "ftp-host", + "input-param": true, + "property": { + "type": "string" + }, + "dictionary-name": "ftp-host", + "dictionary-source": "input", + "dependencies": [] + }, + { + "name": "ftp-port", + "input-param": true, + "property": { + "type": "string", + "default": "32022" + }, + "dictionary-name": "ftp-port", + "dictionary-source": "default", + "dependencies": [] + }, { "name": "rep-period", "input-param": true, diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-template.vtl b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-template.vtl index 8466e65..e888244 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-template.vtl +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/ves-template.vtl @@ -5,4 +5,6 @@ vesHost=$externalNodeIp vesPort=$ves-port vesPassword=$ves-user vesUser=$ves-password +ftpHost=$ftp-host +ftpPort=$ftp-port repPeriod=$rep-period diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json b/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json index c605362..2ab6a85 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-csar/MANIFEST.json @@ -1,6 +1,6 @@ { - "name": "SamsungORANSimulator", - "description": "ORAN Simulator; Samsung Electronics.", + "name": "Samsung A1 PE Simulator", + "description": "A1 PE Simulator; Samsung Electronics.", "data": [ { "file": "oran-sim-cba.zip", diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/_deployment.tpl b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/_deployment.tpl index 1bfc3a9..e4b7353 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/_deployment.tpl +++ b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/_deployment.tpl @@ -24,6 +24,14 @@ value: {{ tpl .value $dot.dot | quote }} {{- end }} {{- end }} + {{- with $containerSpec.command }} + command: + - {{ $containerSpec.command }} + {{- end }} + {{- with $containerSpec.args }} + args: + - {{ $containerSpec.args }} + {{- end }} {{- with $containerSpec.volumeMounts }} volumeMounts: {{- range $containerSpec.volumeMounts }} diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/a1-pe-sim-deployment.yaml b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/a1-pe-sim-deployment.yaml index c5690b6..01b3f45 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/a1-pe-sim-deployment.yaml +++ b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/templates/a1-pe-sim-deployment.yaml @@ -20,3 +20,5 @@ spec: - name: config configMap: name: {{ include "handover-simulator.utils.name" (list .Release.Name $name "app-cm") }} + - name: pmfiles + emptyDir: {} diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/values.yaml b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/values.yaml index 3bec165..5913207 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/values.yaml +++ b/operations/a1-pe-sim-packages/resources/oran-sim-csar/o-ran-simulator/values.yaml @@ -4,27 +4,43 @@ #To easier define node ports: backendRESTNodePort: 32766 -a1NodePort: 32085 +managementNodePort: 32022 -#oran_name can be provided from onap and will set custom label +#oran_name can be provided from ONAP and will set custom label oran_name: null a1pesimulator: name: a1-pe-simulator replicaCount: 1 containers: - backend: + a1-simulator: image: repository: nexus3.onap.org:10001/onap/integration/simulators/a1-pe-simulator tag: latest pullPolicy: Always volumeMounts: - name: config - mountPath: /var/a1pesim + mountPath: /a1-pe-simulator/config + - name: pmfiles + mountPath: /a1-pe-simulator/generated_pm_bulks + sftp: + image: + repository: atmoz/sftp + tag: latest + pullPolicy: Always + command: ./entrypoint + args: admin:samsung:::upload + volumeMounts: + - name: pmfiles + mountPath: /home/admin/upload service: type: NodePort ports: - port: 9998 - name: a1-pe-simulator-http - owner: a1pesimulator + name: a1-sim-http + owner: a1-simulator nodePort: "{{ .Values.backendRESTNodePort }}" + - port: 22 + owner: sftp + name: sftp-1 + nodePort: "{{ .Values.managementNodePort }}" -- cgit 1.2.3-korg