diff options
author | 2020-01-10 12:35:01 -0800 | |
---|---|---|
committer | 2020-01-22 15:07:38 +0000 | |
commit | f29702c7952c99768f7ec2f378ae39916071b420 (patch) | |
tree | 9ca84982beb9f8dd35c6b184353a18235b2c42bf /components/model-catalog/blueprint-model/service-blueprint/vFW/Templates | |
parent | 0e5c78cec1e1b1ce4d1f6488f6264ca1daffef58 (diff) |
Update vFW_CDS packages
Issue-ID: CCSDK-1825
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Change-Id: I53668b3df0cf13ceaa78cbffc92df05db23fe642
Signed-off-by: Abdelmuhaimen Seaudi <abdelmuhaimen.seaudi@orange.com>
Diffstat (limited to 'components/model-catalog/blueprint-model/service-blueprint/vFW/Templates')
14 files changed, 2067 insertions, 1876 deletions
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl deleted file mode 100644 index 271c50738..000000000 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-template.vtl +++ /dev/null @@ -1,77 +0,0 @@ -{ - "resource-accumulator-resolved-data": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, - { - "param-name": "vnf_name", - "param-value": "${vnf-name}" - }, - { - "param-name": "vnf_model_customization_uuid", - "param-value": "${vnf-model-customization-uuid}" - }, - { - "param-name": "vf_module_id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "vf_module_type", - "param-value": "${vf-module-type}" - }, - { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" - }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" - }, - { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" - }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" - }, - { - "param-name": "vf_module_name", - "param-value": "${vnf-name}_base" - } - ], - "capability-data": [ - { - "capability-name": "aai-vf-module-put", - "key-mapping": [ - { - "payload": [ - { - "param-name": "vf-module", - "param-value": "vf-module" - } - ], - "output-key-mapping": [ - { - "resource-name": "aai-vf-module-put", - "resource-value": "${status}" - } - ] - } - ] - } - ] -}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json index 8123382ca..7ce97079a 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-mapping.json @@ -3,13 +3,11 @@ "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -18,22 +16,84 @@ "input-param": false, "dictionary-name": "service-instance-id", "dictionary-source": "input", + "dependencies": [], + "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": "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": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -51,13 +111,11 @@ "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -66,22 +124,18 @@ "input-param": false, "dictionary-name": "vf-module-model-customization-uuid", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vnf-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -90,22 +144,18 @@ "input-param": false, "dictionary-name": "vnf-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vf-module-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -114,22 +164,18 @@ "input-param": false, "dictionary-name": "vf-module-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -138,22 +184,18 @@ "input-param": false, "dictionary-name": "vnf-model-customization-uuid", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { "name": "aic-cloud-region", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -162,53 +204,48 @@ "input-param": false, "dictionary-name": "aic-cloud-region", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "nf-role", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "processor-db", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-name", + "name": "int_private2_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "int_private2_net_cidr", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -217,51 +254,51 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vnf_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "protected_private_net_cidr", + "name": "pub_key", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "pub_key", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 } -] + + +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl new file mode 100644 index 000000000..f19db4146 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template-template.vtl @@ -0,0 +1,109 @@ +{ + "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}" + }, + { + "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": "pub_key", + "param-value": "${pub_key}" + } + + ], + "capability-data": [ + { + "capability-name": "generate-name", + "key-mapping": [ + { + "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": "VF_MODULE_TYPE", + "param-value": "${vf-module-type}" + } + ], + "output-key-mapping": [ + { + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" + } + ] + } + ] + }, + { + "capability-name": "aai-vf-module-put", + "key-mapping": [ + { + "payload": [ + { + "param-name": "vf-module", + "param-value": "vf-module" + } + ], + "output-key-mapping": [ + { + "resource-name": "aai-vf-module-put", + "resource-value": "${status}" + } + ] + } + ] + } + ] +}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json new file mode 100644 index 000000000..50ab8d801 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-mapping.json @@ -0,0 +1,112 @@ +[ + { + "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": "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": "active-streams", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "active-streams", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + + { + "name": "put-active-streams", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "put-active-streams", + "dictionary-source": "sdnc", + "dependencies": [ + "vpg_onap_private_ip_0", + "active-streams" + + ], + "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 + } +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl new file mode 100644 index 000000000..90aaecd12 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/nf-params-template.vtl @@ -0,0 +1,5 @@ +{ + "vpg_onap_private_ip_0": "${vpg_onap_private_ip_0}", + "active-streams": "${active-streams}", + "status": "${put-active-streams}" +}
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json index 148696443..86a5cc857 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-mapping.json @@ -1,70 +1,66 @@ [ { - "name": "service-instance-id", + "name": "cloud_env", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", + "dictionary-name": "cloud_env", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-id", + "name": "vpg_int_private1_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", + "dictionary-name": "vpg_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "vnf-name", + { + "name": "nexus_artifact_repo", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "nexus_artifact_repo", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -72,216 +68,237 @@ ], "version": 0 }, + + + { - "name": "vnf-model-customization-uuid", + "name": "vfw_int_private2_floating_ip", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private2_floating_ip", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "vfw_int_private1_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-id", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vf-module-type", + "name": "vfw_int_private2_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", - "dictionary-source": "processor-db", + "dictionary-name": "vfw_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + + + + + { - "name": "vf-module-model-customization-uuid", + "name": "private1-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "private1-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], "version": 0 }, - { - "name": "vfccustomizationuuid", + { + "name": "management-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", + "dictionary-name": "management-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - "vf-module-model-customization-uuid" - ], + "dependencies": [], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "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": "" } + }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "vnfc-model-invariant-uuid", + { + "name": "demo_artifacts_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "demo_artifacts_version", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + + + { - "name": "vnfc-model-version", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", + "dictionary-name": "nfc-naming-code", "dictionary-source": "processor-db", "dependencies": [ "vfccustomizationuuid" @@ -289,97 +306,90 @@ "version": 0 }, { - "name": "nf-role", + "name": "onap_private_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vFW" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nfc-naming-code", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "public_net_id", + { + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, - { - "name": "image_name", + { + "name": "int_private2_net_cidr", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "int_private2_net_cidr", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -388,23 +398,21 @@ "version": 0 }, { - "name": "key_name", + "name": "public_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", + "dictionary-name": "public_net_id", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -412,7 +420,8 @@ ], "version": 0 }, - { + + { "name": "pub_key", "property": { "description": "", @@ -420,9 +429,7 @@ "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" @@ -438,23 +445,21 @@ "version": 0 }, { - "name": "onap_private_net_id", + "name": "sec_group", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", + "dictionary-name": "sec_group", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -463,319 +468,351 @@ "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "service-instance-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, + { - "name": "unprotected_private_net_cidr", + "name": "vfw_name_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vfw_name_0}" + }, + "input-param": false, + "dictionary-name": "vfw_name_0", + "dictionary-source": "default", + "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": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "protected_private_net_cidr", + "name": "vf-module-label", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", + "dictionary-name": "vf-module-label", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "nexus_artifact_repo" + } }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vf-module-type", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", + "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": "onap_private_net_cidr", + "name": "vfccustomizationuuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", + "dictionary-name": "vfccustomizationuuid", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, + { - "name": "vfw_name_0", + "name": "vnf-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfw_name_0", + "dictionary-name": "vnf-id", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vf-naming-policy", + "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vf_module_name", + "name": "vnf_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", + "dictionary-name": "vnfc-model-invariant-uuid", "dictionary-source": "processor-db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vfw_image_name", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } - }, + }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", + "dictionary-name": "image_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, - { - "name": "vfw_private_ip_2", + { + "name": "vfw_flavor_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } - }, + }, "input-param": false, - "dictionary-name": "vfw_private_ip_2", - "dictionary-source": "input", + "dictionary-name": "flavor_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, { - "name": "vnf_name", + "name": "vnfc-model-version", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf_name", - "dictionary-source": "input", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl index 6864a36fe..c64133e1f 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -37,10 +34,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, - { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" }, @@ -53,68 +46,32 @@ "param-value": "${vnfc-model-version}" }, { - "param-name": "nfc-function", - "param-value": "${nf-role}" - }, - { "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" + "param-name": "vfw_image_name", + "param-value": "${vfw_image_name}" }, { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" + "param-name": "vfw_flavor_name", + "param-value": "${vfw_flavor_name}" }, { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" + "param-name": "public_net_id", + "param-value": "${public_net_id}" }, { "param-name": "pub_key", "param-value": "${pub_key}" }, - { - "param-name": "public_net_id", - "param-value": "${public_net_id}" + { + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" }, - { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + { + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -124,38 +81,59 @@ "param-name": "onap_private_subnet_id", "param-value": "${onap_private_subnet_id}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + { + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" + { + "param-name": "vfw_int_private1_ip_0", + "param-value": "${vfw_int_private1_ip_0}" }, - { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" + { + "param-name": "vfw_int_private2_ip_0", + "param-value": "${vfw_int_private2_ip_0}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + { + "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": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" + "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": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + "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": "onap_private_net_cidr", - "param-value": "${onap_private_net_cidr}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } + ], "capability-data": [ { @@ -180,16 +158,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -207,31 +181,27 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VF-MODULE" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -244,8 +214,8 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } @@ -262,21 +232,21 @@ }, { "param-name": "prefix-id", - "param-value": "${private-prefix-id}" + "param-value": "${management-prefix-id}" }, { - "param-name": "vf-module-id", + "param-name": "vf_module_id", "param-value": "${vf-module-id}" }, { "param-name": "external_key", - "param-value": "${vf-module-id}-vfw_private_ip_2" + "param-value": "${vf-module-id}-vfw_onap_private_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_2", - "resource-value": "${vfw_private_ip_2}" + "resource-name": "vfw_onap_private_ip_0", + "resource-value": "${vfw_onap_private_ip_0}" } ] } @@ -290,10 +260,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -304,35 +270,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "KEY", - "resource-value": "${vnf_name}" - }, - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vfw_name_0}" - }, - { - "resource-name": "ipv4-oam-address", - "resource-value": "${vfw_private_ip_2}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json deleted file mode 100644 index d764572e4..000000000 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-mapping.json +++ /dev/null @@ -1,461 +0,0 @@ -[ - { - "name": "service-instance-id", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vnf-id", - "property": { - "description": "", - "required": true, - "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": true, - "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": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "onap_private_net_id", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "onap_private_net_id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "onap_private_subnet_id", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "key_name", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "image_name", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "Ubuntu 14.04 LTS Generic" - }, - "input-param": false, - "dictionary-name": "image_name", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "pub_key", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - }, - "input-param": false, - "dictionary-name": "pub_key", - "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": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vf-naming-policy", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" - }, - "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "nf-role", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "processor-db", - "dependencies": [ - "vnf-model-customization-uuid" - ], - "version": 0 - }, - { - "name": "vfw_private_ip_1", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vfw_private_ip_1", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vfw_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vfw_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vpg_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vpg_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vsn_private_ip_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vsn_private_ip_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "protected-prefix-id", - "property": { - "description": "", - "required": false, - "type": "integer", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "protected-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "unprotected-prefix-id", - "property": { - "description": "", - "required": false, - "type": "integer", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "unprotected-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "vf-nf-code", - "property": { - "description": "", - "required": true, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "vf-nf-code", - "dictionary-source": "processor-db", - "dependencies": [ - "vnf-model-customization-uuid" - ], - "version": 0 - } -]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json new file mode 100644 index 000000000..f2cb91935 --- /dev/null +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-mapping.json @@ -0,0 +1,629 @@ +[ + { + "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": "" + } + }, + "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" + }, + "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": "" + } + }, + "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_VNF_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}" + }, + "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": "onap_private_net_id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "onap_private_net_id", + "dictionary-source": "input", + "dependencies": [], + "version": 0 + }, + { + "name": "onap_private_subnet_id", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + } + + }, + "input-param": false, + "dictionary-name": "onap_private_subnet_id", + "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": "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": "vsn_int_private2_ip_0", + "property": { + "description": "", + "required": false, + "type": "string", + "status": "", + "constraints": [ + {} + ], + "entry_schema": { + "type": "" + }, + "default": "${vsn_int_private2_ip_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": "" + } + + }, + "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": "" + } + + }, + "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": "" + } + + }, + "input-param": false, + "dictionary-name": "private2-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], + "version": 0 + } +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl index f7947ef8f..e114abe48 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw-vnf-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vnf-template.vtl @@ -4,10 +4,7 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf-model-customization-uuid", "param-value": "${vnf-model-customization-uuid}" @@ -17,20 +14,65 @@ "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": "public_net_id", + "param-value": "${public_net_id}" + }, + { + "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_id", "param-value": "${onap_private_net_id}" }, { + "param-name": "onap_private_subnet_id", + "param-value": "${onap_private_subnet_id}" + }, + { + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" + }, + { + "param-name": "demo_artifacts_version", + "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": "image_name", - "param-value": "${image_name}" + "param-name": "cloud_env", + "param-value": "${cloud_env}" }, { - "param-name": "onap_private_subnet_id", - "param-value": "${onap_private_subnet_id}" + "param-name": "sec_group", + "param-value": "${sec_group}" + }, + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } ], "capability-data": [ @@ -56,10 +98,6 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNF" }, @@ -88,7 +126,7 @@ }, { "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" + "param-value": "${private2-prefix-id}" }, { "param-name": "vnf-id", @@ -96,13 +134,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vfw_private_ip_1" + "param-value": "${vnf-id}-vfw_int_private2_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_1", - "resource-value": "${vfw_private_ip_1}" + "resource-name": "vfw_int_private2_ip_0", + "resource-value": "${vfw_int_private2_ip_0}" } ] }, @@ -114,7 +152,7 @@ }, { "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" + "param-value": "${private1-prefix-id}" }, { "param-name": "vnf-id", @@ -122,13 +160,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vfw_private_ip_0" + "param-value": "${vnf-id}-vfw_int_private1_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vfw_private_ip_0", - "resource-value": "${vfw_private_ip_0}" + "resource-name": "vfw_int_private1_ip_0", + "resource-value": "${vfw_int_private1_ip_0}" } ] }, @@ -140,7 +178,7 @@ }, { "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" + "param-value": "${private1-prefix-id}" }, { "param-name": "vnf-id", @@ -148,13 +186,13 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vpg_private_ip_0" + "param-value": "${vnf-id}-vfw_int_private2_floating_ip" } ], "output-key-mapping": [ { - "resource-name": "vpg_private_ip_0", - "resource-value": "${vpg_private_ip_0}" + "resource-name": "vfw_int_private2_floating_ip", + "resource-value": "${vfw_int_private2_floating_ip}" } ] }, @@ -166,7 +204,7 @@ }, { "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" + "param-value": "${private2-prefix-id}" }, { "param-name": "vnf-id", @@ -174,26 +212,65 @@ }, { "param-name": "external_key", - "param-value": "${vnf-id}-vsn_private_ip_0" + "param-value": "${vnf-id}-vsn_int_private2_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vsn_private_ip_0", - "resource-value": "${vsn_private_ip_0}" + "resource-name": "vsn_int_private2_ip_0", + "resource-value": "${vsn_int_private2_ip_0}" } ] - } - ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ + }, + { + "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_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": "${private1-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vpg_int_private1_ip_0" + } + ], "output-key-mapping": [ { - "resource-name": "key_name", - "resource-value": "${vnf_name}_key" + "resource-name": "vpg_int_private1_ip_0", + "resource-value": "${vpg_int_private1_ip_0}" } ] } diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json index 15531370c..8d17414c4 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-mapping.json @@ -1,70 +1,85 @@ [ { - "name": "service-instance-id", + "name": "cloud_env", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "openstack" }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "cloud_env", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vnf-id", + "name": "nexus_artifact_repo", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnf-name", + "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": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", + "dictionary-name": "demo_artifacts_version", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -73,313 +88,305 @@ "version": 0 }, { - "name": "vnf-model-customization-uuid", + "name": "install_script_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "aic-cloud-region", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-id", + "dictionary-name": "aic-cloud-region", "dictionary-source": "input", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vf-module-type", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", + "dictionary-name": "nfc-naming-code", "dictionary-source": "processor-db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf-module-model-customization-uuid", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vfccustomizationuuid", + "name": "onap_private_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "name": "public_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "public_net_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-invariant-uuid", + "name": "sec_group", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "sec_group", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-version", + "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", - "dictionary-source": "processor-db", - "dependencies": [ - "vfccustomizationuuid" - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nf-role", + "name": "vf-module-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vPG" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", - "dependencies": [ - "vnf-model-customization-uuid" - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nfc-naming-code", + "name": "vf-module-label", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", + "dictionary-name": "vf-module-label", "dictionary-source": "processor-db", "dependencies": [ - "vfccustomizationuuid" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "public_net_id", + "name": "vf-module-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", + "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": "image_name", + "name": "vf-naming-policy", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "vf-naming-policy", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -388,48 +395,43 @@ "version": 0 }, { - "name": "key_name", + "name": "vfccustomizationuuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "sdnc", + "dictionary-name": "vfccustomizationuuid", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "pub_key", + "name": "vpg_flavor_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "pub_key", + "dictionary-name": "flavor_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -438,23 +440,21 @@ "version": 0 }, { - "name": "onap_private_net_id", + "name": "vpg_image_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", + "dictionary-name": "image_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -463,23 +463,21 @@ "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "vnf_name", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", + "dictionary-name": "vnf_name", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -488,321 +486,288 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vpg_name_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vpg_name_0}" }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vpg_name_0", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "onap_private_net_cidr", + "name": "private2-prefix-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", + "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "vfw_private_ip_0", + "name": "management-prefix-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vfw_private_ip_0", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "management-prefix-id", + "dictionary-source": "processor-db", + "dependencies": [], "version": 0 }, { - "name": "vsn_private_ip_0", + "name": "vnf-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vsn_private_ip_0", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "nexus_artifact_repo" + } }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vpg_private_ip_0", + "name": "vnfc-model-version", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_private_ip_0", - "dictionary-source": "sdnc", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vpg_name_0", + "name": "vfw_int_private1_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_name_0", - "dictionary-source": "input", + "dictionary-name": "vfw_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-naming-policy", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VPG_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf_module_name", + "name": "int_private2_net_cidr", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "int_private2_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vpg_onap_private_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", - "dictionary-source": "processor-db", + "dictionary-name": "vpg_onap_private_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vpg_int_private1_ip_0", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", + "dictionary-name": "vpg_int_private1_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vpg_private_ip_1", + "name": "vsn_int_private2_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vpg_private_ip_1", - "dictionary-source": "input", + "dictionary-name": "vsn_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl index 2ff6596ee..311cb94b8 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpkg-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -37,10 +34,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, - { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" }, @@ -60,57 +53,22 @@ "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, + { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" - }, - { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" - }, - { - "param-name": "pub_key", - "param-value": "${pub_key}" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" + "param-name": "vpg_image_name", + "param-value": "${vpg_image_name}" }, { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" + "param-name": "vpg_flavor_name", + "param-value": "${vpg_flavor_name}" }, - { + { "param-name": "public_net_id", "param-value": "${public_net_id}" }, { - "param-name": "protected_private_net_id", - "param-value": "zdfw1fwl01_protected" + "param-name": "int_private1_net_cidr", + "param-value": "${int_private1_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -121,49 +79,55 @@ "param-value": "${onap_private_subnet_id}" }, { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" + "param-name": "onap_private_net_cidr", + "param-value": "${onap_private_net_cidr}" }, { - "param-name": "unprotected_private_subnet_id", - "param-value": "${vnf-name}_unprotected_sub" + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" + "param-name": "vfw_int_private1_ip_0", + "param-value": "${vfw_int_private1_ip_0}" }, { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" + "param-name": "vpg_int_private1_ip_0", + "param-value": "${vpg_int_private1_ip_0}" }, { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + "param-name": "vsn_int_private2_ip_0", + "param-value": "${vsn_int_private2_ip_0}" }, { - "param-name": "onap_private_net_cidr", - "param-value": "${onap_private_net_cidr}" + "param-name": "demo_artifacts_version", + "param-value": "${demo_artifacts_version}}" }, { - "param-name": "vfw_private_ip_0", - "param-value": "${vfw_private_ip_0}" + "param-name": "install_script_version", + "param-value": "${install_script_version}}" }, - { - "param-name": "vsn_private_ip_0", - "param-value": "${vsn_private_ip_0}" + { + "param-name": "key_name", + "param-value": "${vnf_name}_key_name" }, - { - "param-name": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + { + "param-name": "cloud_env", + "param-value": "$(cloud_env)" }, - { + { "param-name": "sec_group", "param-value": "${sec_group}" }, - { - "param-name": "vpg_private_ip_0", - "param-value": "${vpg_private_ip_0}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" + }, + { + "param-name": "vpg_onap_private_ip_0", + "param-value": "${vpg_onap_private_ip_0}" } + + ], "capability-data": [ { @@ -188,16 +152,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -215,15 +175,15 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", @@ -239,7 +199,7 @@ }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -252,44 +212,14 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" - } - ] - } - ] - }, - { - "capability-name": "netbox-ip-assign", - "key-mapping": [ - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${private-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vpg_private_ip_1" - } - ], - "output-key-mapping": [ - { - "resource-name": "vpg_private_ip_1", - "resource-value": "${vpg_private_ip_1}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } ] }, + { "capability-name": "aai-vf-module-put", "key-mapping": [ @@ -298,10 +228,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -312,27 +238,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vpg_name_0}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json index 3d9c0370c..532e157f6 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-mapping.json @@ -1,360 +1,364 @@ [ { - "name": "service-instance-id", + "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": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "service-instance-id", - "dictionary-source": "input", + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vnf-id", + "name": "vf-module-name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vf-module-name}" }, "input-param": false, - "dictionary-name": "vnf-id", - "dictionary-source": "input", - "dependencies": [ - - ], + "dictionary-name": "vf-module-name", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vnf-name", + "name": "nfc-naming-code", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnf-name", - "dictionary-source": "sdnc", + "dictionary-name": "nfc-naming-code", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vnf-model-customization-uuid", + "name": "dcae_collector_ip", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "10.0.4.1" }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "dcae_collector_ip", + "dictionary-source": "default", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-id", + "name": "dcae_collector_port", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "30235" }, "input-param": false, - "dictionary-name": "vf-module-id", - "dictionary-source": "input", + "dictionary-name": "dcae_collector_port", + "dictionary-source": "default", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-type", + "name": "demo_artifacts_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-type", - "dictionary-source": "processor-db", + "dictionary-name": "demo_artifacts_version", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, + { - "name": "vf-module-model-customization-uuid", + "name": "install_script_version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "install_script_version", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vfccustomizationuuid", + "name": "vnf_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", - "dictionary-source": "processor-db", + "dictionary-name": "vnf_name", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "aic-cloud-region", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "onap_private_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vm-type", + "name": "onap_private_net_id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vm-type", - "dictionary-source": "processor-db", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-invariant-uuid", + "name": "int_private2_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", - "dictionary-source": "processor-db", + "dictionary-name": "int_private2_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vnfc-model-version", + "name": "int_private1_net_cidr", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vnfc-model-version", - "dictionary-source": "processor-db", + "dictionary-name": "int_private1_net_cidr", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nf-role", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "vSN" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "sdnc", "dependencies": [ - "vnf-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nfc-naming-code", + "name": "public_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "nfc-naming-code", - "dictionary-source": "processor-db", + "dictionary-name": "public_net_id", + "dictionary-source": "sdnc", "dependencies": [ - "vfccustomizationuuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "image_name", + "name": "sec_group", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "image_name", + "dictionary-name": "sec_group", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -363,124 +367,125 @@ "version": 0 }, { - "name": "public_net_id", + "name": "service-instance-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "value": "public_net_id", - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "service-instance-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "key_name", + "name": "vf-module-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "key_name", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "pub_key", + "name": "vf-module-label", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "pub_key", - "dictionary-source": "sdnc", + "dictionary-name": "vf-module-label", + "dictionary-source": "processor-db", "dependencies": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "onap_private_net_id", + "name": "vf-module-model-customization-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_id", - "dictionary-source": "sdnc", + "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": [ - "service-instance-id", - "vnf-id" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "vf-naming-policy", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", + "dictionary-name": "vf-naming-policy", "dictionary-source": "sdnc", "dependencies": [ "service-instance-id", @@ -489,320 +494,307 @@ "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "vfccustomizationuuid", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", + "dictionary-name": "vfccustomizationuuid", "dictionary-source": "processor-db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, + { - "name": "protected_private_net_cidr", + "name": "vsn_flavor_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "flavor_name", + "dictionary-source": "sdnc", "dependencies": [ - - ], + "service-instance-id", + "vnf-id" + ], "version": 0 }, { - "name": "onap_private_net_cidr", + "name": "vsn_image_name", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", - "dictionary-source": "processor-db", + "dictionary-name": "image_name", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "vsn_name_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" }, - "value": "nexus_artifact_repo", - "default": "nexus_artifact_repo" + "default": "${vsn_name_0}" }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", + "dictionary-name": "vsn_name_0", "dictionary-source": "default", - "dependencies": [ - - ], + "dependencies": [], "version": 0 }, { - "name": "sec_group", + "name": "vnf-id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", - "dependencies": [ - - ], + "dictionary-name": "vnf-id", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vfw_private_ip_1", + "name": "vnf-model-customization-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vfw_private_ip_1", - "dictionary-source": "sdnc", - "dependencies": [ - "service-instance-id", - "vnf-id" - ], + "dictionary-name": "vnf-model-customization-uuid", + "dictionary-source": "input", + "dependencies": [], "version": 0 }, { - "name": "vsn_name_0", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vsn_name_0", - "dictionary-source": "input", + "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf-naming-policy", + "name": "vnfc-model-version", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VSN_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "processor-db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "vf_module_name", + "name": "vsn_int_private2_ip_0", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "vsn_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vf-module-label", + "name": "vfw_int_private2_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } }, "input-param": false, - "dictionary-name": "vf-module-label", - "dictionary-source": "processor-db", + "dictionary-name": "vfw_int_private2_ip_0", + "dictionary-source": "sdnc", "dependencies": [ - "vf-module-model-customization-uuid" + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "private-prefix-id", + "name": "vsn_onap_private_ip_0", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" - } + }, + "default": "${vsn_onap_private_ip_0}" }, "input-param": false, - "dictionary-name": "private-prefix-id", - "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dictionary-name": "vsn_onap_private_ip_0", + "dictionary-source": "default", + "dependencies": [], "version": 0 }, { - "name": "vsn_private_ip_1", + "name": "private1-prefix-id", "property": { "description": "", "required": false, "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "vsn_private_ip_1", - "dictionary-source": "input", - "dependencies": [ + "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": "protected-prefix-id", + "name": "private2-prefix-id", "property": { "description": "", "required": false, - "type": "integer", + "type": "string", "status": "", "constraints": [ - { - - } + {} ], "entry_schema": { "type": "" } + }, "input-param": false, - "dictionary-name": "protected-prefix-id", + "dictionary-name": "private2-prefix-id", "dictionary-source": "processor-db", - "dependencies": [ - - ], + "dependencies": [], "version": 0 } -] +]
\ No newline at end of file diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl index 11fcea9fd..7faf97739 100644 --- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl +++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn-template.vtl @@ -4,13 +4,10 @@ "param-name": "service-instance-id", "param-value": "${service-instance-id}" }, - { - "param-name": "vnf_id", - "param-value": "${vnf-id}" - }, + { "param-name": "vnf_name", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "vnf_model_customization_uuid", @@ -36,10 +33,7 @@ "param-name": "aic-cloud-region", "param-value": "${aic-cloud-region}" }, - { - "param-name": "vm-type", - "param-value": "${vm-type}" - }, + { "param-name": "vnfc-model-customization-uuid", "param-value": "${vfccustomizationuuid}" @@ -53,72 +47,28 @@ "param-value": "${vnfc-model-version}" }, { - "param-name": "nfc-function", - "param-value": "${nf-role}" - }, - { "param-name": "nfc-naming-code", "param-value": "${nfc-naming-code}" }, + { - "param-name": "cloud_env", - "param-value": "openstack" - }, - { - "param-name": "repo_url_artifacts", - "param-value": "https://nexus.onap.org/content/groups/staging" - }, - { - "param-name": "repo_url_blob", - "param-value": "https://nexus.onap.org/content/repositories/raw" - }, - { - "param-name": "dcae_collector_port", - "param-value": "8080" - }, - { - "param-name": "image_name", - "param-value": "${image_name}" - }, - { - "param-name": "flavor_name", - "param-value": "m1.medium" - }, - { - "param-name": "install_script_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "key_name", - "param-value": "${key_name}" - }, - { - "param-name": "pub_key", - "param-value": "${pub_key}" + "param-name": "vsn_image_name", + "param-value": "${vsn_image_name}" }, { - "param-name": "demo_artifacts_version", - "param-value": "1.2.1-SNAPSHOT" - }, - { - "param-name": "dcae_collector_ip", - "param-value": "10.0.4.1" + "param-name": "vsn_flavor_name", + "param-value": "${vsn_flavor_name}" }, { "param-name": "public_net_id", "param-value": "${public_net_id}" - }, + }, + + + { - "param-name": "unprotected_private_net_id", - "param-value": "${vnf-name}_unprotected" - }, - { - "param-name": "protected_private_subnet_id", - "param-value": "${vnf-name}_protected_sub" - }, - { - "param-name": "protected_private_net_id", - "param-value": "${vnf-name}_protected" + "param-name": "int_private2_net_cidr", + "param-value": "${int_private2_net_cidr}" }, { "param-name": "onap_private_net_id", @@ -128,30 +78,45 @@ "param-name": "onap_private_subnet_id", "param-value": "${onap_private_subnet_id}" }, - { - "param-name": "unprotected_private_net_cidr", - "param-value": "${unprotected_private_net_cidr}" - }, - { - "param-name": "protected_private_net_cidr", - "param-value": "${protected_private_net_cidr}" - }, - { + { "param-name": "onap_private_net_cidr", "param-value": "${onap_private_net_cidr}" }, { - "param-name": "nexus_artifact_repo", - "param-value": "${nexus_artifact_repo}" + "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": "vfw_private_ip_1", - "param-value": "${vfw_private_ip_1}" + { + "param-name": "nexus_artifact_repo", + "param-value": "${nexus_artifact_repo}" } + + + ], "capability-data": [ { @@ -176,16 +141,12 @@ "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VNFC" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "NFC_NAMING_CODE", @@ -203,31 +164,27 @@ "payload": [ { "param-name": "resource-name", - "param-value": "vf_module_name" + "param-value": "vf-module-name" }, { "param-name": "resource-value", - "param-value": "${vf_module_name}" + "param-value": "${vf-module-name}" }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vf_module_name" + "param-value": "${vf-module-id}_vf-module-name" }, { "param-name": "policy-instance-name", "param-value": "${vf-naming-policy}" }, { - "param-name": "nf-role", - "param-value": "${nf-role}" - }, - { "param-name": "naming-type", "param-value": "VF-MODULE" }, { "param-name": "VNF_NAME", - "param-value": "${vnf-name}" + "param-value": "${vnf_name}" }, { "param-name": "VF_MODULE_LABEL", @@ -240,8 +197,8 @@ ], "output-key-mapping": [ { - "resource-name": "vf_module_name", - "resource-value": "${vf_module_name}" + "resource-name": "vf-module-name", + "resource-value": "${vf-module-name}" } ] } @@ -258,21 +215,21 @@ }, { "param-name": "prefix-id", - "param-value": "${private-prefix-id}" + "param-value": "${management-prefix-id}" }, { - "param-name": "vf-module-id", + "param-name": "vf_module_id", "param-value": "${vf-module-id}" }, { "param-name": "external_key", - "param-value": "${vf-module-id}-vsn_private_ip_1" + "param-value": "${vf-module-id}-vsn_onap_private_ip_0" } ], "output-key-mapping": [ { - "resource-name": "vsn_private_ip_1", - "resource-value": "${vsn_private_ip_1}" + "resource-name": "vsn_onap_private_ip_0", + "resource-value": "${vsn_onap_private_ip_0}" } ] } @@ -286,10 +243,6 @@ { "param-name": "vf-module", "param-value": "vf-module" - }, - { - "param-name": "vnfc", - "param-value": "vnfc" } ], "output-key-mapping": [ @@ -300,35 +253,6 @@ ] } ] - }, - { - "capability-name": "unresolved-composite-data", - "key-mapping": [ - { - "output-key-mapping": [ - { - "resource-name": "volume-group-name", - "resource-value": "${volume_group_name}" - }, - { - "resource-name": "vf-module-name", - "resource-value": "${vf_module_name}" - }, - { - "resource-name": "vnfc-name", - "resource-value": "${vsn_name_0}" - }, - { - "resource-name": "ipv4-oam-address", - "resource-value": "${vsn_private_ip_1}" - }, - { - "resource-name": "ipv4-oam-address-prefix", - "resource-value": "${onap_private_net_cidr}" - } - ] - } - ] } ] }
\ No newline at end of file |