aboutsummaryrefslogtreecommitdiffstats
path: root/components/model-catalog
diff options
context:
space:
mode:
authorLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2022-10-04 14:13:25 +0200
committerLukasz Rajewski <lukasz.rajewski@t-mobile.pl>2022-10-04 20:57:15 +0000
commitadc8f4c193a138f9cb06c145e16d56103acd5ecc (patch)
tree6c90da4c36bbc9e7a9bba216139844c34cdcf733 /components/model-catalog
parent4805631816cbb73192603bb5a1d0ffe5d71c8e30 (diff)
Fix the transform-templating for referenced complex types
After fix the transform-templating will be closer to the velocity artifact templating mechanism, what was not a case before, when templating with complex variables like json was not working. Issue-ID: CCSDK-3774 Signed-off-by: Lukasz Rajewski <lukasz.rajewski@t-mobile.pl> Change-Id: Icd5001cb2ea2de0220fe65a7c9c0510d1fba0911
Diffstat (limited to 'components/model-catalog')
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json8
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/data_types.json4
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json15
-rw-r--r--components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/transform-mapping.json51
4 files changed, 78 insertions, 0 deletions
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
index c506ad05e..e1509a6f0 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/activation-blueprint.json
@@ -188,6 +188,14 @@
"type": "artifact-mapping-resource",
"file": "Definitions/maxoccurrence-mapping.json"
},
+ "transform-template": {
+ "type": "artifact-template-velocity",
+ "file": "Templates/baseconfig-template.vtl"
+ },
+ "transform-mapping": {
+ "type": "artifact-mapping-resource",
+ "file": "Definitions/transform-mapping.json"
+ },
"notemplate-mapping": {
"type": "artifact-mapping-resource",
"file": "Definitions/notemplate-mapping.json"
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/data_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/data_types.json
index 94c587af7..1dd0f5280 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/data_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/data_types.json
@@ -52,6 +52,10 @@
"required": true,
"type": "string"
},
+ "private_net_id": {
+ "required": true,
+ "type": "string"
+ },
"firmware-version": {
"type" : "string"
},
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
index 757210167..9e69462f7 100644
--- a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/resources_definition_types.json
@@ -100,6 +100,21 @@
}
}
},
+ "int_pktgen_private_net_id": {
+ "tags": "int_pktgen_private_net_id",
+ "name": "int_pktgen_private_net_id",
+ "property": {
+ "description": "int_pktgen_private_net_id",
+ "type": "string"
+ },
+ "updated-by": "Lukasz Rajewski <lukasz.rajewski@t-mobile.pl>",
+ "sources": {
+ "default": {
+ "type": "source-default",
+ "properties": {}
+ }
+ }
+ },
"vnf_parameter": {
"tags": "vnf_parameter",
"name": "vnf_parameter",
diff --git a/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/transform-mapping.json b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/transform-mapping.json
new file mode 100644
index 000000000..14dec0942
--- /dev/null
+++ b/components/model-catalog/blueprint-model/test-blueprint/baseconfiguration/Definitions/transform-mapping.json
@@ -0,0 +1,51 @@
+[
+ {
+ "name": "service-instance-id",
+ "input-param": true,
+ "property": {
+ "type": "string"
+ },
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [
+ ]
+ },
+ {
+ "name": "vnf-id",
+ "input-param": true,
+ "property": {
+ "type": "string"
+ },
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": []
+ },
+ {
+ "name": "vnf_name",
+ "input-param": false,
+ "property": {
+ "type": "string"
+ },
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "name": "private_net_id",
+ "input-param": true,
+ "property": {
+ "type": "string",
+ "metadata": {
+ "transform-template": "${vnf_name}_private2"
+ }
+ },
+ "dictionary-name": "int_pktgen_private_net_id",
+ "dictionary-source": "default",
+ "dependencies": [
+ "vnf_name"
+ ]
+ }
+] \ No newline at end of file