From 6e74d48701ebda60543fce079be083188f1c0733 Mon Sep 17 00:00:00 2001 From: Alexis de Talhouët Date: Tue, 9 Oct 2018 13:59:17 -0400 Subject: Fix DDs, blueprint and template for vFW CDS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia52b9717df2ef67dd5bf667515c55816b750a199 Issue-ID: CCSDK-601 Signed-off-by: Alexis de Talhouët --- .../blueprints/vFW/Definitions/vFW_spinup.json | 606 +++++++++++---------- .../blueprints/vFW/Templates/vFW_vNF_Artifact.vtl | 118 +++- .../load/blueprints/vFW/Templates/vfw.vtl | 86 +-- .../load/blueprints/vFW/Templates/vpg.vtl | 10 +- .../load/blueprints/vFW/Templates/vsn.vtl | 40 +- .../resource_dictionary/onap_private_net_id.json | 46 +- .../onap_private_subnet_id.json | 37 +- .../load/resource_dictionary/vfw_private_ip_0.json | 7 +- .../load/resource_dictionary/vfw_private_ip_1.json | 7 +- .../load/resource_dictionary/vpg_private_ip_0.json | 7 +- .../load/resource_dictionary/vsn_private_ip_0.json | 7 +- 11 files changed, 508 insertions(+), 463 deletions(-) diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json index b8bfc0f64..3cfa6f779 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json @@ -219,6 +219,53 @@ "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 }, @@ -296,10 +343,10 @@ "version": 0 }, { - "name": "vf-nf-code", + "name": "vfw_private_ip_1", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -312,34 +359,18 @@ } }, "input-param": false, - "dictionary-name": "vf-nf-code", - "dictionary-source": "db", + "dictionary-name": "vfw_private_ip_1", + "dictionary-source": "input", "dependencies": [ - "vnf-model-customization-uuid" + ], "version": 0 - } - ] - } - } - } - }, - "vfw": { - "type": "artifact-config-template", - "capabilities": { - "content": { - "properties": { - "content": "vfw" - } - }, - "mapping": { - "properties": { - "mapping": [ + }, { - "name": "service-instance-id", + "name": "vfw_private_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -352,7 +383,7 @@ } }, "input-param": false, - "dictionary-name": "service-instance-id", + "dictionary-name": "vfw_private_ip_0", "dictionary-source": "input", "dependencies": [ @@ -360,10 +391,10 @@ "version": 0 }, { - "name": "vnf-id", + "name": "vpg_private_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -376,7 +407,7 @@ } }, "input-param": false, - "dictionary-name": "vnf-id", + "dictionary-name": "vpg_private_ip_0", "dictionary-source": "input", "dependencies": [ @@ -384,10 +415,10 @@ "version": 0 }, { - "name": "vnf-name", + "name": "vsn_private_ip_0", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -400,20 +431,19 @@ } }, "input-param": false, - "dictionary-name": "vnf-name", - "dictionary-source": "mdsal", + "dictionary-name": "vsn_private_ip_0", + "dictionary-source": "input", "dependencies": [ - "service-instance-id", - "vnf-id" + ], "version": 0 }, { - "name": "vnf-model-customization-uuid", + "name": "protected-prefix-id", "property": { "description": "", - "required": true, - "type": "string", + "required": false, + "type": "integer", "status": "", "constraints": [ { @@ -425,19 +455,19 @@ } }, "input-param": false, - "dictionary-name": "vnf-model-customization-uuid", - "dictionary-source": "input", + "dictionary-name": "protected-prefix-id", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "vf-module-id", + "name": "unprotected-prefix-id", "property": { "description": "", - "required": true, - "type": "string", + "required": false, + "type": "integer", "status": "", "constraints": [ { @@ -449,15 +479,15 @@ } }, "input-param": false, - "dictionary-name": "vf-module-id", - "dictionary-source": "input", + "dictionary-name": "unprotected-prefix-id", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "vf-module-type", + "name": "vf-nf-code", "property": { "description": "", "required": true, @@ -473,15 +503,31 @@ } }, "input-param": false, - "dictionary-name": "vf-module-type", + "dictionary-name": "vf-nf-code", "dictionary-source": "db", "dependencies": [ - "vf-module-model-customization-uuid" + "vnf-model-customization-uuid" ], "version": 0 - }, + } + ] + } + } + } + }, + "vfw": { + "type": "artifact-config-template", + "capabilities": { + "content": { + "properties": { + "content": "vfw" + } + }, + "mapping": { + "properties": { + "mapping": [ { - "name": "vf-module-model-customization-uuid", + "name": "service-instance-id", "property": { "description": "", "required": true, @@ -497,7 +543,7 @@ } }, "input-param": false, - "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-name": "service-instance-id", "dictionary-source": "input", "dependencies": [ @@ -505,7 +551,7 @@ "version": 0 }, { - "name": "vfccustomizationuuid", + "name": "vnf-id", "property": { "description": "", "required": true, @@ -521,15 +567,15 @@ } }, "input-param": false, - "dictionary-name": "vfccustomizationuuid", - "dictionary-source": "db", + "dictionary-name": "vnf-id", + "dictionary-source": "input", "dependencies": [ - "vf-module-model-customization-uuid" + ], "version": 0 }, { - "name": "aic-cloud-region", + "name": "vnf-name", "property": { "description": "", "required": true, @@ -545,18 +591,19 @@ } }, "input-param": false, - "dictionary-name": "aic-cloud-region", - "dictionary-source": "input", + "dictionary-name": "vnf-name", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "availability_zone_0", + "name": "vnf-model-customization-uuid", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -569,7 +616,7 @@ } }, "input-param": false, - "dictionary-name": "availability_zone_0", + "dictionary-name": "vnf-model-customization-uuid", "dictionary-source": "input", "dependencies": [ @@ -577,10 +624,10 @@ "version": 0 }, { - "name": "vm-type", + "name": "vf-module-id", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -593,7 +640,7 @@ } }, "input-param": false, - "dictionary-name": "vm-type", + "dictionary-name": "vf-module-id", "dictionary-source": "input", "dependencies": [ @@ -601,7 +648,7 @@ "version": 0 }, { - "name": "vnfc-model-invariant-uuid", + "name": "vf-module-type", "property": { "description": "", "required": true, @@ -617,15 +664,15 @@ } }, "input-param": false, - "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-name": "vf-module-type", "dictionary-source": "db", "dependencies": [ - "vfccustomizationuuid" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "vnfc-model-version", + "name": "vf-module-model-customization-uuid", "property": { "description": "", "required": true, @@ -641,15 +688,15 @@ } }, "input-param": false, - "dictionary-name": "vnfc-model-version", - "dictionary-source": "db", + "dictionary-name": "vf-module-model-customization-uuid", + "dictionary-source": "input", "dependencies": [ - "vfccustomizationuuid" + ], "version": 0 }, { - "name": "nf-role", + "name": "vfccustomizationuuid", "property": { "description": "", "required": true, @@ -662,19 +709,18 @@ ], "entry_schema": { "type": "" - }, - "default": "vFW" + } }, "input-param": false, - "dictionary-name": "nf-role", - "dictionary-source": "default", + "dictionary-name": "vfccustomizationuuid", + "dictionary-source": "db", "dependencies": [ - "vnf-model-customization-uuid" + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "nfc-naming-code", + "name": "aic-cloud-region", "property": { "description": "", "required": true, @@ -690,18 +736,18 @@ } }, "input-param": false, - "dictionary-name": "nfc-naming-code", - "dictionary-source": "db", + "dictionary-name": "aic-cloud-region", + "dictionary-source": "input", "dependencies": [ - "vf-module-model-customization-uuid" + ], "version": 0 }, { - "name": "public_net_id", + "name": "vm-type", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -711,22 +757,21 @@ ], "entry_schema": { "type": "" - }, - "default": "public_net_id" + } }, "input-param": false, - "dictionary-name": "public_net_id", - "dictionary-source": "default", + "dictionary-name": "vm-type", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "onap_private_net_id", + "name": "vnfc-model-invariant-uuid", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -736,20 +781,18 @@ ], "entry_schema": { "type": "" - }, - "value": "", - "default": "onap_private_net_id" + } }, "input-param": false, - "dictionary-name": "onap_private_net_id", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-invariant-uuid", + "dictionary-source": "db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "onap_private_subnet_id", + "name": "vnfc-model-version", "property": { "description": "", "required": true, @@ -762,20 +805,18 @@ ], "entry_schema": { "type": "" - }, - "value": "Oam_Network_Puhf", - "default": "Oam_Network_Puhf" + } }, "input-param": false, - "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "default", + "dictionary-name": "vnfc-model-version", + "dictionary-source": "db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "unprotected_private_net_cidr", + "name": "nf-role", "property": { "description": "", "required": true, @@ -788,18 +829,19 @@ ], "entry_schema": { "type": "" - } + }, + "default": "vFW" }, "input-param": false, - "dictionary-name": "unprotected_private_net_cidr", - "dictionary-source": "db", + "dictionary-name": "nf-role", + "dictionary-source": "default", "dependencies": [ - + "vnf-model-customization-uuid" ], "version": 0 }, { - "name": "protected_private_net_cidr", + "name": "nfc-naming-code", "property": { "description": "", "required": true, @@ -815,15 +857,15 @@ } }, "input-param": false, - "dictionary-name": "protected_private_net_cidr", + "dictionary-name": "nfc-naming-code", "dictionary-source": "db", "dependencies": [ - + "vfccustomizationuuid" ], "version": 0 }, { - "name": "nexus_artifact_repo", + "name": "public_net_id", "property": { "description": "", "required": true, @@ -837,10 +879,10 @@ "entry_schema": { "type": "" }, - "default": "nexus_artifact_repo" + "default": "public_net_id" }, "input-param": false, - "dictionary-name": "nexus_artifact_repo", + "dictionary-name": "public_net_id", "dictionary-source": "default", "dependencies": [ @@ -848,10 +890,10 @@ "version": 0 }, { - "name": "sec_group", + "name": "onap_private_net_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -861,22 +903,22 @@ ], "entry_schema": { "type": "" - }, - "default": "onap_sg_PUhf" + } }, "input-param": false, - "dictionary-name": "sec_group", - "dictionary-source": "default", + "dictionary-name": "onap_private_net_id", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "onap_private_net_cidr", + "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -889,18 +931,19 @@ } }, "input-param": false, - "dictionary-name": "onap_private_net_cidr", - "dictionary-source": "db", + "dictionary-name": "onap_private_subnet_id", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, { - "name": "vfw_name_0", + "name": "unprotected_private_net_cidr", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -913,15 +956,15 @@ } }, "input-param": false, - "dictionary-name": "vfw_name_0", - "dictionary-source": "input", + "dictionary-name": "unprotected_private_net_cidr", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "vf-naming-policy", + "name": "protected_private_net_cidr", "property": { "description": "", "required": true, @@ -934,22 +977,21 @@ ], "entry_schema": { "type": "" - }, - "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" + } }, "input-param": false, - "dictionary-name": "vf-naming-policy", - "dictionary-source": "default", + "dictionary-name": "protected_private_net_cidr", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "vf_module_name", + "name": "nexus_artifact_repo", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -959,18 +1001,19 @@ ], "entry_schema": { "type": "" - } + }, + "default": "nexus_artifact_repo" }, "input-param": false, - "dictionary-name": "vf_module_name", - "dictionary-source": "input", + "dictionary-name": "nexus_artifact_repo", + "dictionary-source": "default", "dependencies": [ ], "version": 0 }, { - "name": "vf-module-label", + "name": "sec_group", "property": { "description": "", "required": true, @@ -983,22 +1026,23 @@ ], "entry_schema": { "type": "" - } + }, + "default": "onap_sg_PUhf" }, "input-param": false, - "dictionary-name": "vf-module-label", - "dictionary-source": "db", + "dictionary-name": "sec_group", + "dictionary-source": "default", "dependencies": [ - "vf-module-model-customization-uuid" + ], "version": 0 }, { - "name": "private-prefix-id", + "name": "onap_private_net_cidr", "property": { "description": "", - "required": false, - "type": "integer", + "required": true, + "type": "string", "status": "", "constraints": [ { @@ -1010,7 +1054,7 @@ } }, "input-param": false, - "dictionary-name": "private-prefix-id", + "dictionary-name": "onap_private_net_cidr", "dictionary-source": "db", "dependencies": [ @@ -1018,7 +1062,7 @@ "version": 0 }, { - "name": "vfw_private_ip_2", + "name": "vfw_name_0", "property": { "description": "", "required": false, @@ -1034,7 +1078,7 @@ } }, "input-param": false, - "dictionary-name": "vfw_private_ip_2", + "dictionary-name": "vfw_name_0", "dictionary-source": "input", "dependencies": [ @@ -1042,11 +1086,11 @@ "version": 0 }, { - "name": "protected-prefix-id", + "name": "vf-naming-policy", "property": { "description": "", - "required": false, - "type": "integer", + "required": true, + "type": "string", "status": "", "constraints": [ { @@ -1055,18 +1099,19 @@ ], "entry_schema": { "type": "" - } + }, + "default": "SDNC_Policy.Config_MS_ONAP_VFW_NAMING_TIMESTAMP" }, "input-param": false, - "dictionary-name": "protected-prefix-id", - "dictionary-source": "db", + "dictionary-name": "vf-naming-policy", + "dictionary-source": "default", "dependencies": [ ], "version": 0 }, { - "name": "vfw_private_ip_1", + "name": "vf_module_name", "property": { "description": "", "required": false, @@ -1082,7 +1127,7 @@ } }, "input-param": false, - "dictionary-name": "vfw_private_ip_1", + "dictionary-name": "vf_module_name", "dictionary-source": "input", "dependencies": [ @@ -1090,11 +1135,11 @@ "version": 0 }, { - "name": "unprotected-prefix-id", + "name": "vf-module-label", "property": { "description": "", - "required": false, - "type": "integer", + "required": true, + "type": "string", "status": "", "constraints": [ { @@ -1106,19 +1151,19 @@ } }, "input-param": false, - "dictionary-name": "unprotected-prefix-id", + "dictionary-name": "vf-module-label", "dictionary-source": "db", "dependencies": [ - + "vf-module-model-customization-uuid" ], "version": 0 }, { - "name": "vfw_private_ip_0", + "name": "private-prefix-id", "property": { "description": "", "required": false, - "type": "string", + "type": "integer", "status": "", "constraints": [ { @@ -1130,15 +1175,15 @@ } }, "input-param": false, - "dictionary-name": "vfw_private_ip_0", - "dictionary-source": "input", + "dictionary-name": "private-prefix-id", + "dictionary-source": "db", "dependencies": [ ], "version": 0 }, { - "name": "vpg_private_ip_0", + "name": "vfw_private_ip_2", "property": { "description": "", "required": false, @@ -1154,7 +1199,7 @@ } }, "input-param": false, - "dictionary-name": "vpg_private_ip_0", + "dictionary-name": "vfw_private_ip_2", "dictionary-source": "input", "dependencies": [ @@ -1418,30 +1463,6 @@ ], "version": 0 }, - { - "name": "availability_zone_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "availability_zone_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, { "name": "vm-type", "property": { @@ -1460,7 +1481,7 @@ }, "input-param": false, "dictionary-name": "vm-type", - "dictionary-source": "input", + "dictionary-source": "db", "dependencies": [ ], @@ -1559,7 +1580,7 @@ "dictionary-name": "nfc-naming-code", "dictionary-source": "db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, @@ -1602,14 +1623,14 @@ ], "entry_schema": { "type": "" - }, - "default": "onap_private_net_id" + } }, "input-param": false, "dictionary-name": "onap_private_net_id", - "dictionary-source": "default", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, @@ -1617,7 +1638,7 @@ "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -1627,14 +1648,14 @@ ], "entry_schema": { "type": "" - }, - "default": "Oam_Network_Puhf" + } }, "input-param": false, "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "default", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, @@ -1707,8 +1728,7 @@ "dictionary-source": "mdsal", "dependencies": [ "service-instance-id", - "vnf-id", - "vf-module-id" + "vnf-id" ], "version": 0 }, @@ -1733,8 +1753,7 @@ "dictionary-source": "mdsal", "dependencies": [ "service-instance-id", - "vnf-id", - "vf-module-id" + "vnf-id" ], "version": 0 }, @@ -1809,8 +1828,7 @@ "dictionary-source": "mdsal", "dependencies": [ "service-instance-id", - "vnf-id", - "vf-module-id" + "vnf-id" ], "version": 0 }, @@ -1929,7 +1947,7 @@ }, "input-param": false, "dictionary-name": "private-prefix-id", - "dictionary-source": "input", + "dictionary-source": "db", "dependencies": [ ], @@ -2192,54 +2210,6 @@ ], "version": 0 }, - { - "name": "aic_clli", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "aic_clli", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, - { - "name": "availability_zone_0", - "property": { - "description": "", - "required": false, - "type": "string", - "status": "", - "constraints": [ - { - - } - ], - "entry_schema": { - "type": "" - } - }, - "input-param": false, - "dictionary-name": "availability_zone_0", - "dictionary-source": "input", - "dependencies": [ - - ], - "version": 0 - }, { "name": "vm-type", "property": { @@ -2258,7 +2228,7 @@ }, "input-param": false, "dictionary-name": "vm-type", - "dictionary-source": "input", + "dictionary-source": "db", "dependencies": [ ], @@ -2357,7 +2327,7 @@ "dictionary-name": "nfc-naming-code", "dictionary-source": "db", "dependencies": [ - "vf-module-model-customization-uuid" + "vfccustomizationuuid" ], "version": 0 }, @@ -2405,9 +2375,10 @@ }, "input-param": false, "dictionary-name": "onap_private_net_id", - "dictionary-source": "default", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, @@ -2415,7 +2386,7 @@ "name": "onap_private_subnet_id", "property": { "description": "", - "required": true, + "required": false, "type": "string", "status": "", "constraints": [ @@ -2425,14 +2396,14 @@ ], "entry_schema": { "type": "" - }, - "default": "Oam_Network_Puhf" + } }, "input-param": false, "dictionary-name": "onap_private_subnet_id", - "dictionary-source": "default", + "dictionary-source": "mdsal", "dependencies": [ - + "service-instance-id", + "vnf-id" ], "version": 0 }, @@ -2580,8 +2551,7 @@ "dictionary-source": "mdsal", "dependencies": [ "service-instance-id", - "vnf-id", - "vf-module-id" + "vnf-id" ], "version": 0 }, @@ -2700,7 +2670,7 @@ }, "input-param": false, "dictionary-name": "private-prefix-id", - "dictionary-source": "input", + "dictionary-source": "db", "dependencies": [ ], @@ -2753,12 +2723,28 @@ ], "version": 0 - }, + } + ] + } + } + } + }, + "base_template": { + "type": "artifact-config-template", + "capabilities": { + "content": { + "properties": { + "content": "base_template" + } + }, + "mapping": { + "properties": { + "mapping": [ { - "name": "vsn_private_ip_0", + "name": "service-instance-id", "property": { "description": "", - "required": false, + "required": true, "type": "string", "status": "", "constraints": [ @@ -2771,31 +2757,15 @@ } }, "input-param": false, - "dictionary-name": "vsn_private_ip_0", + "dictionary-name": "service-instance-id", "dictionary-source": "input", "dependencies": [ ], "version": 0 - } - ] - } - } - } - }, - "base_template": { - "type": "artifact-config-template", - "capabilities": { - "content": { - "properties": { - "content": "base_template" - } - }, - "mapping": { - "properties": { - "mapping": [ + }, { - "name": "service-instance-id", + "name": "vf-module-type", "property": { "description": "", "required": true, @@ -2811,7 +2781,31 @@ } }, "input-param": false, - "dictionary-name": "service-instance-id", + "dictionary-name": "vf-module-type", + "dictionary-source": "db", + "dependencies": [ + "vf-module-model-customization-uuid" + ], + "version": 0 + }, + { + "name": "vf-module-model-customization-uuid", + "property": { + "description": "", + "required": true, + "type": "string", + "status": "", + "constraints": [ + { + + } + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-module-model-customization-uuid", "dictionary-source": "input", "dependencies": [ @@ -2842,6 +2836,30 @@ ], "version": 0 }, + { + "name": "vf-module-id", + "property": { + "description": "", + "required": true, + "type": "string", + "status": "", + "constraints": [ + { + + } + ], + "entry_schema": { + "type": "" + } + }, + "input-param": false, + "dictionary-name": "vf-module-id", + "dictionary-source": "input", + "dependencies": [ + + ], + "version": 0 + }, { "name": "vnf-model-customization-uuid", "property": { 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 b61ef63c1..f25e95608 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 3397a3cdd..0e11b4bf3 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", @@ -36,10 +36,6 @@ "param-name": "aic-cloud-region", "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 0927a54da..c69aeb5f9 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl @@ -36,10 +36,6 @@ "param-name": "aic-cloud-region", "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 4336f40a4..c681de5f8 100644 --- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl +++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl @@ -36,14 +36,6 @@ "param-name": "aic-cloud-region", "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}" - } - ] } ] }, diff --git a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json index 89d0efbd9..bb70fe3c4 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_net_id.json @@ -1,15 +1,33 @@ { - "name": "onap_private_net_id", - "tags": "onap_private_net_id", - "updated-by" : "Singal, Kapil ", - "property": { - "type": "string", - "description": "onap_private_net_id" - }, - "sources": { - "input": { - "type": "source-input" - } - } - -} + "name": "onap_private_net_id", + "tags": "onap_private_net_id", + "updated-by": "Singal, Kapil ", + "property": { + "type": "string", + "description": "onap_private_net_id" + }, + "sources": { + "input": { + "type": "source-input" + }, + "mdsal": { + "type": "source-rest", + "properties": { + "type": "JSON", + "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_net_id", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "onap_private_net_id": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] + } + } + } +} \ No newline at end of file diff --git a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json index 0ea5b13df..d38ceb49c 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/onap_private_subnet_id.json @@ -1,15 +1,32 @@ { - "name" : "onap_private_subnet_id", - "tags" : "onap_private_subnet_id", - "updated-by" : "Singal, Kapil ", - "property" : { - "description" : "onap_private_subnet_id", - "type" : "string" + "name": "onap_private_subnet_id", + "tags": "onap_private_subnet_id", + "updated-by": "Singal, Kapil ", + "property": { + "type": "string", + "description": "onap_private_subnet_id" }, - "sources" : { - "input" : { - "type" : "source-input", - "properties" : { + "sources": { + "input": { + "type": "source-input" + }, + "mdsal": { + "type": "source-rest", + "properties": { + "type": "JSON", + "url-path": "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/onap_private_subnet_id", + "path": "/param/0/value", + "input-key-mapping": { + "service-instance-id": "service-instance-id", + "vnf-id": "vnf-id" + }, + "output-key-mapping": { + "onap_private_subnet_id": "value" + }, + "key-dependencies": [ + "service-instance-id", + "vnf-id" + ] } } } diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json index 38fb34f95..71a4df2c4 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_0.json @@ -16,18 +16,17 @@ "type" : "source-rest", "properties" : { "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_0", + "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_0", "path" : "/param/0/value", "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id", - "vf-module-id" : "vf-module-id" + "vnf-id" : "vnf-id" }, "output-key-mapping" : { "vfw_private_ip_0" : "value" }, - "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json index 4acd10d6e..481edae8c 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/vfw_private_ip_1.json @@ -16,18 +16,17 @@ "type" : "source-rest", "properties" : { "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vfw_private_ip_1", + "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vfw_private_ip_1", "path" : "/param/0/value", "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id", - "vf-module-id" : "vf-module-id" + "vnf-id" : "vnf-id" }, "output-key-mapping" : { "vfw_private_ip_1" : "value" }, - "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json index f586a6581..13d89993b 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/vpg_private_ip_0.json @@ -16,18 +16,17 @@ "type" : "source-rest", "properties" : { "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vpg_private_ip_0", + "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vpg_private_ip_0", "path" : "/param/0/value", "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id", - "vf-module-id" : "vf-module-id" + "vnf-id" : "vnf-id" }, "output-key-mapping" : { "vpg_private_ip_0" : "value" }, - "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } diff --git a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json b/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json index b9954553c..fcd6d8d55 100755 --- a/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json +++ b/ms/controllerblueprints/application/load/resource_dictionary/vsn_private_ip_0.json @@ -16,18 +16,17 @@ "type" : "source-rest", "properties" : { "type" : "JSON", - "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vf-modules/vf-module/$vf-module-id/vf-module-data/vf-module-topology/vf-module-parameters/param/vsn_private_ip_0", + "url-path" : "config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/vnfs/vnf/$vnf-id/vnf-data/vnf-topology/vnf-parameters-data/param/vsn_private_ip_0", "path" : "/param/0/value", "expression-type" : "JSON_POINTER", "input-key-mapping" : { "service-instance-id" : "service-instance-id", - "vnf-id" : "vnf-id", - "vf-module-id" : "vf-module-id" + "vnf-id" : "vnf-id" }, "output-key-mapping" : { "vsn_private_ip_0" : "value" }, - "key-dependencies" : [ "service-instance-id", "vnf-id", "vf-module-id" ] + "key-dependencies" : [ "service-instance-id", "vnf-id" ] } } } -- cgit 1.2.3-korg