diff options
Diffstat (limited to 'robot')
| -rw-r--r-- | robot/assets/service_mappings.py | 30 | ||||
| -rw-r--r-- | robot/resources/vid/create_service_instance.robot | 6 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 10 |
3 files changed, 26 insertions, 20 deletions
diff --git a/robot/assets/service_mappings.py b/robot/assets/service_mappings.py index 977d216c..50c3ee21 100644 --- a/robot/assets/service_mappings.py +++ b/robot/assets/service_mappings.py @@ -83,23 +83,23 @@ This metadata identifes the preloads that need to be done for a VNF as there may i.e. GLOBAL_PRELOAD_PARAMETERS['Demo'][dnsscaling_preload.template'] ''' GLOBAL_SERVICE_TEMPLATE_MAPPING = { - "vFW" : [{"isBase" : "true", "template" : "vfw_preload.template", "name_pattern": "base_vfw"}], - "vLB" : [{"isBase" : "true", "template" : "vlb_preload.template", "name_pattern": "base_vlb"}, - {"isBase" : "false", "template" : "dnsscaling_preload.template", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}], - "vVG" : [{"isBase" : "true", "template" : "vvg_preload.template", "name_pattern": "base_vvg"}], - "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "name_pattern": "base_clearwater"}], - "vFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}], - "vPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], - "vFWCL" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "name_pattern": "base_vfw"}, - {"isBase" : "true", "template" : "vpkg_preload.template", "name_pattern": "base_vpkg"}], + "vFW" : [{"isBase" : "true", "template" : "vfw_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}], + "vLB" : [{"isBase" : "true", "template" : "vlb_preload.template", "vnf_index": "0", "name_pattern": "base_vlb"}, + {"isBase" : "false", "template" : "dnsscaling_preload.template", "vnf_index": "1", "name_pattern": "dnsscaling", "prefix" : "vDNS_"}], + "vVG" : [{"isBase" : "true", "template" : "vvg_preload.template", "vnf_index": "0", "name_pattern": "base_vvg"}], + "vCPE" : [{"isBase" : "true", "template" : "vcpe_preload.template", "vnf_index": "0", "name_pattern": "base_clearwater"}], + "vFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}], + "vPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "vnf_index": "0", "name_pattern": "base_vpkg"}], + "vFWCL" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}, + {"isBase" : "true", "template" : "vpkg_preload.template", "vnf_index": "1", "name_pattern": "base_vpkg"}], "vFWCLvFWSNK" : [{"isBase" : "true", "template" : "vfwsnk_preload.template", "vnf_index": "0", "name_pattern": "base_vfw"}], "vFWCLvPKG" : [{"isBase" : "true", "template" : "vpkg_preload.template", "vnf_index": "1" , "name_pattern": "base_vpkg"}], - "vCPEInfra" : [{"isBase" : "true", "template" : "vcpe_infra_preload.template", "name_pattern": "base_infra"}], - "vCPEvBNG" : [{"isBase" : "true", "template" : "vcpe_vbng_preload.template", "name_pattern": "base_vbng"}], - "vCPEvBRGEMU" : [{"isBase" : "true", "template" : "vcpe_vbrgemu_preload.template", "name_pattern": "base_vbrgemu"}], - "vCPEvGMUX" : [{"isBase" : "true", "template" : "vcpe_vgmux_preload.template", "name_pattern": "base_vgmux"}], - "vCPEvGW" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "name_pattern": "base_vgw"}], - "vCPEResCust" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "name_pattern": "base_vgw"}], + "vCPEInfra" : [{"isBase" : "true", "template" : "vcpe_infra_preload.template", "vnf_index": "0", "name_pattern": "base_infra"}], + "vCPEvBNG" : [{"isBase" : "true", "template" : "vcpe_vbng_preload.template", "vnf_index": "0", "name_pattern": "base_vbng"}], + "vCPEvBRGEMU" : [{"isBase" : "true", "template" : "vcpe_vbrgemu_preload.template", "vnf_index": "0", "name_pattern": "base_vbrgemu"}], + "vCPEvGMUX" : [{"isBase" : "true", "template" : "vcpe_vgmux_preload.template", "vnf_index": "0", "name_pattern": "base_vgmux"}], + "vCPEvGW" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}], + "vCPEResCust" : [{"isBase" : "true", "template" : "vcpe_vgw_preload.template", "vnf_index": "0", "name_pattern": "base_vgw"}], } ''' diff --git a/robot/resources/vid/create_service_instance.robot b/robot/resources/vid/create_service_instance.robot index 76597260..719b85d6 100644 --- a/robot/resources/vid/create_service_instance.robot +++ b/robot/resources/vid/create_service_instance.robot @@ -15,8 +15,7 @@ Resource vid_interface.robot Create VID Service Instance [Documentation] Creates a service instance using VID [Arguments] ${customer_name} ${service_model_type} ${service_type} ${service_name} ${project_name} ${owning_entity} - Go To VID Browse Service Models - Wait Until Keyword Succeeds 180s 5s Wait For Model ${service_model_type} + Wait Until Keyword Succeeds 180s 15s Wait For Model ${service_model_type} Press Key xpath=//tr[td/span/text() = '${service_model_type}']/td/button[text() = 'Deploy' and not(@disabled)] \\13 ${uuid}= Generate UUID Wait Until Page Contains Element xpath=//input[@parameter-name='Instance Name'] ${GLOBAL_VID_UI_TIMEOUT_LONG} @@ -44,6 +43,9 @@ Create VID Service Instance Wait For Model [Documentation] Distributed model may not yet be available. Kepp trying until it shows up. [Arguments] ${service_model_type} + # Need to refresh browser json data Home -> Browse Service Models cycle does that + Go To VID Home + Go To VID Browse Service Models Page Should Contain Element xpath=//div/h1[text() = 'Browse SDC Service Models'] Wait Until Page Contains Element xpath=//button[text() = 'Deploy'] ${GLOBAL_VID_UI_TIMEOUT_MEDIUM} Input Text When Enabled //input[@ng-model='searchString'] ${service_model_type} diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index fe0d3e15..eaca637d 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -40,7 +40,9 @@ Create VID VNF Sleep 10s Input Text xpath=//input[@parameter-id='instanceName'] ${service_instance_name} Select From List By Label xpath=//select[@parameter-id='productFamily'] ${product_family} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + # Fix for Dublin + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Sleep 5s Click Element xpath=//multiselect[@parameter-id='lineOfBusiness'] @@ -73,7 +75,8 @@ Delete VID VNF Wait Until Page Contains Element xpath=//div[@class='statusLine'] timeout=${GLOBAL_VID_UI_TIMEOUT_LONG} Wait Until Element Is Not Visible xpath=//div[@class='statusLine aaiHidden'] timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} Click On Element When Visible xpath=//li/div[contains(.,'${vnf_instance_id}')]/a/span[@class='glyphicon glyphicon-remove'] timeout=${GLOBAL_VID_UI_TIMEOUT_LONG} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Click Element xpath=//div[@class='buttonRow']/button[@ngx-enabled='true'] #//*[@id="mContent"]/div/div/div/div/table/tbody/tr/td/div/div[2]/div/div[1]/div[5]/button[1] @@ -107,7 +110,8 @@ Create VID VNF module ## Wait Until Angular Ready just sleeps for its timeout value Sleep 10s Input Text xpath=//input[@parameter-id='instanceName'] ${vf_module_name} - Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} + ${cloud_owner_uc}= Convert To Uppercase ${GLOBAL_AAI_CLOUD_OWNER} + Select From List By Label xpath=//select[@parameter-id='lcpRegion'] ${lcp_region} (${cloud_owner_uc}) Select From List By Label xpath=//select[@parameter-id='tenant'] ${tenant} Wait Until Element Is Visible xpath=//input[@parameter-id='sdncPreload'] ${GLOBAL_VID_UI_TIMEOUT_SHORT} Wait Until Element Is Enabled xpath=//input[@parameter-id='sdncPreload'] ${GLOBAL_VID_UI_TIMEOUT_SHORT} |