diff options
Diffstat (limited to 'ms/controllerblueprints/application/load/blueprints/vFW/Templates')
4 files changed, 125 insertions, 129 deletions
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl index b61ef63c..f25e9560 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl @@ -15,6 +15,14 @@ { "param-name": "aic-cloud-region", "param-value": "${aic-cloud-region}" + }, + { + "param-name": "onap_private_net_id", + "param-value": "${onap_private_net_id}" + }, + { + "param-name": "onap_private_subnet_id", + "param-value": "${onap_private_net_id}_sub" } ], "capability-data": [ @@ -33,7 +41,7 @@ }, { "param-name": "external-key", - "param-value": "${vnf-id}" + "param-value": "${vnf-id}_vnf_name" }, { "param-name": "policy-instance-name", @@ -60,6 +68,114 @@ ] } ] + }, + { + "capability-name": "netbox-ip-assign", + "key-mapping": [ + { + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${protected-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vfw_private_ip_1" + } + ], + "output-key-mapping": [ + { + "resource-name": "vfw_private_ip_1", + "resource-value": "${vfw_private_ip_1}" + } + ] + }, + { + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${unprotected-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vfw_private_ip_0" + } + ], + "output-key-mapping": [ + { + "resource-name": "vfw_private_ip_0", + "resource-value": "${vfw_private_ip_0}" + } + ] + }, + { + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${unprotected-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vpg_private_ip_0" + } + ], + "output-key-mapping": [ + { + "resource-name": "vpg_private_ip_0", + "resource-value": "${vpg_private_ip_0}" + } + ] + },{ + "payload": [ + { + "param-name": "service-instance-id", + "param-value": "${service-instance-id}" + }, + { + "param-name": "prefix-id", + "param-value": "${protected-prefix-id}" + }, + { + "param-name": "vnf-id", + "param-value": "${vnf-id}" + }, + { + "param-name": "external_key", + "param-value": "${vnf-id}-vsn_private_ip_0" + } + ], + "output-key-mapping": [ + { + "resource-name": "vsn_private_ip_0", + "resource-value": "${vsn_private_ip_0}" + } + ] + } + ] } ] }
\ No newline at end of file diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl index 3397a3cd..0e11b4bf 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl @@ -18,7 +18,7 @@ }, { "param-name": "vf_module_id", - "param-value": "${vf-module-id}" + "param-value": "${vnf-id}" }, { "param-name": "vf_module_type", @@ -37,10 +37,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "availability_zone_0", - "param-value": "${availability_zone_0}" - }, - { "param-name": "vm-type", "param-value": "${vm-type}" }, @@ -219,7 +215,7 @@ }, { "param-name": "external-key", - "param-value": "${vf-module-id}" + "param-value": "${vf-module-id}_vf_module_name" }, { "param-name": "policy-instance-name", @@ -283,84 +279,6 @@ "resource-value": "${vfw_private_ip_2}" } ] - }, - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vfw_private_ip_1" - } - ], - "output-key-mapping": [ - { - "resource-name": "vfw_private_ip_1", - "resource-value": "${vfw_private_ip_1}" - } - ] - }, - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vfw_private_ip_0" - } - ], - "output-key-mapping": [ - { - "resource-name": "vfw_private_ip_0", - "resource-value": "${vfw_private_ip_0}" - } - ] - }, - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${unprotected-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vpg_private_ip_0" - } - ], - "output-key-mapping": [ - { - "resource-name": "vpg_private_ip_0", - "resource-value": "${vpg_private_ip_0}" - } - ] } ] }, diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl index 0927a54d..c69aeb5f 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl @@ -37,10 +37,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "availability_zone_0", - "param-value": "${availability_zone_0}" - }, - { "param-name": "vm-type", "param-value": "${vm-type}" }, @@ -130,7 +126,7 @@ }, { "param-name": "unprotected_private_subnet_id", - "param-value": "{vnf-name}_unprotected_sub" + "param-value": "${vnf-name}_unprotected_sub" }, { "param-name": "unprotected_private_net_cidr", @@ -227,7 +223,7 @@ }, { "param-name": "external-key", - "param-value": "${vf-module-id}" + "param-value": "${vf-module-id}_vf_module_name" }, { "param-name": "policy-instance-name", @@ -246,7 +242,7 @@ "param-value": "${vnf-name}" }, { - "param-name": "VF_MODULE_LABLE", + "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" }, { diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl index 4336f40a..c681de5f 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl @@ -37,14 +37,6 @@ "param-value": "${aic-cloud-region}" }, { - "param-name": "aic_clli", - "param-value": "${aic_clli}" - }, - { - "param-name": "availability_zone_0", - "param-value": "${availability_zone_0}" - }, - { "param-name": "vm-type", "param-value": "${vm-type}" }, @@ -177,7 +169,7 @@ }, { "param-name": "external-key", - "param-value": "${vf-module-id}_vnfc_name" + "param-value": "${vf-module-id}_vsn_name_0" }, { "param-name": "policy-instance-name", @@ -219,7 +211,7 @@ }, { "param-name": "external-key", - "param-value": "${vf-module-id}" + "param-value": "${vf-module-id}_vf_module_name" }, { "param-name": "policy-instance-name", @@ -238,7 +230,7 @@ "param-value": "${vnf-name}" }, { - "param-name": "VF_MODULE_LABLE", + "param-name": "VF_MODULE_LABEL", "param-value": "${vf-module-label}" }, { @@ -283,32 +275,6 @@ "resource-value": "${vsn_private_ip_1}" } ] - }, - { - "payload": [ - { - "param-name": "service-instance-id", - "param-value": "${service-instance-id}" - }, - { - "param-name": "prefix-id", - "param-value": "${protected-prefix-id}" - }, - { - "param-name": "vf-module-id", - "param-value": "${vf-module-id}" - }, - { - "param-name": "external_key", - "param-value": "${vf-module-id}-vsn_private_ip_0" - } - ], - "output-key-mapping": [ - { - "resource-name": "vsn_private_ip_0", - "resource-value": "${vsn_private_ip_0}" - } - ] } ] }, |