diff options
Diffstat (limited to 'robot/assets')
| -rw-r--r-- | robot/assets/service_mappings.py | 31 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/dnsscaling_preload.template | 92 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/preload.template (renamed from robot/assets/templates/sdnc/vvg_preload.template) | 9 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/vfw_preload.template | 128 | ||||
| -rw-r--r-- | robot/assets/templates/sdnc/vlb_preload.template | 104 |
5 files changed, 17 insertions, 347 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index d80a4665..290d1409 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -1,30 +1,29 @@ +''' +This metadata identifies the folders to be zipped and uploaded to SDC for model distribution for a given VNF +''' GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['base_vfw'], \ "vLB" : ['base_vlb'], \ "vVG" : ['base_vvg'], \ "vIMS" : ['base_clearwater'], \ } - + +''' +This metadata identifes the preloads that need to be done for a VNF as there may be more than one (vLB) +"template" maps to the key value in the preload_paramenters.py - GLOBAL_PRELOAD_PARAMETERS[<testcase>][<template>] - + GLOBAL_PRELOAD_PARAMETERS['Demo'][dnsscaling_preload.template'] +It no longer refers to a template file as all have been collapsed into preload.template +''' GLOBAL_SERVICE_TEMPLATE_MAPPING = {"vFW" : [{"isBase" : "true", "template" : "vfw_preload.template", "name_pattern": "base_vfw"}], \ "vLB" : [{"isBase" : "true", "template" : "vlb_preload.template", "name_pattern": "base_vlb"}, {"isBase" : "false", "template" : "dnsscaling_preload.template", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}], "vVG" : [{"isBase" : "true", "template" : "vvg_preload.template", "name_pattern": "base_vvg"}], \ + "vIMS" : [{"isBase" : "true", "template" : "vims_preload.template", "name_pattern": "base_clearwater"}], \ } - -## -## The following identifies the stack parameter names for the oam_ecomp network IPS -## In stantiated by the stack. During stack teardown, we need to ensure that -## These ports are deleted due to latency in rackspace to free these ports. -## This is just a workaround to enable respinning a VM as soon as possible -GLOBAL_SERVICE_ECOMP_IP_MAPPING = {"vFW" : ['vpg_private_ip_1', 'vfw_private_ip_2','vsn_private_ip_1'], \ - "vLB" : ['vlb_private_ip_1', 'vdns_private_ip_1'], - "vVG" : [], \ - } - - -## -## Used by the Heatbridge Validate Query to A&AI to locate the vserver name +''' +Used by the Heatbridge Validate Query to A&AI to locate the vserver name +''' GLOBAL_VALIDATE_NAME_MAPPING = {"vFW" : 'vfw_name_0', "vLB" : 'vlb_name_0', - "vVG" : '' + "vVG" : '' } diff --git a/robot/assets/templates/sdnc/dnsscaling_preload.template b/robot/assets/templates/sdnc/dnsscaling_preload.template deleted file mode 100644 index 278ee80d..00000000 --- a/robot/assets/templates/sdnc/dnsscaling_preload.template +++ /dev/null @@ -1,92 +0,0 @@ -{ - "input": { - "vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-name": "${vf_module_name}", - "vnf-type": "${vf_module_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}" - }, - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": [ - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "${repo_url_blob}" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "${repo_url_artifacts}" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "${demo_artifacts_version}" - }, - { - "vnf-parameter-name": "ecomp_private_net_id", - "vnf-parameter-value": "${ecomp_private_net_id}" - }, - { - "vnf-parameter-name": "ecomp_private_subnet_id", - "vnf-parameter-value": "${ecomp_private_subnet_id}" - }, - { - "vnf-parameter-name": "ecomp_private_net_cidr", - "vnf-parameter-value": "${ecomp_private_net_cidr}" - }, - { - "vnf-parameter-name": "vlb_private_net_id", - "vnf-parameter-value": "${vlb_private_net_id}" - }, - { - "vnf-parameter-name": "vlb_private_ip_0", - "vnf-parameter-value": "${vlb_private_ip_0}" - }, - { - "vnf-parameter-name": "vlb_private_ip_1", - "vnf-parameter-value": "${vlb_private_ip_1}" - }, - { - "vnf-parameter-name": "vdns_private_ip_0", - "vnf-parameter-value": "${vdns_private_ip_0}" - }, - { - "vnf-parameter-name": "vdns_private_ip_1", - "vnf-parameter-value": "${vdns_private_ip_1}" - }, - { - "vnf-parameter-name": "vdns_name_0", - "vnf-parameter-value": "${scaling_vdns_name_0}" - }, - { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "${dcae_collector_ip}" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "${key_name}" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - } - ] - }, - "request-information": { - "request-id": "robot12", - "order-version": "1", - "notification-url": "openecomp.org", - "order-number": "1", - "request-action": "PreloadVNFRequest" - }, - "sdnc-request-header": { - "svc-request-id": "robot12", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-action": "reserve" - } - } -}
\ No newline at end of file diff --git a/robot/assets/templates/sdnc/vvg_preload.template b/robot/assets/templates/sdnc/preload.template index 83095e9d..b2f4f088 100644 --- a/robot/assets/templates/sdnc/vvg_preload.template +++ b/robot/assets/templates/sdnc/preload.template @@ -13,13 +13,8 @@ "vnf-networks": [], "vnf-vms": [] }, - "vnf-parameters": [ - { - "vnf-parameter-name": "nova_instance", - "vnf-parameter-value": "${nova_instance}" - } - ] - }, + "vnf-parameters": ${vnf_parameters} + }, "request-information": { "request-id": "robot12", "order-version": "1", diff --git a/robot/assets/templates/sdnc/vfw_preload.template b/robot/assets/templates/sdnc/vfw_preload.template deleted file mode 100644 index fbe96ca9..00000000 --- a/robot/assets/templates/sdnc/vfw_preload.template +++ /dev/null @@ -1,128 +0,0 @@ -{ - "input": { - "vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-name": "${vf_module_name}", - "vnf-type": "${vf_module_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}" - }, - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": [ - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "${repo_url_blob}" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "${repo_url_artifacts}" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "${demo_artifacts_version}" - }, - { - "vnf-parameter-name": "ecomp_private_net_id", - "vnf-parameter-value": "${ecomp_private_net_id}" - }, - { - "vnf-parameter-name": "ecomp_private_subnet_id", - "vnf-parameter-value": "${ecomp_private_subnet_id}" - }, - { - "vnf-parameter-name": "ecomp_private_net_cidr", - "vnf-parameter-value": "${ecomp_private_net_cidr}" - }, - { - "vnf-parameter-name": "unprotected_private_net_id", - "vnf-parameter-value": "${unprotected_private_net_id}" - }, - { - "vnf-parameter-name": "protected_private_net_id", - "vnf-parameter-value": "${protected_private_net_id}" - }, - { - "vnf-parameter-name": "protected_private_net_cidr", - "vnf-parameter-value": "${protected_private_net_cidr}" - }, - { - "vnf-parameter-name": "unprotected_private_net_cidr", - "vnf-parameter-value": "${unprotected_private_net_cidr}" - }, - { - "vnf-parameter-name": "vfw_private_ip_0", - "vnf-parameter-value": "${vfw_private_ip_0}" - }, - { - "vnf-parameter-name": "vfw_private_ip_1", - "vnf-parameter-value": "${vfw_private_ip_1}" - }, - { - "vnf-parameter-name": "vfw_private_ip_2", - "vnf-parameter-value": "${vfw_private_ip_2}" - }, - { - "vnf-parameter-name": "vpg_private_ip_0", - "vnf-parameter-value": "${vpg_private_ip_0}" - }, - { - "vnf-parameter-name": "vpg_private_ip_1", - "vnf-parameter-value": "${vpg_private_ip_1}" - }, - { - "vnf-parameter-name": "vsn_private_ip_0", - "vnf-parameter-value": "${vsn_private_ip_0}" - }, - { - "vnf-parameter-name": "vsn_private_ip_1", - "vnf-parameter-value": "${vsn_private_ip_1}" - }, - { - "vnf-parameter-name": "vfw_name_0", - "vnf-parameter-value": "${vfw_name_0}" - }, - { - "vnf-parameter-name": "vpg_name_0", - "vnf-parameter-value": "${vpg_name_0}" - }, - { - "vnf-parameter-name": "vsn_name_0", - "vnf-parameter-value": "${vsn_name_0}" - }, - { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "${dcae_collector_ip}" - }, - { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "${dcae_collector_port}" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "${key_name}" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - } - ] - }, - "request-information": { - "request-id": "robot12", - "order-version": "1", - "notification-url": "openecomp.org", - "order-number": "1", - "request-action": "PreloadVNFRequest" - }, - "sdnc-request-header": { - "svc-request-id": "robot12", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-action": "reserve" - } - } -}
\ No newline at end of file diff --git a/robot/assets/templates/sdnc/vlb_preload.template b/robot/assets/templates/sdnc/vlb_preload.template deleted file mode 100644 index acc3c9d1..00000000 --- a/robot/assets/templates/sdnc/vlb_preload.template +++ /dev/null @@ -1,104 +0,0 @@ -{ - "input": { - "vnf-topology-information": { - "vnf-topology-identifier": { - "service-type": "${service_type}", - "vnf-name": "${vf_module_name}", - "vnf-type": "${vf_module_type}", - "generic-vnf-name": "${generic_vnf_name}", - "generic-vnf-type": "${generic_vnf_type}" - }, - "vnf-assignments": { - "availability-zones": [], - "vnf-networks": [], - "vnf-vms": [] - }, - "vnf-parameters": [ - { - "vnf-parameter-name": "repo_url_blob", - "vnf-parameter-value": "${repo_url_blob}" - }, - { - "vnf-parameter-name": "repo_url_artifacts", - "vnf-parameter-value": "${repo_url_artifacts}" - }, - { - "vnf-parameter-name": "demo_artifacts_version", - "vnf-parameter-value": "${demo_artifacts_version}" - }, - { - "vnf-parameter-name": "ecomp_private_net_id", - "vnf-parameter-value": "${ecomp_private_net_id}" - }, - { - "vnf-parameter-name": "ecomp_private_subnet_id", - "vnf-parameter-value": "${ecomp_private_subnet_id}" - }, - { - "vnf-parameter-name": "ecomp_private_net_cidr", - "vnf-parameter-value": "${ecomp_private_net_cidr}" - }, - { - "vnf-parameter-name": "vlb_private_net_id", - "vnf-parameter-value": "${vlb_private_net_id}" - }, - { - "vnf-parameter-name": "vlb_private_net_cidr", - "vnf-parameter-value": "${vlb_private_net_cidr}" - }, - { - "vnf-parameter-name": "vlb_private_ip_0", - "vnf-parameter-value": "${vlb_private_ip_0}" - }, - { - "vnf-parameter-name": "vlb_private_ip_1", - "vnf-parameter-value": "${vlb_private_ip_1}" - }, - { - "vnf-parameter-name": "vdns_private_ip_0", - "vnf-parameter-value": "${vdns_private_ip_0}" - }, - { - "vnf-parameter-name": "vdns_private_ip_1", - "vnf-parameter-value": "${vdns_private_ip_1}" - }, - { - "vnf-parameter-name": "vlb_name_0", - "vnf-parameter-value": "${vlb_name_0}" - }, - { - "vnf-parameter-name": "vdns_name_0", - "vnf-parameter-value": "${vdns_name_0}" - }, - { - "vnf-parameter-name": "dcae_collector_ip", - "vnf-parameter-value": "${dcae_collector_ip}" - }, - { - "vnf-parameter-name": "dcae_collector_port", - "vnf-parameter-value": "${dcae_collector_port}" - }, - { - "vnf-parameter-name": "key_name", - "vnf-parameter-value": "${key_name}" - }, - { - "vnf-parameter-name": "pub_key", - "vnf-parameter-value": "${pub_key}" - } - ] - }, - "request-information": { - "request-id": "robot12", - "order-version": "1", - "notification-url": "openecomp.org", - "order-number": "1", - "request-action": "PreloadVNFRequest" - }, - "sdnc-request-header": { - "svc-request-id": "robot12", - "svc-notification-url": "http:\/\/openecomp.org:8080\/adapters\/rest\/SDNCNotify", - "svc-action": "reserve" - } - } -}
\ No newline at end of file |