From a5b4c9250eb1c4a2ab6c84e475affdd10bd677c5 Mon Sep 17 00:00:00 2001 From: bdfreeman1421 Date: Sun, 25 Nov 2018 07:32:19 -0500 Subject: Add vCPEResCust Model onboarding Issue-ID: INT-601 Change-Id: I543959a06be9b0a759d6102bcf1352e80b7d5a30 Signed-off-by: bdfreeman1421 (cherry picked from commit b2a4951b485eeec49366bc58862aa253b2ccc8e7) --- robot/assets/service_mappings.py | 5 +++ .../asdc/catalog_allotted_inputs.template | 46 ++++++++++++++++++++++ .../asdc/catalog_allotted_properties.template | 43 ++++++++++++++++++++ .../catalog_resource_alloted_resource.template | 41 +++++++++++++++++++ 4 files changed, 135 insertions(+) create mode 100644 robot/assets/templates/asdc/catalog_allotted_inputs.template create mode 100644 robot/assets/templates/asdc/catalog_allotted_properties.template create mode 100644 robot/assets/templates/asdc/catalog_resource_alloted_resource.template (limited to 'robot/assets') diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index 89d25969..15f7d79d 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -12,6 +12,7 @@ GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['vFW'], \ "vCPEvBRGEMU" : ['vCPE/vbrgemu'], "vCPEvGMUX" : ['vCPE/vgmux'], "vCPEvGW" : ['vCPE/vgw'], + "vCPEResCust" : ['vCPE/vgw'], } ''' @@ -29,6 +30,7 @@ GLOBAL_SERVICE_VNF_MAPPING = { "vCPEvBRGEMU" : ['vCPEvBRGEMU'], "vCPEvGMUX" : ['vCPEvGMUX'], "vCPEvGW" : ['vCPEvGW'], + "vCPERestCust" : ['vCPEvGW'], } ''' @@ -42,6 +44,7 @@ GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING = { "vCPEvGMUX" : ['MUX_GW'], "vCPEvBRGEMU" :[], "vCPEvGW" :[], + "vCPERestCust" :[], "vFW" :[], "vLB" :[], "vVG" :[], @@ -72,6 +75,7 @@ GLOBAL_SERVICE_TEMPLATE_MAPPING = { "vCPEvBRGEMU" : [{"isBase" : "true", "template" : "vcpe_vbrgemu_preload.template", "name_pattern": "base_vbrgemu"}], "vCPEvGMUX" : [{"isBase" : "true", "template" : "vcpe_vgmux_preload.template", "name_pattern": "base_vgmux"}], "vCPEvGW" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "name_pattern": "base_vgw"}], + "vCPEResCust" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "name_pattern": "base_vgw"}], } ''' @@ -82,6 +86,7 @@ GLOBAL_VALIDATE_NAME_MAPPING = {"vFW" : 'vfw_name_0', "vVG" : '', "vCPE" : 'vgw_name_0', "vCPEvGW" : 'vgw_name_0', + "vCPEResCust" : 'vgw_name_0', "vCPEvDNS" : 'vdns_name_0', "vCPEvAAA" : 'vaaa_name_0', "vCPEvWEB" : 'vweb_name_0', diff --git a/robot/assets/templates/asdc/catalog_allotted_inputs.template b/robot/assets/templates/asdc/catalog_allotted_inputs.template new file mode 100644 index 00000000..11074801 --- /dev/null +++ b/robot/assets/templates/asdc/catalog_allotted_inputs.template @@ -0,0 +1,46 @@ +[ + { + "defaultValue": "${nf_type}", + "description": null, + "name": "nf_type", + "parentUniqueId": null, + "password": false, + "required": false, + "schema": { + "property": {} + }, + "type": "string", + "uniqueId": "${nf_type_uid}", + "value": null, + "definition": false, + "getInputValues": null, + "instanceUniqueId": null, + "propertyId": null, + "properties": null, + "inputs": null, + "ownerId": null, + "inputPath": null + }, + { + "defaultValue": "${nf_role}", + "description": null, + "name": "nf_role", + "parentUniqueId": null, + "password": false, + "required": false, + "schema": { + "property": {} + }, + "type": "string", + "uniqueId": "${nf_role_uid}", + "value": null, + "definition": false, + "getInputValues": null, + "instanceUniqueId": null, + "propertyId": null, + "properties": null, + "inputs": null, + "ownerId": null, + "inputPath": null + } +] diff --git a/robot/assets/templates/asdc/catalog_allotted_properties.template b/robot/assets/templates/asdc/catalog_allotted_properties.template new file mode 100644 index 00000000..023abcfe --- /dev/null +++ b/robot/assets/templates/asdc/catalog_allotted_properties.template @@ -0,0 +1,43 @@ +[{ + "definition": false, + "description": "The depending service invariant uuid in order to map the allotted resource to the specific service version", + "empty": false, + "getInputProperty": false, + "hidden": false, + "immutable": false, + "name": "providing_service_invariant_uuid", + "password": false, + "required": true, + "type": "string", + "value": ${providing_service_invariant_uuid}, + "uniqueId": "${uniqueId}.providing_service_invariant_uuid" + }, + { + "definition": false, + "description": "The depending service uuid in order to map the allotted resource to the specific service version", + "empty": false, + "getInputProperty": false, + "hidden": false, + "immutable": false, + "name": "providing_service_uuid", + "password": false, + "required": true, + "type": "string", + "value": ${providing_service_uuid}, + "uniqueId": "${uniqueId}.providing_service_uuid" + }, + { + "definition": false, + "description": "The depending service name in order to map the allotted resource to the specific service version", + "empty": false, + "getInputProperty": false, + "hidden": false, + "immutable": false, + "name": "providing_service_name", + "password": false, + "required": true, + "type": "string", + "value": ${providing_service_name}, + "uniqueId": "${uniqueId}.providing_service_name" + } +] diff --git a/robot/assets/templates/asdc/catalog_resource_alloted_resource.template b/robot/assets/templates/asdc/catalog_resource_alloted_resource.template new file mode 100644 index 00000000..e3a11ec3 --- /dev/null +++ b/robot/assets/templates/asdc/catalog_resource_alloted_resource.template @@ -0,0 +1,41 @@ +{ + "artifacts": {}, + "toscaArtifacts": {}, + "contactId": "cs0008", + "categories": [ + { + "name": "Allotted Resource", + "normalizedName": "allotted resource", + "uniqueId": "resourceNewCategory.allotted resource", + "subcategories": [ + { + "name": "${subcategory}", + "normalizedName": "${subcategory}", + "uniqueId": "resourceNewCategory.allotted resource.${subcategory}", + "icons": [ + "allotted_resource" + ] + } + ] + } + ], + "description": "Alloted Resource ${subcategory}", + "icon": "defaulticon", + "componentInstancesProperties": {}, + "componentInstancesAttributes": {}, + "name": "${software_product_name}", + "tags": [ + "${software_product_name}" + ], + "capabilities": {}, + "requirements": {}, + "deploymentArtifacts": {}, + "componentType": "RESOURCE", + "vendorName": "${vendor_name}", + "vendorRelease": "1.0", + "componentInstances": [], + "properties": [], + "attributes": [], + "groups": [], + "resourceType": "VF" +} -- cgit 1.2.3-korg