Fixes from SoUtil and Pairwise test

update vf_module_name to vf_module_name_list
remove heatbridge from SoUtil parameters

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

diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 74ee63b..25575e1 100644 (file)
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -179,7 +179,8 @@ Instantiate VNF
     ${vf_module_name_list}    ${service}     ${generic_vnfs}=    Orchestrate VNF    DemoCust    ${service}   ${service}    ${TENANT_NAME}
     Save For Delete
     Log to Console   Customer Name=${CUSTOMER_NAME}
-    Log to Console   VNF Module Name=${vf_module_name}
+    :FOR  ${vf_module_name}  IN   @{vf_module_name_list}
+    \   Log To Console   VNF Module Name=${vf_module_name}
     # Don't get from MSO for now due to SO-1186
     # ${model_invariant_id}=  Run MSO Get ModelInvariantId   ${SUITE_SERVICE_MODEL_NAME}  ${vf_module_label}
     ${model_invariant_id}=   Set Variable   ${EMPTY}

diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot
index 6e8ba13..5548c93 100644 (file)
--- a/robot/resources/so/direct_instantiate.robot
+++ b/robot/resources/so/direct_instantiate.robot
@@ -20,7 +20,6 @@ Instantiate Service Direct To SO
     ${name_suffix}=   Get Current Date     exclude_millis=True
     ${name_suffix}=       Evaluate    '${name_suffix}'.replace(' ','')
     ${name_suffix}=       Evaluate    '${name_suffix}'.replace(':','')
-    ${heatbridge}=    Set Variable   false
     ${preload_dict}=       Copy Dictionary  ${GLOBAL_PRELOAD_PARAMETERS['defaults']}
     ${template}=   Create Dictionary
     @{keys}=    Get Dictionary Keys    ${preload_dict}
@@ -47,7 +46,7 @@ Instantiate Service Direct To SO
 
     Log    ${preload_dict}  
     Log    ${template}  
-    ${service_instance_id}=   Create Entire Service   ${csar_file}    ${vnf_template_file}   ${template}   ${name_suffix}   ${GLOBAL_INJECTED_REGION}  ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}  ${heatbridge}
+    ${service_instance_id}=   Create Entire Service   ${csar_file}    ${vnf_template_file}   ${template}   ${name_suffix}   ${GLOBAL_INJECTED_REGION}  ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID}
     Log To Console     ServiceInstanceId:${service_instance_id}
     Should Not Be Equal As Strings  ${service_instance_id}   None