From 67afaca4f14965ac90f724ec56fb87d900cf807a Mon Sep 17 00:00:00 2001 From: DR695H Date: Tue, 23 Jul 2019 17:13:23 -0400 Subject: cleaning up some warnings need these cleaned before switching over the variabel strucuture in preload Issue-ID: TEST-174 Change-Id: I1667f45b0135a059dfab2835c9b4f743703c60a5 Signed-off-by: DR695H --- robot/resources/appc_interface.robot | 6 +++--- robot/resources/browser_setup.robot | 2 +- robot/resources/openstack/cinder_interface.robot | 6 +++--- robot/resources/openstack/heat_interface.robot | 4 ++-- robot/resources/openstack/keystone_interface.robot | 10 +++++----- robot/resources/openstack/neutron_interface.robot | 6 +++--- robot/resources/openstack/nova_interface.robot | 12 ++++++------ robot/resources/portal-sdk/portalDef.robot | 6 +++--- robot/resources/sdngc_interface.robot | 6 +++--- robot/resources/ssh/files.robot | 4 +--- .../stack_validation/packet_generator_interface.robot | 2 +- .../resources/test_templates/closedloop_test_template.robot | 4 ++-- .../test_templates/vnf_orchestration_test_template.robot | 2 +- 13 files changed, 34 insertions(+), 36 deletions(-) (limited to 'robot/resources') diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot index 94898f0e..7ae27c72 100644 --- a/robot/resources/appc_interface.robot +++ b/robot/resources/appc_interface.robot @@ -2,7 +2,7 @@ Documentation The main interface for interacting with APP-C. It handles low level stuff like managing the http request library and APP-C required fields Library RequestsLibrary Library ONAPLibrary.Utilities -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Library SeleniumLibrary Resource browser_setup.robot @@ -55,8 +55,8 @@ Create Mount Point In APPC [Documentation] Go tell APPC about the PGN we just spun up... [Arguments] ${nodeid} ${host} ${port}=${GLOBAL_PGN_PORT} ${username}=admin ${password}=admin ${dict}= Create Dictionary nodeid=${nodeid} host=${host} port=${port} username=${username} password=${password} - Create Environment appc ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template appc ${APPC_MOUNT_XML} ${dict} + Templating.Create Environment appc ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template appc ${APPC_MOUNT_XML} ${dict} ${resp}= Run APPC Put Request ${APPC_INDEX PATH}${APPC_CREATE_MOUNTPOINT_PATH}${nodeid} ${data} Should Be True 200 <= ${resp.status_code} < 300 [Return] ${resp} diff --git a/robot/resources/browser_setup.robot b/robot/resources/browser_setup.robot index 3af1342a..634d3130 100644 --- a/robot/resources/browser_setup.robot +++ b/robot/resources/browser_setup.robot @@ -22,7 +22,7 @@ Setup Browser Firefox ${wd}= Create WebDriver Firefox capabilities=${caps} Set Global Variable ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES} ${caps} - Setup Browser Chrome +Setup Browser Chrome ${chrome options}= Evaluate sys.modules['selenium.webdriver'].ChromeOptions() sys Call Method ${chrome options} add_argument no-sandbox Run Keyword If ${HEADLESS}==True Call Method ${chrome options} add_argument headless diff --git a/robot/resources/openstack/cinder_interface.robot b/robot/resources/openstack/cinder_interface.robot index ca6e62b7..cbff9401 100644 --- a/robot/resources/openstack/cinder_interface.robot +++ b/robot/resources/openstack/cinder_interface.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles Library ONAPLibrary.Openstack Library RequestsLibrary Library ONAPLibrary.Utilities -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Resource ../global_properties.robot Resource openstack_common.robot @@ -34,8 +34,8 @@ Add Openstack Volume [Arguments] ${alias} ${name} ${size} ${uuid}= Generate UUID4 ${arguments}= Create Dictionary name=${name} description=${GLOBAL_APPLICATION_ID}${uuid} size=${size} type=${OPENSTACK_CINDER_VOLUMES_TYPE} availability_zone=${OPENSTACK_CINDER_AVAILABILITY_ZONE} - Create Environment cinder ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template cinder ${OPENSTACK_CINDER_VOLUMES_ADD_BODY_FILE} ${arguments} + Templating.Create Environment cinder ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template cinder ${OPENSTACK_CINDER_VOLUMES_ADD_BODY_FILE} ${arguments} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_CINDER_SERVICE_TYPE} ${OPENSTACK_CINDER_VOLUMES_PATH} data_path= data=${data} Should Be Equal As Strings 200 ${resp.status_code} [Return] ${resp.json()['volume']['id']} diff --git a/robot/resources/openstack/heat_interface.robot b/robot/resources/openstack/heat_interface.robot index 0362d3eb..212c1394 100644 --- a/robot/resources/openstack/heat_interface.robot +++ b/robot/resources/openstack/heat_interface.robot @@ -4,7 +4,7 @@ Library ONAPLibrary.Openstack Library RequestsLibrary Library OperatingSystem Library Collections -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Resource ../global_properties.robot Resource openstack_common.robot @@ -39,7 +39,7 @@ Make Add Stack Request ${templatedata}= Template Yaml To Json ${template} ${envdata}= Env Yaml To Json ${env} ${dict}= Create Dictionary template=${templatedata} parameters=${envdata} stack_name=${name} - Create Environment heat ${GLOBAL_TEMPLATE_FOLDER} + Templating.Create Environment heat ${GLOBAL_TEMPLATE_FOLDER} ${request}= Apply Template heat ${OPENSTACK_HEAT_ADD_STACK_TEMPLATE} ${dict} Log ${request} [Return] ${request} diff --git a/robot/resources/openstack/keystone_interface.robot b/robot/resources/openstack/keystone_interface.robot index 1df6ac91..4ea86d6c 100644 --- a/robot/resources/openstack/keystone_interface.robot +++ b/robot/resources/openstack/keystone_interface.robot @@ -6,7 +6,7 @@ Library ONAPLibrary.Utilities Library Collections Library OperatingSystem Library String -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Resource ../global_properties.robot Resource openstack_common.robot @@ -67,8 +67,8 @@ Get KeyStoneAuthv2 Data [Documentation] Returns all the data for keystone auth v2 api [Arguments] ${username} ${password} ${path} ${arguments}= Create Dictionary username=${username} password=${password} tenantId=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} - Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v2_BODY_FILE} ${arguments} + Templating.Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v2_BODY_FILE} ${arguments} ${data_path}= Catenate ${path}${OPENSTACK_KEYSTONE_AUTH_v2_PATH} [Return] ${data_path} ${data} @@ -76,8 +76,8 @@ Get KeyStoneAuthv3 Data [Documentation] Returns all the data for keystone auth v3 api [Arguments] ${username} ${password} ${path} ${arguments}= Create Dictionary username=${username} password=${password} domain_id=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} project_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_NAME} - Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v3_BODY_FILE} ${arguments} + Templating.Create Environment keystone ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template keystone ${OPENSTACK_KEYSTONE_AUTH_v3_BODY_FILE} ${arguments} ${data_path}= Catenate ${path}${OPENSTACK_KEYSTONE_AUTH_v3_PATH} [Return] ${data_path} ${data} diff --git a/robot/resources/openstack/neutron_interface.robot b/robot/resources/openstack/neutron_interface.robot index 058809de..b216a4d5 100644 --- a/robot/resources/openstack/neutron_interface.robot +++ b/robot/resources/openstack/neutron_interface.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles Library ONAPLibrary.Openstack Library RequestsLibrary Library Collections -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Resource ../global_properties.robot Resource openstack_common.robot @@ -44,8 +44,8 @@ Add Openstack Network [Documentation] Runs an Openstack Request to add a network and returns that network id of the created network [Arguments] ${alias} ${name} ${arguments}= Create Dictionary name=${name} - Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template openstack ${OPENSTACK_NEUTRON_NETWORK_ADD_BODY_FILE} ${arguments} + Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template openstack ${OPENSTACK_NEUTRON_NETWORK_ADD_BODY_FILE} ${arguments} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NEUTRON_SERVICE_TYPE} ${OPENSTACK_NEUTRON_NETWORK_PATH} data_path= data=${data} Should Be Equal As Strings 201 ${resp.status_code} [Return] ${resp.json()['network']['id']} diff --git a/robot/resources/openstack/nova_interface.robot b/robot/resources/openstack/nova_interface.robot index 52bd174c..6c576d15 100644 --- a/robot/resources/openstack/nova_interface.robot +++ b/robot/resources/openstack/nova_interface.robot @@ -3,7 +3,7 @@ Documentation The main interface for interacting with Openstack. It handles Library ONAPLibrary.Openstack Library RequestsLibrary Library ONAPLibrary.JSON -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Library OperatingSystem Library Collections Resource ../global_properties.robot @@ -31,8 +31,8 @@ Add Openstack Keypair [Documentation] Runs an Openstack Request to add a keypair and returns the keypair name [Arguments] ${alias} ${name} ${ssh_key} ${arguments}= Create Dictionary name=${name} publickey=${ssh_key} - Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template openstack ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} ${arguments} + Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template openstack ${OPENSTACK_NOVA_KEYPAIR_ADD_BODY_FILE} ${arguments} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_KEYPAIR_PATH} data_path= data=${data} Should Be Equal As Strings 200 ${resp.status_code} [Return] ${resp.json()['keypair']['name']} @@ -98,8 +98,8 @@ Add Server For Image Name ${imageRef}= Get Id For Name ${images} ${imageName} ${flavorRef}= Get Id For Name ${flavors} ${flavorName} ${dict}= Create Dictionary name=${name} imageRef=${imageRef} flavorRef=${flavorRef} public_net_id=${public_net_id} - Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} - ${data}= Apply Template openstack ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict} + Templating.Create Environment openstack ${GLOBAL_TEMPLATE_FOLDER} + ${data}= Templating.Apply Template openstack ${OPENSTACK_NOVA_SERVER_ADD_BODY_FILE} ${dict} ${resp}= Internal Post Openstack ${alias} ${GLOBAL_OPENSTACK_NOVA_SERVICE_TYPE} ${OPENSTACK_NOVA_SERVERS_PATH} data_path= data=${data} ${status_string}= Convert To String ${resp.status_code} Should Match Regexp ${status_string} ^(202)$ @@ -112,7 +112,7 @@ Wait for Server to Be Active Should Be Equal ${status} ACTIVE [Return] ${server_info} - Get Active Server +Get Active Server [Arguments] ${alias} ${server_id} ${resp}= Get Openstack Server By Id ${alias} ${server_id} Should Be Equal As Strings ${resp.status_code} 200 diff --git a/robot/resources/portal-sdk/portalDef.robot b/robot/resources/portal-sdk/portalDef.robot index 66928fa4..6b5036b9 100644 --- a/robot/resources/portal-sdk/portalDef.robot +++ b/robot/resources/portal-sdk/portalDef.robot @@ -6,7 +6,7 @@ Library RequestsLibrary Library DateTime Library Collections Library String -Library ONAPLibrary.Templating +Library ONAPLibrary.Templating WITH NAME Templating Resource ../browser_setup.robot @@ -854,8 +854,8 @@ Enhanced Notification on ONAP Portal Notification on ONAP Portal [Documentation] Create Config portal ${configportal}= Create Dictionary jira_id=${jira} - Create Environment portal ${GLOBAL_TEMPLATE_FOLDER} - ${output} = Apply Template portal ${portal_Template} ${configportal} + Templating.Create Environment portal ${GLOBAL_TEMPLATE_FOLDER} + ${output} = Templating.Apply Template portal ${portal_Template} ${configportal} ${post_resp} = Enhanced Notification on ONAP Portal ${RESOURCE_PATH} ${output} Should Be Equal As Strings ${post_resp.status_code} 200 diff --git a/robot/resources/sdngc_interface.robot b/robot/resources/sdngc_interface.robot index 4f6f3326..766be9e9 100644 --- a/robot/resources/sdngc_interface.robot +++ b/robot/resources/sdngc_interface.robot @@ -97,9 +97,9 @@ Preload Vnf \ ${vf_module_type}= Get From Dictionary ${vf_module} name # need to pass in vnf_index if non-zero \ ${dict} Run Keyword If "${generic_vnf_name}".endswith('0') Get From Mapping With Index ${templates} ${vf_module} 0 - \ ... ELSE IF "${generic_vnf_name}".endswith('1') Get From Mapping With Index ${templates} ${vf_module} 1 - \ ... ELSE IF "${generic_vnf_name}".endswith('2') Get From Mapping With Index ${templates} ${vf_module} 2 - \ ... ELSE Get From Mapping ${templates} ${vf_module} + ... ELSE IF "${generic_vnf_name}".endswith('1') Get From Mapping With Index ${templates} ${vf_module} 1 + ... ELSE IF "${generic_vnf_name}".endswith('2') Get From Mapping With Index ${templates} ${vf_module} 2 + ... ELSE Get From Mapping ${templates} ${vf_module} # skip this iteration if no template \ ${test_dict_length} = Get Length ${dict} \ Continue For Loop If ${test_dict_length} == 0 diff --git a/robot/resources/ssh/files.robot b/robot/resources/ssh/files.robot index 9ccdd717..e89e5989 100644 --- a/robot/resources/ssh/files.robot +++ b/robot/resources/ssh/files.robot @@ -5,8 +5,6 @@ Library SSHLibrary Library String Library Collections -*** Variables *** - *** Keywords *** Open Connection And Log In [Documentation] Open a connection using the passed user and SSH key. Connection alias will be the host name by default. @@ -20,7 +18,7 @@ Grep Local File ${output}= Execute Command grep ${pattern} ${fullpath} [Return] ${output} - Grep File on Host +Grep File on Host [Documentation] Grep the passed file name and return all of the lines that match the passed pattern using passed connection alias/host [Arguments] ${host} ${pattern} ${fullpath} Switch Connection ${host} diff --git a/robot/resources/stack_validation/packet_generator_interface.robot b/robot/resources/stack_validation/packet_generator_interface.robot index 6b34669d..802c8df7 100644 --- a/robot/resources/stack_validation/packet_generator_interface.robot +++ b/robot/resources/stack_validation/packet_generator_interface.robot @@ -89,7 +89,7 @@ Disable All Streams Should Be Equal As Strings ${resp.status_code} 200 [Return] ${resp} - Disable Stream +Disable Stream [Documentation] Disables packet generator for the passed stream [Arguments] ${host} ${stream}=udp1 ${alias}=pgn ${session}= Connect To Packet Generator ${host} alias=${alias} diff --git a/robot/resources/test_templates/closedloop_test_template.robot b/robot/resources/test_templates/closedloop_test_template.robot index 55be4692..51bfbe73 100644 --- a/robot/resources/test_templates/closedloop_test_template.robot +++ b/robot/resources/test_templates/closedloop_test_template.robot @@ -120,7 +120,7 @@ Create Config Policy ${put_resp} = Run Policy Put Request ${RESOURCE_PATH_CREATE} ${output} Should Be Equal As Strings ${put_resp.status_code} 200 - Create Policy Name +Create Policy Name [Documentation] Generate Policy Name [Arguments] ${prefix}=ETE_ ${random}= Generate Random String 15 [LOWER][NUMBERS] @@ -187,7 +187,7 @@ Orchestrate VNF vFW closedloop ${customer_name}= Catenate ETE_CLP_${uuid} [Return] ${vf_module_name_list} ${generic_vnfs} ${server_id} ${service_instance_id} ${customer_name} ${uris_to_delete} - Orchestrate VNF vDNS closedloop +Orchestrate VNF vDNS closedloop [Documentation] VNF Orchestration for vLB Log VNF Orchestration flow TEST NAME=${TEST NAME} ${tenant_id} ${tenant_name}= Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot index 3311c8bb..1e68e568 100644 --- a/robot/resources/test_templates/vnf_orchestration_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot @@ -30,8 +30,8 @@ Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping Orchestrate VNF Template [Documentation] Use openECOMP to Orchestrate a service. [Arguments] ${customer_name} ${service} ${product_family} ${delete_flag}=DELETE - ${tenant_id} ${tenant_name}= Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone ${uuid}= Generate UUID4 + ${tenant_id} ${tenant_name}= Setup Orchestrate VNF ${GLOBAL_AAI_CLOUD_OWNER} SharedNode OwnerType v1 CloudZone ${vf_module_name_list} ${generic_vnfs} ${server_id} ${service_instance_id} ${catalog_resource_ids} ${catalog_service_id} ${uris_to_delete}= Orchestrate VNF ${customer_name}_${uuid} ${service} ${product_family} ${tenant_id} ${tenant_name} Run Keyword If '${delete_flag}' == 'DELETE' Delete VNF ${tenant_name} ${server_id} ${customer_name}_${uuid} ${service_instance_id} ${vf_module_name_list} ${uris_to_delete} [Teardown] Teardown VNF ${customer_name}_${uuid} ${catalog_service_id} ${catalog_resource_ids} -- cgit 1.2.3-korg