Cleanup Instantiate vLB

Remmove vLB Hack since vLBMS doesnt need it
Move vLB service to use vLBMS Heat template

Issue-ID: INT-1039
Change-Id: If92bbec8579305aecddd698257c4e3e6af52b76b
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py
index 50c3ee2..9a02a1b 100644 (file)
--- 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 8830fe1..cbaba4a 100644 (file)
--- 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 86af583..b550fac 100644 (file)
--- 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}