diff options
| author |   DR695H <dr695h@att.com> | 2019-07-22 12:37:45 -0400 |
|---|---|---|
| committer | DR695H <dr695h@att.com> | 2019-07-22 17:17:28 -0400 |
| commit | c1103fba68e3461b136b044daec3339d0e6575f7 (patch) | |
| tree | aeef2cbf58858d236d8dfa4b17c463fab83b5b6a /robot/resources/aai | |
| parent | d979465ec6720dffbebd22bd83104ea5a5f4e65e (diff) | |
remove the last of the global variables
Issue-ID: TEST-174
Change-Id: I1997bd0e4b693f3560f2cfc254c93537c96ed444
Signed-off-by: DR695H <dr695h@att.com>
Diffstat (limited to 'robot/resources/aai')
| -rw-r--r-- | robot/resources/aai/service_instance.robot | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/robot/resources/aai/service_instance.robot b/robot/resources/aai/service_instance.robot index cca1eaf6..c881fda8 100644 --- a/robot/resources/aai/service_instance.robot +++ b/robot/resources/aai/service_instance.robot @@ -24,11 +24,6 @@ ${SERVCE INSTANCE TEMPLATE} aai/service_subscription.jinja ${GENERIC_VNF_PATH_TEMPLATE} /network/generic-vnfs/generic-vnf/\${vnf_id}/vf-modules/vf-module/\${vf_module_id} ${GENERIC_VNF_QUERY_TEMPLATE} /network/generic-vnfs/generic-vnf/\${vnf_id}/vf-modules/vf-module?vf-module-name=\${vf_module_name} -${VLB_CLOSED_LOOP_HACK_BODY} aai/vlb_closed_loop_hack.jinja - -#*************** Test Case Variables ************* -${VLB_CLOSED_LOOP_DELETE} -${VLB_CLOSED_LOOP_VNF_ID} *** Keywords *** Validate Service Instance @@ -51,46 +46,6 @@ Validate Generic VNF ${generic_vnf}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${INDEX PATH}/network/generic-vnfs/generic-vnf/${vnf_id}?depth=all auth=${auth [Return] ${generic_vnf.json()} -VLB Closed Loop Hack - [Arguments] ${service} ${generic_vnf} ${closedloop_vf_module} - Return From Keyword If '${service}' != 'vLB' - ${vnf_id}= Get From Dictionary ${generic_vnf} vnf-id - ${vf_modules}= Get From Dictionary ${generic_vnf} vf-modules - ${list}= Get From Dictionary ${vf_modules} vf-module - ${vfmodule}= Get From List ${list} 0 - ${persona_model_id}= Get From Dictionary ${closedloop_vf_module} invariantUUID - ${persona_model_version}= Get From Dictionary ${closedloop_vf_module} version - ${dummy}= Catenate dummy_${vnf_id} - ${dict}= Create Dictionary vnf_id=${vnf_id} vf_module_id=${dummy} persona_model_id=${persona_model_id} persona_model_version=${persona_model_version} - ${datapath}= Templating.Template String ${GENERIC_VNF_PATH_TEMPLATE} ${dict} - Templating.Create Environment aai ${GLOBAL_TEMPLATE_FOLDER} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${data}= Templating.Apply Template aai ${VLB_CLOSED_LOOP_HACK_BODY} ${dict} - ${put_resp}= AAI.Run Put Request ${AAI_FRONTEND_ENDPOINT} ${INDEX PATH}${datapath} ${data} auth=${auth - ${status_string}= Convert To String ${put_resp.status_code} - Should Match Regexp ${status_string} ^(201|412)$ - Set Test Variable ${VLB_CLOSED_LOOP_DELETE} ${datapath} - Set Test Variable ${VLB_CLOSED_LOOP_VNF_ID} ${vnf_id} - -VLB Closed Loop Hack Update - [Documentation] Update the A&AI vDNS scaling vf module to have persona-model-version 1 rather than 1.0 - [Arguments] ${stack_name} - ${auth}= Create List ${GLOBAL_AAI_USERNAME} ${GLOBAL_AAI_PASSWORD} - ${dict}= Create Dictionary vnf_id=${VLB_CLOSED_LOOP_VNF_ID} vf_module_name=${stack_name} - ${query}= Templating.Template String ${GENERIC_VNF_QUERY_TEMPLATE} ${dict} - ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${INDEX_PATH}${query} auth=${auth - ${json}= Set Variable ${get_resp.json()} - Set to Dictionary ${json} persona-model-version 1 - ${vf_module_id}= Get From Dictionary ${json} vf-module-id - Set to Dictionary ${dict} vf_module_id=${vf_module_id} - ${uri}= Templating.Template String ${GENERIC_VNF_PATH_TEMPLATE} ${dict} - ${resp}= AAI.Run Put Request ${AAI_FRONTEND_ENDPOINT} ${INDEX_PATH}${uri} ${json} auth=${auth - ${get_resp}= AAI.Run Get Request ${AAI_FRONTEND_ENDPOINT} ${INDEX_PATH}${query} auth=${auth - -Teardown VLB Closed Loop Hack - Return From Keyword If ' ${VLB_CLOSED_LOOP_DELETE}' == '' - Delete A&AI Entity ${VLB_CLOSED_LOOP_DELETE} - Validate VF Module [Documentation] Query and Validates A&AI Service Instance [Arguments] ${vf_module_name} ${stack_type} |