summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-10-11 16:02:37 -0400
committerDaniel Rose <dr695h@att.com>2019-10-11 20:05:52 +0000
commite1bdee4d6635466fc0fa8bdbfb9d316f8b016352 (patch)
treedddab7ae07d86dd607aef6227d159af50afe4e2e
parentf7c2a8e5d7fb25f8a47cc2dbbb6682389bc5d012 (diff)
pass server id to preload so that it passes
Issue-ID: INT-1328 Change-Id: I509d69efd134ed0ff3f9b40d3dfa67fb29690b3b Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/resources/sdnc_interface.robot12
-rw-r--r--robot/resources/test_templates/vnf_orchestration_test_template.robot2
2 files changed, 7 insertions, 7 deletions
diff --git a/robot/resources/sdnc_interface.robot b/robot/resources/sdnc_interface.robot
index 77c65f03..902bdaaf 100644
--- a/robot/resources/sdnc_interface.robot
+++ b/robot/resources/sdnc_interface.robot
@@ -84,7 +84,7 @@ Preload Generic VfModule
[Return] ${post_resp}
Preload Vnf
- [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} ${service}
+ [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} ${service} ${server_id}
${base_vf_module_type}= Catenate
${closedloop_vf_module}= Create Dictionary
ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY}
@@ -105,7 +105,7 @@ Preload Vnf
\ ${vf_name}= Update Module Name ${dict} ${vf_module_name}
# Admin portal update no longer
#\ Preload Vnf Profile ${vf_module_type}
- \ Preload One Vnf Topology ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_name} ${vf_module_type} ${service} ${filename} ${uuid}
+ \ Preload One Vnf Topology ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_name} ${vf_module_type} ${service} ${filename} ${uuid} ${server_id}
[Return] ${base_vf_module_type} ${closedloop_vf_module}
Update Module Name
@@ -134,9 +134,9 @@ Get From Mapping
[Return] ${result}
Preload One Vnf Topology
- [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_module_type} ${service} ${filename} ${uuid}
+ [Arguments] ${service_type_uuid} ${generic_vnf_name} ${generic_vnf_type} ${vf_module_name} ${vf_module_type} ${service} ${filename} ${uuid} ${server_id}
Return From Keyword If '${filename}' == ''
- ${parameters}= Get Template Parameters ${generic_vnf_name} ${filename} ${uuid} ${service}
+ ${parameters}= Get Template Parameters ${generic_vnf_name} ${filename} ${uuid} ${service} ${server_id}
Set To Dictionary ${parameters} generic_vnf_name=${generic_vnf_name} generic_vnf_type=${generic_vnf_type} service_type=${service_type_uuid} vf_module_name=${vf_module_name} vf_module_type=${vf_module_type}
Templating.Create Environment sdnc ${GLOBAL_TEMPLATE_FOLDER}
${data}= Templating.Apply Template sdnc ${PRELOAD_TOPOLOGY_OPERATION_BODY}/preload.jinja ${parameters}
@@ -145,13 +145,13 @@ Preload One Vnf Topology
${get_resp}= SDNC.Run Get Request ${SDNC_REST_ENDPOINT} ${SDNC_INDEX_PATH}${PRELOAD_VNF_CONFIG_PATH}/${vf_module_name}/${vf_module_type} auth=${GLOBAL_SDNC_AUTHENTICATION}
Get Template Parameters
- [Arguments] ${generic_vnf_name} ${template} ${uuid} ${service}
+ [Arguments] ${generic_vnf_name} ${template} ${uuid} ${service} ${server_id}
${hostid}= Get Substring ${uuid} -4
${ecompnet}= Evaluate (${GLOBAL_BUILD_NUMBER}%128)+128
${valuemap}= Get Globally Injected Parameters
# update the value map with unique values.
- Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} generic_vnf_name=${generic_vnf_name}
+ Set To Dictionary ${valuemap} uuid=${uuid} hostid=${hostid} ecompnet=${ecompnet} generic_vnf_name=${generic_vnf_name} server_id=${server_id}
#
# Mash together the defaults dict with the test case dict to create the set of
diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index b7f3e975..5bc6e53c 100644
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -66,7 +66,7 @@ Orchestrate VNF
\ ${vnf_type}= Get VNF Type ${catalog_resources} ${vnf} ${service}
\ ${vf_module}= Get VF Module ${catalog_resources} ${vnf} ${service}
\ Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${customer_name}
- \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} ${service}
+ \ ${vf_module_type} ${closedloop_vf_module}= Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} ${service} ${server_id}
\ ${vf_module_id}= Create VID VNF module ${service_instance_id} ${vf_module_name} ${lcp_region} ${tenant_name} ${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}