diff options
| author |   Daniel Rose <dr695h@att.com> | 2019-04-26 13:30:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-04-26 13:30:24 +0000 |
| commit | f7ca9a7334ed9e213da5b030224206bcf1fa6823 (patch) | |
| tree | 07dba8a457bf6f2608fb0b51b2785394a9176d44 | |
| parent | 1560a104998739764107bfb7fd51777c159f4fa2 (diff) | |
| parent | 4c71b0bed994055739e5fa5ba9307731b493a20b (diff) | |
Merge "Cleanup Instantiate vLB"
| -rw-r--r-- | robot/assets/service_mappings.py | 2 | ||||
| -rw-r--r-- | robot/resources/asdc_interface.robot | 4 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index 50c3ee21..9a02a1b1 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -6,7 +6,7 @@ import os.path This metadata identifies the folders to be zipped and uploaded to SDC for model distribution for a given VNF ''' GLOBAL_SERVICE_FOLDER_MAPPING = {"vFW" : ['vFW'], \ - "vLB" : ['vLB'], \ + "vLB" : ['vLBMS'], \ "vVG" : ['vVG'], \ "vCPE" : ['vCPE/infra', 'vCPE/vbng', 'vCPE/vbrgemu', 'vCPE/vgmux', 'vCPE/vgw'], "vFWCL" : ['vFWCL/vFWSNK', 'vFWCL/vPKG'], diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot index 8830fe16..cbaba4ac 100644 --- a/robot/resources/asdc_interface.robot +++ b/robot/resources/asdc_interface.robot @@ -714,8 +714,8 @@ Get VNF From Group Name [Documentation] looks up vnf key from service mapping for a regex on groupName and service_name [Arguments] ${group_name} ${service_name} ${vnf}= Set Variable If - ... ('${service_name}'=='demoVFWCL') and ('base_vfw' in '${group_name}') vFWSNK - ... ('${service_name}'=='demoVFWCL') and ('base_vpkg' in '${group_name}') vPKG + ... ('${service_name}'=='demoVFWCL') and ('base_vfw' in '${group_name}') vFWCLvFWSNK + ... ('${service_name}'=='demoVFWCL') and ('base_vpkg' in '${group_name}') vFWCLvPKG ... ('${service_name}'=='demoVLB') and ('base_vlb' in '${group_name}') vLB [Return] ${vnf} Checkin ASDC Catalog Resource diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 86af5833..b550fac4 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -81,7 +81,7 @@ Orchestrate VNF \ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant} ${vf_module_type} ${CUSTOMER_NAME} ${vnf_name} \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} \ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf} - \ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} + #\ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} \ Set Test Variable ${STACK_NAME} ${vf_module_name} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge \ Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface @@ -127,7 +127,7 @@ Orchestrate Demo VNF \ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant} ${vf_module_type} ${CUSTOMER_NAME} ${vnf_name} \ ${generic_vnf}= Validate Generic VNF ${vnf_name} ${vnf_type} ${service_instance_id} \ Set To Dictionary ${generic_vnfs} ${vf_module_type} ${generic_vnf} - \ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} + #\ Run Keyword If '${service}' == 'vLB' VLB Closed Loop Hack ${service} ${generic_vnf} ${closedloop_vf_module} \ Set Test Variable ${STACK_NAME} ${vf_module_name} # TODO: Need to look at a better way to default ipv4_oam_interface search for Heatbridge \ Execute Heatbridge ${vf_module_name} ${service_instance_id} ${vnf} ipv4_oam_interface @@ -242,7 +242,7 @@ Delete VNF :for ${stack} in @{sorted_stack_names} \ Get Stack Keypairs ${stack} Teardown VVG Server - Teardown VLB Closed Loop Hack + #Teardown VLB Closed Loop Hack Run Keyword and Ignore Error Teardown VID ${SERVICE_INSTANCE_ID} ${lcp_region} ${TENANT_NAME} ${CUSTOMER_NAME} # :for ${stack} in @{sorted_stack_names} |