diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2018-11-16 23:46:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-11-16 23:46:44 +0000 |
| commit | 34a91dc697210305cecc31d0fb9eebcfa819290e (patch) | |
| tree | 74a271f089b94d78a2a93b0b18fff5b083e7ecdf /robot/assets | |
| parent | 35afc9e26f8a74b6bd5d4fe99a0c9d2b71a62f66 (diff) | |
| parent | eef7c6f27e0770415188a9bd72355d73af660a4e (diff) | |
Merge "Automate Onboarding of vCPE:Infra,BNG,GMUX,BRG"
Diffstat (limited to 'robot/assets')
| -rw-r--r-- | robot/assets/service_mappings.py | 36 | ||||
| -rw-r--r-- | robot/assets/templates/asdc/resource_instance.template | 6 |
2 files changed, 39 insertions, 3 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index b1ed2d85..7a4a6f29 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -7,6 +7,11 @@ GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['vFW'], \ "vCPE" : ['vCPE/infra', 'vCPE/vbng', 'vCPE/vbrgemu', 'vCPE/vgmux', 'vCPE/vgw'], "vFWCL" : ['vFWCL/vFWSNK', 'vFWCL/vPKG'], "vFWNG" : ['vFW_NextGen/templates'], + "vCPEInfra" : ['vCPE/infra'], + "vCPEvBNG" : ['vCPE/vbng'], + "vCPEvBRGEMU" : ['vCPE/vbrgemu'], + "vCPEvGMUX" : ['vCPE/vgmux'], + "vCPEvGW" : ['vCPE/vgw'], } ''' @@ -19,9 +24,34 @@ GLOBAL_SERVICE_VNF_MAPPING = { "vCPE" : ['vCPE'], "vFWCL" : ['vFWSNK', 'vPKG'], "vFWNG" : ['vFWNG'], + "vCPEInfra" : ['vCPEInfra'], + "vCPEvBNG" : ['vCPEvBNG'], + "vCPEvBRGEMU" : ['vCPEvBRGEMU'], + "vCPEvGMUX" : ['vCPEvGMUX'], + "vCPEvGW" : ['vCPEvGW'], } ''' + +Map the service to the list of Generic Neutron Networks to be orchestrated + +''' +GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING = { + "vCPEInfra" : ['CPE_SIGNAL','CPE_PUBLIC'], + "vCPEvBNG" : ['BRG_BNG', 'BNG_MUX'], + "vCPEvGMUX" : ['MUX_GW'], + "vCPEvBRGEMU" :[], + "vCPEvGW" :[], + "vFW" :[], + "vLB" :[], + "vVG" :[], + "vFWCL" :[], + "vFWNG" :[], +} +''' + + + 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 parameters in the preload_paramenters.py - GLOBAL_PRELOAD_PARAMETERS[<testcase>][<template>] - @@ -37,6 +67,11 @@ GLOBAL_SERVICE_TEMPLATE_MAPPING = { "vPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], "vFWCL" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}, {"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], + "vCPEInfra" : [{"isBase" : "true", "template" : "vcpe_infra_preload.template", "name_pattern": "base_infra"}], + "vCPEvBNG" : [{"isBase" : "true", "template" : "vcpe_vbng_preload.template", "name_pattern": "base_vbng"}], + "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"}], } ''' @@ -54,3 +89,4 @@ GLOBAL_VALIDATE_NAME_MAPPING = {"vFW" : 'vfw_name_0', "vFWSNK" : 'vfw_name_0', "vPKG" : 'vpg_name_0', } + diff --git a/robot/assets/templates/asdc/resource_instance.template b/robot/assets/templates/asdc/resource_instance.template index 215f8282..d42f20ca 100644 --- a/robot/assets/templates/asdc/resource_instance.template +++ b/robot/assets/templates/asdc/resource_instance.template @@ -1,10 +1,10 @@ { "uniqueId": "${catalog_resource_id}${milli_timestamp}", - "posX": 406, - "posY": 248, + "posX": ${posX}, + "posY": ${posY}, "name": "${catalog_resource_name}", "componentVersion": "1.0", "originType": "VF", "icon": "defaulticon", "componentUid": "${catalog_resource_id}" -}
\ No newline at end of file +} |