aboutsummaryrefslogtreecommitdiffstats
path: root/heat/vFW_CNF_CDS/templates/cba/Templates
diff options
context:
space:
mode:
Diffstat (limited to 'heat/vFW_CNF_CDS/templates/cba/Templates')
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json561
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl126
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json1021
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl134
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json781
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl122
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json997
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl161
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json888
-rw-r--r--heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl114
10 files changed, 911 insertions, 3994 deletions
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
index efedb214..dd49ad28 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-mapping.json
@@ -1,399 +1,166 @@
[
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "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-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "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"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "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": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_gw_ip",
- "property": {
- "description": "Private unprotected network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_gw_ip",
- "property": {
- "description": "Private onap management network gateway ip",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "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-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "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"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
index 76eda6d3..888b8421 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/base_template-template.vtl
@@ -1,71 +1,105 @@
{
"capability-data": [
{
- "capability-name": "aai-vf-module-put",
+ "capability-name": "netbox-ip-assign",
"key-mapping": [
{
"output-key-mapping": [
{
- "resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
+ "resource-name": "onap_private_gw_ip",
+ "resource-value": "${onap_private_gw_ip}"
}
],
"payload": [
{
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${management-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-onap_private_gw_ip"
}
]
}
]
- }
- ],
- "resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
},
{
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
+ "capability-name": "generate-name",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vf_module_name",
+ "resource-value": "${vf-module-name}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "resource-name",
+ "param-value": "vf_module_name"
+ },
+ {
+ "param-name": "resource-value",
+ "param-value": "${vf-module-name}"
+ },
+ {
+ "param-name": "external-key",
+ "param-value": "${vf-module-id}_vf-module-name"
+ },
+ {
+ "param-name": "policy-instance-name",
+ "param-value": "${vf-naming-policy}"
+ },
+ {
+ "param-name": "naming-type",
+ "param-value": "VF-MODULE"
+ },
+ {
+ "param-name": "VNF_NAME",
+ "param-value": "${vnf_name}"
+ },
+ {
+ "param-name": "VF_MODULE_LABEL",
+ "param-value": "${vf-module-label}"
+ }
+ ]
+ }
+ ]
},
{
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+ "capability-name": "aai-vf-module-put",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "aai-vf-module-put",
+ "resource-value": ""
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "resource-accumulator-resolved-data": [
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
@@ -74,26 +108,14 @@
"param-value": "${k8s-rb-profile-namespace}"
},
{
- "param-name": "int_private1_gw_ip",
- "param-value": "${int_private1_gw_ip}"
- },
- {
"param-name": "int_private1_subnet_id",
"param-value": "unprotected-network-subnet-1"
},
{
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
- },
- {
"param-name": "int_private2_subnet_id",
"param-value": "protected-network-subnet-1"
},
{
- "param-name": "onap_private_gw_ip",
- "param-value": "${onap_private_gw_ip}"
- },
- {
"param-name": "onap_private_subnet_id",
"param-value": "management-network-subnet-1"
}
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
index 508c7339..2eae129f 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-mapping.json
@@ -1,893 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
- {
- "name": "vfw_int_private2_floating_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private2_floating_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "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"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
-
-
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
{
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
-
-
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
{
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
{
- "name": "vfw_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_onap_private_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
-
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
{
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
-
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vfw_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "10.0.4.1"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_ip",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_port",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "30235"
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "dcae_collector_port",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "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-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "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"
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "onap private net id",
- "type": "string"
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_net_id",
- "property": {
- "description": "private1 net id",
- "type": "string"
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_net_id",
- "property": {
- "description": "private2 net id",
- "type": "string"
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
},
- "input-param": false,
- "dictionary-name": "int_private2_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "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"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index 414d6865..754ff731 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -81,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -108,139 +102,17 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vfw_image_name",
- "param-value": "${vfw_image_name}"
- },
- {
- "param-name": "vfw_flavor_name",
- "param-value": "${vfw_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "vfw_int_private1_ip_0",
- "param-value": "${vfw_int_private1_ip_0}"
- },
- {
- "param-name": "vfw_int_private2_ip_0",
- "param-value": "${vfw_int_private2_ip_0}"
- },
- {
- "param-name": "vpg_int_private1_ip_0",
- "param-value": "${vpg_int_private1_ip_0}"
- },
- {
- "param-name": "vfw_int_private2_floating_ip",
- "param-value": "${vfw_int_private2_floating_ip}"
- },
- {
- "param-name": "dcae_collector_ip",
- "param-value": "${dcae_collector_ip}"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "${dcae_collector_port}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
index 4dfdaff4..70a95cb8 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-mapping.json
@@ -1,633 +1,186 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "cloud_env",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "key_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "dcae_collector_ip",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "10.0.4.1"
+ },
+ "input-param": false,
+ "dictionary-name": "dcae_collector_ip",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": true,
- "dictionary-name": "key_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "flavor_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default":"https://nexus.onap.org"
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "default",
- "dependencies": [
- ],
- "version": 0
- },
- {
- "name": "vpg_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default":"${vpg_onap_private_ip_0}"
+ "name": "dcae_collector_port",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "30235"
+ },
+ "input-param": false,
+ "dictionary-name": "dcae_collector_port",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vpg_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [
- ],
- "version": 0
- },
-
{
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "name": "int_private1_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "int_private1_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": true,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
-
-
{
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": true,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
-
-
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "pub_key",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "pub_key",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "SDNC_Policy.Config_MS_ONAP_CNF_NAMING_TIMESTAMP"
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vnf_name}"
+ "name": "onap_private_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "onap_private_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vpg_int_private1_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_int_private2_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vfw_int_private1_ip_0}"
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vsn_int_private2_ip_0}"
+ {
+ "name": "int_private2_net_cidr",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": true,
+ "dictionary-name": "int_private2_net_cidr",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "demo_artifacts_version",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "1.5.0"
+ },
+ "input-param": false,
+ "dictionary-name": "demo_artifacts_version",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
-
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string",
+ "default": "SDNC_Policy.Config_MS_ONAP_CNF_NAMING_TIMESTAMP"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "default",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "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",
- "default": "vfw-cnf-cds-base-profile"
+ {
+ "name": "aic-cloud-region",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "aic-cloud-region",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_gw_ip",
- "property": {
- "description": "Private unprotected network gateway ip",
- "type": "string",
- "default": "${int_private1_gw_ip}"
+ {
+ "name": "private1-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "private1-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private1_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string",
- "default": "${int_private2_gw_ip}"
+ {
+ "name": "private2-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "private2-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- },
- {
- "name": "onap_private_gw_ip",
- "property": {
- "description": "Private onap management network gateway ip",
- "type": "string",
- "default": "${onap_private_gw_ip}"
+ {
+ "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",
+ "default": "vfw-cnf-cds-base-profile"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "default",
+ "dependencies": []
},
- "input-param": false,
- "dictionary-name": "onap_private_gw_ip",
- "dictionary-source": "default",
- "dependencies": [
- ]
- }
+ {
+ "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": []
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 3e235e26..7acdc544 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -97,32 +97,6 @@
{
"output-key-mapping": [
{
- "resource-name": "onap_private_gw_ip",
- "resource-value": "${onap_private_gw_ip}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-onap_private_gw_ip"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vfw_int_private2_ip_0",
"resource-value": "${vfw_int_private2_ip_0}"
}
@@ -175,32 +149,6 @@
{
"output-key-mapping": [
{
- "resource-name": "vfw_int_private2_floating_ip",
- "resource-value": "${vfw_int_private2_floating_ip}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${private1-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vsn_int_private2_ip_0",
"resource-value": "${vsn_int_private2_ip_0}"
}
@@ -227,32 +175,6 @@
{
"output-key-mapping": [
{
- "resource-name": "vpg_onap_private_ip_0",
- "resource-value": "${vpg_onap_private_ip_0}"
- }
- ],
- "payload": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "prefix-id",
- "param-value": "${management-prefix-id}"
- },
- {
- "param-name": "vnf-id",
- "param-value": "${vnf-id}"
- },
- {
- "param-name": "external_key",
- "param-value": "${vnf-id}-vpg_onap_private_ip_0"
- }
- ]
- },
- {
- "output-key-mapping": [
- {
"resource-name": "vpg_int_private1_ip_0",
"resource-value": "${vpg_int_private1_ip_0}"
}
@@ -306,32 +228,16 @@
],
"resource-accumulator-resolved-data": [
{
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf-model-customization-uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
"param-name": "vf-naming-policy",
"param-value": "${vf-naming-policy}"
},
{
- "param-name": "image_name",
- "param-value": "${image_name}"
- },
- {
- "param-name": "flavor_name",
- "param-value": "${flavor_name}"
+ "param-name": "dcae_collector_ip",
+ "param-value": "${dcae_collector_ip}"
},
{
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
+ "param-name": "dcae_collector_port",
+ "param-value": "${dcae_collector_port}"
},
{
"param-name": "int_private1_net_cidr",
@@ -350,26 +256,6 @@
"param-value": "${demo_artifacts_version}"
},
{
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "pub_key",
- "param-value": "${pub_key}"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
index 2e3905cc..4a1b9150 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-mapping.json
@@ -1,835 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "openstack"
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "aic-cloud-region",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "aic-cloud-region",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vpg_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
- },
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vfw_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_onap_private_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vpg_int_private1_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vpg_int_private1_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_ip",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "10.0.4.1"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_ip",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "dcae_collector_port",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "30235"
- },
- "input-param": false,
- "dictionary-name": "dcae_collector_port",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "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-version",
- "property": {
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "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"
- },
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "onap_private_net_id",
- "property": {
- "description": "onap private net id",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private1_net_id",
- "property": {
- "description": "private1 net id",
- "type": "string"
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "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": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "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-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
+ },
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
+ },
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
+ },
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ },
+ {
+ "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"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
index 55ad7906..6f0461bb 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -1,6 +1,37 @@
{
"capability-data": [
{
+ "capability-name": "netbox-ip-assign",
+ "key-mapping": [
+ {
+ "output-key-mapping": [
+ {
+ "resource-name": "vpg_onap_private_ip_0",
+ "resource-value": "${vpg_onap_private_ip_0}"
+ }
+ ],
+ "payload": [
+ {
+ "param-name": "service-instance-id",
+ "param-value": "${service-instance-id}"
+ },
+ {
+ "param-name": "prefix-id",
+ "param-value": "${management-prefix-id}"
+ },
+ {
+ "param-name": "vnf-id",
+ "param-value": "${vnf-id}"
+ },
+ {
+ "param-name": "external_key",
+ "param-value": "${vnf-id}-vpg_onap_private_ip_0"
+ }
+ ]
+ }
+ ]
+ },
+ {
"capability-name": "generate-name",
"key-mapping": [
{
@@ -50,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -77,135 +102,17 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vpg_image_name",
- "param-value": "${vpg_image_name}"
- },
- {
- "param-name": "vpg_flavor_name",
- "param-value": "${vpg_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "int_private1_net_cidr",
- "param-value": "${int_private1_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "vfw_int_private1_ip_0",
- "param-value": "${vfw_int_private1_ip_0}"
- },
- {
- "param-name": "vpg_int_private1_ip_0",
- "param-value": "${vpg_int_private1_ip_0}"
- },
- {
- "param-name": "vsn_int_private2_ip_0",
- "param-value": "${vsn_int_private2_ip_0}"
- },
- {
- "param-name": "dcae_collector_ip",
- "param-value": "${dcae_collector_ip}"
- },
- {
- "param-name": "dcae_collector_port",
- "param-value": "${dcae_collector_port}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "${cloud_env}"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
- "param-name": "vpg_onap_private_ip_0",
- "param-value": "${vpg_onap_private_ip_0}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
index 5803ea65..3d3bbd22 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-mapping.json
@@ -1,752 +1,166 @@
[
- {
- "name": "cloud_env",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "openstack"
- },
- "input-param": false,
- "dictionary-name": "cloud_env",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
{
- "name": "nexus_artifact_repo",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nexus_artifact_repo",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "vf-module-name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vf-module-name}"
- },
- "input-param": false,
- "dictionary-name": "vf-module-name",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "nfc-naming-code",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "nfc-naming-code",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "demo_artifacts_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "demo_artifacts_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
-
- {
- "name": "install_script_version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "install_script_version",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "onap_private_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "onap_private_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private2_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private2_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "int_private1_net_cidr",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "int_private1_net_cidr",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "public_net_id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "public_net_id",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "sec_group",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "sec_group",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "service-instance-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "service-instance-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-label",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-label",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-module-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-type",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-module-type",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
- {
- "name": "vf-naming-policy",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vf-naming-policy",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfccustomizationuuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ "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"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfccustomizationuuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ],
- "version": 0
- },
-
- {
- "name": "vsn_flavor_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "flavor_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_image_name",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "image_name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vnf-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-id",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnf-model-customization-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnf-model-customization-uuid",
- "dictionary-source": "input",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vnfc-model-invariant-uuid",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vnfc-model-version",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vnfc-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vfccustomizationuuid"
- ],
- "version": 0
- },
- {
- "name": "vsn_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
- },
- "input-param": false,
- "dictionary-name": "vsn_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vfw_int_private2_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
+ {
+ "name": "vf-module-model-version",
+ "property": {
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-version",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ]
},
- "input-param": false,
- "dictionary-name": "vfw_int_private2_ip_0",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ],
- "version": 0
- },
- {
- "name": "vsn_onap_private_ip_0",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- },
- "default": "${vsn_onap_private_ip_0}"
+ {
+ "name": "vnf_name",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf_name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vsn_onap_private_ip_0",
- "dictionary-source": "default",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private1-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "service-instance-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "service-instance-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private1-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
{
- "name": "management-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ "name": "vf-module-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "management-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "private2-prefix-id",
- "property": {
- "description": "",
- "required": false,
- "type": "string",
- "status": "",
- "constraints": [
- {}
- ],
- "entry_schema": {
- "type": ""
- }
-
+ {
+ "name": "vf-module-label",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-label",
+ "dictionary-source": "processor-db",
+ "dependencies": [
+ "vf-module-model-customization-uuid"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "private2-prefix-id",
- "dictionary-source": "processor-db",
- "dependencies": [],
- "version": 0
- },
- {
- "name": "vf-module-model-invariant-uuid",
- "property": {
- "type": "string"
+ {
+ "name": "vf-module-model-customization-uuid",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-module-model-customization-uuid",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-model-invariant-uuid",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "name": "vf-module-model-version",
- "property": {
- "type": "string"
+ {
+ "name": "vf-naming-policy",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vf-naming-policy",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "vf-module-model-version",
- "dictionary-source": "processor-db",
- "dependencies": [
- "vf-module-model-customization-uuid"
- ]
- },
- {
- "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"
+ {
+ "name": "vnf-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "vnf-id",
+ "dictionary-source": "input",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-name",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "k8s-rb-profile-namespace",
- "property": {
- "description": "K8s namespace to create helm chart for specified profile",
- "type": "string",
- "default": "default"
+ {
+ "name": "management-prefix-id",
+ "property": {
+ "description": "",
+ "required": false,
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "management-prefix-id",
+ "dictionary-source": "processor-db",
+ "dependencies": [],
+ "version": 0
},
- "input-param": false,
- "dictionary-name": "k8s-rb-profile-namespace",
- "dictionary-source": "default",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- },
- {
- "name": "int_private2_gw_ip",
- "property": {
- "description": "Private protected network gateway ip",
- "type": "string"
+ {
+ "name": "k8s-rb-profile-namespace",
+ "property": {
+ "description": "K8s namespace to create helm chart for specified profile",
+ "type": "string"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-namespace",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
},
- "input-param": false,
- "dictionary-name": "int_private2_gw_ip",
- "dictionary-source": "sdnc",
- "dependencies": [
- "service-instance-id",
- "vnf-id"
- ]
- }
+ {
+ "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"
+ },
+ "input-param": false,
+ "dictionary-name": "k8s-rb-profile-name",
+ "dictionary-source": "sdnc",
+ "dependencies": [
+ "service-instance-id",
+ "vnf-id"
+ ]
+ }
]
diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index f71379c2..394bf16c 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -81,13 +81,7 @@
"output-key-mapping": [
{
"resource-name": "aai-vf-module-put",
- "resource-value": "${status}"
- }
- ],
- "payload": [
- {
- "param-name": "vf-module",
- "param-value": "vf-module"
+ "resource-value": ""
}
]
}
@@ -108,125 +102,23 @@
}
],
"resource-accumulator-resolved-data": [
- {
- "param-name": "service-instance-id",
- "param-value": "${service-instance-id}"
- },
- {
- "param-name": "vnf_name",
- "param-value": "${vnf_name}"
- },
- {
- "param-name": "vnf_model_customization_uuid",
- "param-value": "${vnf-model-customization-uuid}"
- },
+##RB name
{
"param-name": "vf-module-model-invariant-uuid",
"param-value": "${vf-module-model-invariant-uuid}"
},
+##RB version
{
"param-name": "vf-module-model-version",
"param-value": "${vf-module-model-version}"
},
{
- "param-name": "vf_module_id",
- "param-value": "${vf-module-id}"
- },
- {
- "param-name": "vf_module_type",
- "param-value": "${vf-module-type}"
- },
- {
- "param-name": "vf_module_customization_uuid",
- "param-value": "${vf-module-model-customization-uuid}"
- },
- {
- "param-name": "vfc_customization_uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "aic-cloud-region",
- "param-value": "${aic-cloud-region}"
- },
- {
- "param-name": "vnfc-model-customization-uuid",
- "param-value": "${vfccustomizationuuid}"
- },
- {
- "param-name": "vnfc-model-invariant-uuid",
- "param-value": "${vnfc-model-invariant-uuid}"
- },
- {
- "param-name": "vnfc-model-version",
- "param-value": "${vnfc-model-version}"
- },
- {
- "param-name": "nfc-naming-code",
- "param-value": "${nfc-naming-code}"
- },
- {
- "param-name": "vsn_image_name",
- "param-value": "${vsn_image_name}"
- },
- {
- "param-name": "vsn_flavor_name",
- "param-value": "${vsn_flavor_name}"
- },
- {
- "param-name": "public_net_id",
- "param-value": "${public_net_id}"
- },
- {
- "param-name": "int_private2_net_cidr",
- "param-value": "${int_private2_net_cidr}"
- },
- {
- "param-name": "onap_private_net_cidr",
- "param-value": "${onap_private_net_cidr}"
- },
- {
- "param-name": "vfw_int_private2_ip_0",
- "param-value": "${vfw_int_private2_ip_0}"
- },
- {
- "param-name": "vsn_int_private2_ip_0",
- "param-value": "${vsn_int_private2_ip_0}"
- },
- {
- "param-name": "demo_artifacts_version",
- "param-value": "${demo_artifacts_version}"
- },
- {
- "param-name": "install_script_version",
- "param-value": "${install_script_version}"
- },
- {
- "param-name": "key_name",
- "param-value": "${vnf_name}_key_name"
- },
- {
- "param-name": "cloud_env",
- "param-value": "openstack"
- },
- {
- "param-name": "sec_group",
- "param-value": "${sec_group}"
- },
- {
- "param-name": "nexus_artifact_repo",
- "param-value": "${nexus_artifact_repo}"
- },
- {
"param-name": "k8s-rb-profile-name",
"param-value": "${k8s-rb-profile-name}"
},
{
"param-name": "k8s-rb-profile-namespace",
"param-value": "${k8s-rb-profile-namespace}"
- },
- {
- "param-name": "int_private2_gw_ip",
- "param-value": "${int_private2_gw_ip}"
}
]
}