From fb234c1c815ea87ed809468661f2293f777e92d3 Mon Sep 17 00:00:00 2001 From: Marcin Krasowski Date: Mon, 8 Nov 2021 11:20:29 +0100 Subject: Added simple profile to CBA Signed-off-by: Marcin Krasowski Signed-off-by: Krystian Kedron Change-Id: I45326355a27a3b13d03d051a32e33a8012a9d04c Issue-ID: INT-2001 --- .../vf-module-uuid.json | 43 ++++ .../oran-sim-cba/Definitions/artifact_types.json | 5 + .../oran-sim-cba/Definitions/data_types.json | 88 ++++++-- .../oran-sim-cba/Definitions/node_types.json | 75 +++++++ .../Definitions/oran-sim-blueprint.json | 44 +++- .../Definitions/resources_definition_types.json | 247 ++++++++++++++++++++- .../oran-sim-cba/TOSCA-Metadata/TOSCA.meta | 2 +- .../Templates/helm_simulator-mapping.json | 131 +++++++++++ .../Templates/helm_simulator-template.vtl | 25 +++ .../oran-sim-cba/Templates/k8s-profiles/simple.tgz | Bin 0 -> 529 bytes .../oran-sim-cba/Templates/vnf-mapping.json | 25 +++ .../oran-sim-cba/Templates/vnf-template.vtl | 10 +- 12 files changed, 672 insertions(+), 23 deletions(-) create mode 100644 operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/vf-module-uuid.json create mode 100644 operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/k8s-profiles/simple.tgz diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/vf-module-uuid.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/vf-module-uuid.json new file mode 100644 index 0000000..214c7f2 --- /dev/null +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba-data-dictionary/vf-module-uuid.json @@ -0,0 +1,43 @@ +{ + "name": "vf-module-uuid", + "tags": "vf-module-uuid", + "data_type": "string", + "description": "vf-module-uuid", + "entry_schema": "string", + "updatedBy": "Krystian Kedron ", + "definition": { + "tags": "vf-module-uuid", + "name": "vf-module-uuid", + "property": { + "description": "vf-module-uuid", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "processor-db": { + "type": "source-db", + "properties": { + "type": "SQL", + "query": "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid", + "input-key-mapping": { + "customizationid": "vf-module-model-customization-uuid" + }, + "output-key-mapping": { + "vf-module-uuid": "vf_module_uuid" + }, + "key-dependencies": [ + "vf-module-model-customization-uuid" + ] + } + } + } + } +} diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/artifact_types.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/artifact_types.json index 224e7b6..934cbc8 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/artifact_types.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/artifact_types.json @@ -1,5 +1,10 @@ { "artifact_types": { + "artifact-k8sprofile-content": { + "description": "K8s Profile Folder Artifact", + "version": "1.0.0", + "derived_from": "tosca.artifacts.Implementation" + }, "artifact-mapping-resource": { "description": "Resource Mapping File used along with Configuration template", "version": "1.0.0", 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 4bff88f..6d9ac5f 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,9 +11,6 @@ "vnf-id": { "type": "string" }, - "ftp-host": { - "type": "string" - }, "ftp-port": { "type": "string", "default": "32022" @@ -26,6 +23,9 @@ "type": "string", "default": "30417" }, + "ftp-host": { + "type": "string" + }, "ues-payload": { "type": "string", "default": "" @@ -69,7 +69,19 @@ "description": "Dynamic DataType definition for workflow(resource-assignment).", "version": "1.0.0", "properties": { - "vnf-ip-address": { + "k8s-rb-profile-namespace": { + "description": "K8s namespace to create helm chart for specified RB profile", + "required": false, + "type": "string", + "default": "default" + }, + "k8s-rb-profile-name": { + "description": "RB Profile name used in k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "required": false, + "type": "string", + "default": "simple" + }, + "vnf-id": { "description": "", "required": false, "type": "string", @@ -77,12 +89,23 @@ "constraints": [ {} ], - "default": "${vnf-ip-address}", "entry_schema": { "type": "" } }, - "vnf-id": { + "k8s-rb-profile-source": { + "description": "The source folder or file relative to 'Templates/k8s-profiles' folder", + "required": true, + "type": "string", + "default": "simple-profile" + }, + "k8s-rb-instance-release-name": { + "description": "Name of the release for the helm package instance in k8s", + "required": false, + "type": "string", + "default": "o-ran-simulator" + }, + "service-instance-id": { "description": "", "required": false, "type": "string", @@ -94,7 +117,21 @@ "type": "" } }, - "service-instance-id": { + "k8s-rb-profile-k8s-version": { + "description": "K8s cluster version to create helm chart for specified RB profile", + "required": false, + "type": "string", + "default": "1.18.9" + }, + "k8s-rb-definition-version": { + "description": "RB Version identifier of Helm chart(s) in k8s plugin", + "required": false, + "type": "string", + "metadata": { + "transform-template": "${vf-module-uuid}" + } + }, + "vnf_name": { "description": "", "required": false, "type": "string", @@ -106,7 +143,7 @@ "type": "" } }, - "vnf_name": { + "aic-cloud-region": { "description": "", "required": false, "type": "string", @@ -118,7 +155,7 @@ "type": "" } }, - "vf-module-id": { + "oran_name": { "description": "", "required": false, "type": "string", @@ -126,11 +163,30 @@ "constraints": [ {} ], + "default": "${oran_name}", "entry_schema": { "type": "" } }, - "aic-cloud-region": { + "vf-module-uuid": { + "description": "", + "required": false, + "type": "string" + }, + "vf-module-model-customization-uuid": { + "description": "", + "required": false, + "type": "string" + }, + "k8s-rb-definition-name": { + "description": "RB Name identifier of Helm chart(s) in k8s plugin", + "required": false, + "type": "string", + "metadata": { + "transform-template": "${vf-module-model-invariant-uuid}" + } + }, + "vnf-ip-address": { "description": "", "required": false, "type": "string", @@ -138,11 +194,12 @@ "constraints": [ {} ], + "default": "${vnf-ip-address}", "entry_schema": { "type": "" } }, - "oran_name": { + "vf-module-id": { "description": "", "required": false, "type": "string", @@ -150,7 +207,6 @@ "constraints": [ {} ], - "default": "${oran_name}", "entry_schema": { "type": "" } @@ -160,6 +216,9 @@ "required": false, "type": "string" }, + "vf-module-model-invariant-uuid": { + "type": "string" + }, "vf-naming-policy": { "description": "", "required": false, @@ -172,11 +231,6 @@ "entry_schema": { "type": "" } - }, - "vf-module-model-customization-uuid": { - "description": "", - "required": false, - "type": "string" } }, "derived_from": "tosca.datatypes.Dynamic" diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/node_types.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/node_types.json index d12f59c..8dbfe6c 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/node_types.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/node_types.json @@ -1,5 +1,80 @@ { "node_types": { + "component-k8s-profile-upload": { + "description": "This component is rendering and sending the k8s profile to the multicloud plugin.", + "version": "1.0.0", + "attributes": { + "statuses": { + "required": true, + "type": "json" + } + }, + "capabilities": { + "component-node": { + "type": "tosca.capabilities.Node" + } + }, + "interfaces": { + "K8sProfileUploadComponent": { + "operations": { + "process": { + "inputs": { + "k8s-rb-profile-name": { + "description": "K8s profile name", + "required": false, + "type": "string" + }, + "k8s-rb-definition-name": { + "description": "K8s definition name", + "required": false, + "type": "string" + }, + "k8s-rb-definition-version": { + "description": "Version of the definition", + "required": false, + "type": "string" + }, + "k8s-rb-profile-namespace": { + "description": "a K8s namespace for the profile", + "required": false, + "type": "string" + }, + "k8s-rb-profile-k8s-version": { + "description": "a K8s cluster version for the profile", + "required": false, + "type": "string" + }, + "k8s-rb-profile-source": { + "description": "Source (tgz/folder) for the template in CBA", + "required": false, + "type": "string" + }, + "artifact-prefix-names": { + "description": "Resource Assignment Artifact Prefix names", + "required": false, + "type": "list", + "entry_schema": { + "type": "string" + } + }, + "resource-assignment-map": { + "description": "Holds resolved values for each artifact prefix eg. { vdns: { vnf-id: 123 } }", + "required": false, + "type": "json" + } + }, + "outputs": { + "statuses": { + "required": true, + "type": "string" + } + } + } + } + } + }, + "derived_from": "tosca.nodes.Component" + }, "component-resource-resolution": { "description": "This is Resource Assignment Component API", "version": "1.0.0", diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/oran-sim-blueprint.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/oran-sim-blueprint.json index 91543d0..c09fe3b 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/oran-sim-blueprint.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Definitions/oran-sim-blueprint.json @@ -5,7 +5,7 @@ "author-email": "l.kaihlavirt@partner.samsung.com", "user-groups": "ADMIN, OPERATION", "template_name": "a1_pe_simulator", - "template_version": "2.0.0", + "template_version": "2.0.1", "template_tags": "samsung, oran", "template_type": "DEFAULT" }, @@ -59,7 +59,19 @@ "target": "resource-assignment", "activities": [ { - "call_operation": "" + "call_operation": "ResourceResolutionComponent.process" + } + ], + "on_success": [ + "profile-upload" + ] + }, + "profile-upload": { + "description": "Generate and upload K8s Profile", + "target": "k8s-profile-upload", + "activities": [ + { + "call_operation": "ComponentScriptExecutor.process" } ] } @@ -245,6 +257,34 @@ } } }, + "k8s-profile-upload": { + "type": "component-k8s-profile-upload", + "interfaces": { + "K8sProfileUploadComponent": { + "operations": { + "process": { + "inputs": { + "artifact-prefix-names": { + "get_input": "template-prefix" + }, + "resource-assignment-map": { + "get_attribute": [ + "resource-assignment", + "assignment-map" + ] + } + } + } + } + } + }, + "artifacts": { + "simple-profile": { + "type": "artifact-k8sprofile-content", + "file": "Templates/k8s-profiles/simple.tgz" + } + } + }, "resolve-netconfaccount": { "type": "component-resource-resolution", "interfaces": { 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 d8b5733..58be915 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 @@ -74,10 +74,10 @@ } }, "ftp-host": { - "tags": "oran, a1pesim", + "tags": "ftp-host", "name": "ftp-host", "property": { - "description": "Host address of the FTP server", + "description": "Host name or IP address of the FTP server", "type": "string" }, "group": "default", @@ -111,6 +111,179 @@ } } }, + "k8s-rb-definition-name": { + "tags": "k8s, cnf, k8s-rb-definition-name", + "name": "k8s-rb-definition-name", + "property": { + "description": "K8s RB definition name. Associated with vf-module-model-invariant-uuid", + "type": "string" + }, + "group": "default", + "updated-by": "Lukasz Rajewski ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, + "k8s-rb-definition-version": { + "tags": "k8s, cnf, k8s-rb-definition-version", + "name": "k8s-rb-definition-version", + "property": { + "description": "K8s RB definition version. Associated with vf-module-model-version", + "type": "string" + }, + "group": "default", + "updated-by": "Lukasz Rajewski ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, + "k8s-rb-instance-release-name": { + "tags": "k8s, cnf, profile, k8s-rb-instance-release-name", + "name": "k8s-rb-instance-release-name", + "property": { + "description": "Name of the release for the helm package instance in k8s", + "type": "string" + }, + "group": "default", + "updated-by": "Rajewski, Lukasz ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, + "k8s-rb-profile-k8s-version": { + "tags": "k8s, cnf, profile, k8s version, k8s-rb-profile-k8s-version", + "name": "k8s-rb-profile-k8s-version", + "property": { + "description": "Profile k8s version used in multicloud/k8s plugin", + "type": "string" + }, + "group": "default", + "updated-by": "Rajewski, Lukasz ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-k8s-version", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "k8s-rb-profile-k8s-version": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] + } + } + } + }, + "k8s-rb-profile-name": { + "tags": "k8s, cnf, k8s-rb-profile-name", + "name": "k8s-rb-profile-name", + "property": { + "description": "Profile name used in multicloud/k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string" + }, + "group": "default", + "updated-by": "Lukasz Rajewski ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, + "k8s-rb-profile-namespace": { + "tags": "k8s, cnf, k8s-rb-profile-namespace", + "name": "k8s-rb-profile-namespace", + "property": { + "description": "Profile name used in multicloud/k8s plugin", + "type": "string" + }, + "group": "default", + "updated-by": "Lukasz Rajewski ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "sdnc": { + "type": "source-rest", + "properties": { + "verb": "GET", + "type": "JSON", + "url-path": "/restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/k8s-rb-profile-namespace", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "k8s-rb-profile-namespace": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] + } + } + } + }, + "k8s-rb-profile-source": { + "tags": "k8s, cnf, k8s-rb-profile-source", + "name": "k8s-rb-profile-source", + "property": { + "description": "The source folder or file relative to 'Templates/k8s-profiles' folder", + "type": "string" + }, + "group": "default", + "updated-by": "Lukasz Rajewski ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + } + } + }, "oran_name": { "tags": "oran_name", "name": "oran_name", @@ -357,6 +530,76 @@ } } }, + "vf-module-model-invariant-uuid": { + "tags": "vnf, vf-module, vf-module-model-invariant-uuid", + "name": "vf-module-model-invariant-uuid", + "property": { + "description": "vf-module-model-invariant-uuid", + "type": "string" + }, + "group": "default", + "updated-by": "MALAKOV, YURIY ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "processor-db": { + "type": "source-db", + "properties": { + "type": "SQL", + "query": "select sdnctl.VF_MODULE_MODEL.invariant_uuid as vf_module_model_invariant_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid", + "input-key-mapping": { + "customizationid": "vf-module-model-customization-uuid" + }, + "output-key-mapping": { + "vf-module-model-invariant-uuid": "vf_module_model_invariant_uuid" + }, + "key-dependencies": [ + "vf-module-model-customization-uuid" + ] + } + } + } + }, + "vf-module-uuid": { + "tags": "vf-module-uuid", + "name": "vf-module-uuid", + "property": { + "description": "vf-module-uuid", + "type": "string" + }, + "group": "default", + "updated-by": "Krystian Kedron ", + "sources": { + "input": { + "type": "source-input" + }, + "default": { + "type": "source-default", + "properties": {} + }, + "processor-db": { + "type": "source-db", + "properties": { + "type": "SQL", + "query": "select sdnctl.VF_MODULE_MODEL.uuid as vf_module_uuid from sdnctl.VF_MODULE_MODEL where sdnctl.VF_MODULE_MODEL.customization_uuid=:customizationid", + "input-key-mapping": { + "customizationid": "vf-module-model-customization-uuid" + }, + "output-key-mapping": { + "vf-module-uuid": "vf_module_uuid" + }, + "key-dependencies": [ + "vf-module-model-customization-uuid" + ] + } + } + } + }, "vf-naming-policy": { "tags": "vf-naming-policy", "name": "vf-naming-policy", diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/TOSCA-Metadata/TOSCA.meta b/operations/a1-pe-sim-packages/resources/oran-sim-cba/TOSCA-Metadata/TOSCA.meta index cf101d7..85f2c4c 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/TOSCA-Metadata/TOSCA.meta +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/TOSCA-Metadata/TOSCA.meta @@ -3,6 +3,6 @@ CSAR-Version: 1.0 Created-By: Lasse Kaihlavirta Entry-Definitions: Definitions/oran-sim-blueprint.json Template-Name: a1_pe_simulator -Template-Version: 2.0.0 +Template-Version: 2.0.1 Template-Tags: samsung, oran Content-Type: application/vnd.oasis.bpmn diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-mapping.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-mapping.json index b8b779c..702e1d9 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-mapping.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-mapping.json @@ -99,6 +99,33 @@ ], "version": 0 }, + { + "name": "vf-module-uuid", + "property": { + "description": "", + "required": false, + "type": "string" + }, + "input-param": false, + "dictionary-name": "vf-module-uuid", + "dictionary-source": "processor-db", + "dependencies": [ + "vf-module-model-customization-uuid" + ], + "version": 0 + }, + { + "name": "vf-module-model-invariant-uuid", + "property": { + "type": "string" + }, + "input-param": false, + "dictionary-name": "vf-module-model-invariant-uuid", + "dictionary-source": "processor-db", + "dependencies": [ + "vf-module-model-customization-uuid" + ] + }, { "name": "vf-module-model-customization-uuid", "property": { @@ -151,5 +178,109 @@ "dictionary-source": "input", "dependencies": [], "version": 0 + }, + { + "name": "k8s-rb-profile-namespace", + "property": { + "description": "K8s namespace to create helm chart for specified RB profile", + "type": "string", + "required": false, + "default": "default" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-namespace", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "k8s-rb-profile-k8s-version", + "property": { + "description": "K8s cluster version to create helm chart for specified RB profile", + "type": "string", + "required": false, + "default": "1.18.9" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-k8s-version", + "dictionary-source": "sdnc", + "dependencies": [ + "service-instance-id", + "vnf-id" + ] + }, + { + "name": "k8s-rb-profile-name", + "property": { + "description": "RB Profile name used in k8s plugin to identify Helm chart(s) where this mapping is providing override values.", + "type": "string", + "required": false, + "default": "default" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-name", + "dictionary-source": "default", + "dependencies": [] + }, + { + "name": "k8s-rb-instance-release-name", + "property": { + "description": "Name of the release for the helm package instance in k8s", + "type": "string", + "required": false, + "default": "vfw" + }, + "input-param": false, + "dictionary-name": "k8s-rb-instance-release-name", + "dictionary-source": "default", + "dependencies": [] + }, + { + "name": "k8s-rb-definition-name", + "property": { + "description": "RB Name identifier of Helm chart(s) in k8s plugin", + "type": "string", + "required": false, + "metadata": { + "transform-template": "${vf-module-model-invariant-uuid}" + } + }, + "input-param": false, + "dictionary-name": "k8s-rb-definition-name", + "dictionary-source": "default", + "dependencies": [ + "vf-module-model-invariant-uuid" + ] + }, + { + "name": "k8s-rb-definition-version", + "property": { + "description": "RB Version identifier of Helm chart(s) in k8s plugin", + "type": "string", + "required": false, + "metadata": { + "transform-template": "${vf-module-uuid}" + } + }, + "input-param": false, + "dictionary-name": "k8s-rb-definition-version", + "dictionary-source": "default", + "dependencies": [ + "vf-module-model-customization-uuid" + ] + }, + { + "name": "k8s-rb-profile-source", + "property": { + "description": "The source folder or file relative to 'Templates/k8s-profiles' folder", + "type": "string", + "required": true + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-source", + "dictionary-source": "default", + "dependencies": [] } ] diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-template.vtl b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-template.vtl index 014d074..84492a6 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-template.vtl +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/helm_simulator-template.vtl @@ -3,6 +3,31 @@ { "param-name": "k8s-rb-instance-release-name", "param-value": "default" + }, + { + "param-name": "k8s-rb-instance-release-name", + "param-value": "${k8s-rb-instance-release-name}" + }, + ##Profile name + { + "param-name": "k8s-rb-profile-name", + "param-value": "${k8s-rb-profile-name}" + }, + { + "param-name": "k8s-rb-config-template-name", + "param-value": "${k8s-rb-config-template-name}" + }, + { + "param-name": "k8s-rb-config-template-source", + "param-value": "${k8s-rb-config-template-source}" + }, + { + "param-name": "k8s-rb-config-name", + "param-value": "${k8s-rb-config-name}" + }, + { + "param-name": "k8s-rb-config-value-source", + "param-value": "${k8s-rb-config-value-source}" } ], "capability-data": [ diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/k8s-profiles/simple.tgz b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/k8s-profiles/simple.tgz new file mode 100644 index 0000000..adf69cd Binary files /dev/null and b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/k8s-profiles/simple.tgz differ diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-mapping.json b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-mapping.json index cba47d9..4ec1dd9 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-mapping.json +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-mapping.json @@ -100,5 +100,30 @@ "dictionary-source": "input", "dependencies": [], "version": 0 + }, + { + "name": "k8s-rb-profile-namespace", + "property": { + "description": "K8s namespace to create helm chart for specified profile", + "type": "string", + "default": "default" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-namespace", + "dictionary-source": "default", + "dependencies": [] + }, + { + "name": "k8s-rb-profile-k8s-version", + "property": { + "description": "K8s cluster version to create helm chart for specified RB profile", + "type": "string", + "required": false, + "default": "1.18.9" + }, + "input-param": false, + "dictionary-name": "k8s-rb-profile-k8s-version", + "dictionary-source": "default", + "dependencies": [] } ] diff --git a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-template.vtl b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-template.vtl index cc7d0d6..c9a87e8 100644 --- a/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-template.vtl +++ b/operations/a1-pe-sim-packages/resources/oran-sim-cba/Templates/vnf-template.vtl @@ -3,7 +3,15 @@ { "param-name": "vnf-ip-address", "param-value": "${vnf-ip-address}" - } + }, + { + "param-name": "k8s-rb-profile-namespace", + "param-value": "${k8s-rb-profile-namespace}" + }, + { + "param-name": "k8s-rb-profile-k8s-version", + "param-value": "${k8s-rb-profile-k8s-version}" + } ], "capability-data": [ { -- cgit 1.2.3-korg