diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-11-13 13:18:59 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2019-11-13 13:21:34 -0500 |
| commit | c86db4191422c5fc27122d2ed7d8fa7b76b91b24 (patch) | |
| tree | e261e91aba370b458fda78ffc56ae7fa92a7a022 | |
| parent | c3188106f419bbd851c2fb059b150a46b603609c (diff) | |
Fix Demo Instantiate after GRA update
Issue-ID: INT-1345
Change-Id: I9b770a98d3b6dc82f0737872ff1fdc5e430703ec
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rw-r--r-- | robot/resources/sdc_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/test_templates/vnf_orchestration_test_template.robot | 5 | ||||
| -rw-r--r-- | robot/resources/vid/create_vid_vnf.robot | 4 |
3 files changed, 8 insertions, 3 deletions
diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot index 3c3b3a46..366e5f5e 100644 --- a/robot/resources/sdc_interface.robot +++ b/robot/resources/sdc_interface.robot @@ -735,7 +735,7 @@ Get SDC Demo Vnf Catalog Resource [Documentation] Gets Resource ids of demonstration VNFs for instantiation [Arguments] ${service_name} ${resp}= Get Service Catalog ${service_name} - @{ITEMS}= Copy List ${resp.json()['componentInstances']} + @{ITEMS}= Copy List ${resp['componentInstances']} ${demo_catalog_resource}= Create Dictionary :FOR ${ELEMENT} IN @{ITEMS} \ Log ${ELEMENT['name']} diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index b2364fb7..15ec02ea 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -114,8 +114,9 @@ Orchestrate Demo VNF \ Create VID VNF ${service_instance_id} ${vnf_name} ${product_family} ${lcp_region} ${tenant_name} ${vnf_type} ${full_customer_name} \ ${vf_module_entry}= Create Dictionary name=${vf_module} \ ${vf_modules}= Create List ${vf_module_entry} - \ ${vf_module_type} ${closedloop_vf_module}= Run Keyword If "${API_TYPE}"=="GRA_API" Preload Gra ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} ${service} ${server_id} - \ ... ELSE Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_module} ${vnf} ${uuid} ${service} ${server_id} + # in Demo VNF flow old logic since we did not create the resource so @{vf_modules} is passed to Preload Vnf / Preload Gra + \ ${vf_module_type} ${closedloop_vf_module}= Run Keyword If "${API_TYPE}"=="GRA_API" Preload Gra ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_modules} ${vnf} ${uuid} ${service} ${server_id} + \ ... ELSE Preload Vnf ${service_instance_id} ${vnf_name} ${vnf_type} ${vf_module_name} ${vf_modules} ${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} ${full_customer_name} ${vnf_name} diff --git a/robot/resources/vid/create_vid_vnf.robot b/robot/resources/vid/create_vid_vnf.robot index 42bde328..a0088b0d 100644 --- a/robot/resources/vid/create_vid_vnf.robot +++ b/robot/resources/vid/create_vid_vnf.robot @@ -14,6 +14,10 @@ Create VID VNF [Documentation] Creates a VNF instance using VID for passed instance id with the passed service instance name [Arguments] ${service_instance_id} ${service_instance_name} ${product_family} ${lcp_region} ${tenant} ${vnf_type} ${customer} ${line_of_business}=LOB-Demonstration ${platform}=Platform-Demonstration ${cloud_owner_uc}=${GLOBAL_AAI_CLOUD_OWNER} Go To VID HOME + ##### TEST BIGGER WINDOW TO AVOID MASKED ITEMS PROBLEM ##### + ${width} ${height}= Get Window Size + Set Window Size 2000 1000 + ${width} ${height}= Get Window Size Click Link xpath=//div[@heading = 'Search for Existing Service Instances']/a Wait Until Page Contains Please search by timeout=${GLOBAL_VID_UI_TIMEOUT_MEDIUM} |