From 3256fa2ce9d99ae4b94ab202f5c36339e0159cc8 Mon Sep 17 00:00:00 2001 From: mrichomme Date: Mon, 9 Mar 2020 11:23:35 +0100 Subject: Remove trailing spaces in robot scripts warning raised when using robotframework-linter Issue-ID: INT-1478 Signed-off-by: mrichomme Change-Id: I8eb97ef9e3651c0d8f9de6647ebc917d1addf9d0 Signed-off-by: mrichomme --- robot/testsuites/closed-loop.robot | 5 ++--- robot/testsuites/create-cloud-config.robot | 10 +++++----- robot/testsuites/demo.robot | 4 ++-- robot/testsuites/portalApp.robot | 4 ++-- robot/testsuites/post-install-tests.robot | 4 ++-- robot/testsuites/vnf-orchestration-direct-so.robot | 4 ++-- robot/testsuites/vnf-orchestration-ovp.robot | 6 +++--- robot/testsuites/vnf-orchestration.robot | 11 +++-------- 8 files changed, 21 insertions(+), 27 deletions(-) (limited to 'robot/testsuites') diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot index c4ee203c..d3b161fc 100644 --- a/robot/testsuites/closed-loop.robot +++ b/robot/testsuites/closed-loop.robot @@ -10,11 +10,11 @@ ${PACKET_GENERATOR_HOST} VFW Closed Loop Test [TAGS] closedloop vfwcl VFW Policy - + VDNS Closed Loop Test [TAGS] closedloop vdnscl VDNS Policy - + VFWCL Closed Loop Test [TAGS] vfwclosedloop Log ${EMPTY} @@ -26,4 +26,3 @@ VFWCL Repush Operation Policy [TAGS] repushpolicy Undeploy Policy operational.modifyconfig Update vVFWCL Policy ${MODEL_INVARIANT_ID} - diff --git a/robot/testsuites/create-cloud-config.robot b/robot/testsuites/create-cloud-config.robot index cda8a5e6..2462cc27 100644 --- a/robot/testsuites/create-cloud-config.robot +++ b/robot/testsuites/create-cloud-config.robot @@ -10,20 +10,20 @@ Resource ../resources/aai/create_tenant.robot Create Cloud Config Test [TAGS] so cloudconfig # Run Create Cloud Configuration RegionOne RegionOne RegionOne DEFAULT_KEYSTONE identify_url:http://10.12.25.2:5000/v2.0 mso_id:demo mso_pass:encrypted_password admin_tenant:1e097c6713e74fd7ac8e4295e605ee1e member_role:admin identity_server_type:KEYSTONE identity_authentication_type:USERNAME_PASSWORD - ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_API_KEY} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD + ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_API_KEY} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} Create Cloud Config RegionThree V3 Test [TAGS] so cloudconfig cloudconfigv3 [Documentation] Create Keystone V3 in Region 3 - ... [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} + ... [Arguments] ${site_name} ${region_id} ${clli} ${identity_id} ${identity_url} ${mso_id} ${mso_pass} ... ${admin_tenant} ${member_role} ${identity_server_type} ${authentication_type} ${project_domain_name} ${user_domain_Name} ... ${region_id} in openstack is set up by cloud administration and does not have to be same as ONAP ${site_name} ... In Windriver/Intel test labs the os_region_id's are all set to "RegionOne" ... clli by testing team convention is same as onap site_name ... KEYSTONE URL should end in /v3 SO will put /auth when KEYSTONE_V3 is the identity_server_type - ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION_THREE} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION_THREE} identity_id=REGION_THREE_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD_REGION_THREE} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE} + ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION_THREE} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION_THREE} identity_id=REGION_THREE_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE_REGION_THREE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION_REGION_THREE} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME_REGION_THREE} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD_REGION_THREE} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE} ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} Inventory Tenant If Not Exists CloudOwner ${GLOBAL_INJECTED_REGION_THREE} SharedNode OwnerType v1 CloudZone ${GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE} ${GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE} @@ -31,5 +31,5 @@ Create Cloud Config RegionThree V3 Test Get Cloud Config Test [TAGS] mso cloudconfig ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} - ${get_resp}= SO.Get Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_INJECTED_REGION} auth=${auth} - Should Be Equal As Strings ${get_resp.status_code} 200 \ No newline at end of file + ${get_resp}= SO.Get Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_INJECTED_REGION} auth=${auth} + Should Be Equal As Strings ${get_resp.status_code} 200 diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot index 9b870015..7437a822 100644 --- a/robot/testsuites/demo.robot +++ b/robot/testsuites/demo.robot @@ -34,7 +34,7 @@ Initialize Customer And Models Initialize SO Openstack Identity For V3 [Tags] InitDemo - ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN} + ${arguments}= Create Dictionary site_name=${GLOBAL_INJECTED_REGION} region_id=${GLOBAL_INJECTED_REGION} clli=${GLOBAL_INJECTED_REGION} identity_id=DEFAULT_KEYSTONE identity_url=${GLOBAL_INJECTED_KEYSTONE}/${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION} mso_id=${GLOBAL_INJECTED_OPENSTACK_USERNAME} mso_pass=${GLOBAL_INJECTED_OPENSTACK_SO_ENCRYPTED_PASSWORD} admin_tenant=${GLOBAL_INJECTED_OPENSTACK_TENANT_ID} member_role=admin identity_server_type=KEYSTONE_V3 authentication_type=USERNAME_PASSWORD project_domain_name=${GLOBAL_INJECTED_OPENSTACK_DOMAIN_ID} user_domain_name=${GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN} ${auth}= Create List ${GLOBAL_SO_CATDB_USERNAME} ${GLOBAL_SO_PASSWORD} Run Keyword If '${GLOBAL_INJECTED_OPENSTACK_KEYSTONE_API_VERSION}'=='v3' SO.Upsert Cloud Configuration ${GLOBAL_SO_CATDB_ENDPOINT} ${GLOBAL_SO_CLOUD_CONFIG_PATH} ${GLOBAL_TEMPLATE_FOLDER} ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} ${arguments} auth=${auth} @@ -132,7 +132,7 @@ Distribute Demo vFWDT Model [Documentation] Distribute Demo vFWDT (does not delete model after distribution) [Tags] DistributeDemoVFWDT [Timeout] 600 - Model Distribution For Directory service=vFWDT + Model Distribution For Directory service=vFWDT Download Service CSAR To Robot [Tags] downloadCsar diff --git a/robot/testsuites/portalApp.robot b/robot/testsuites/portalApp.robot index f62719ef..1b1b9b19 100644 --- a/robot/testsuites/portalApp.robot +++ b/robot/testsuites/portalApp.robot @@ -23,7 +23,7 @@ Portal R1 Release for AAF Portal AAF new fields EP Admin widget layout reset - [TAGS] portalSKIP portal-ci + [TAGS] portalSKIP portal-ci Reset widget layout option Validate Functional Top Menu Get Access @@ -49,7 +49,7 @@ Create a Test User for Application Admin Portal admin Add Application admin User New user ${login_id} ${email_address} Add Application Admin for Existing User Test user - [TAGS] portal + [TAGS] portal ${login_id} ${email_address}= Generate Random User demoapp Portal admin Add Application Admin Existing User -APPDEMO ${login_id} diff --git a/robot/testsuites/post-install-tests.robot b/robot/testsuites/post-install-tests.robot index 06636b7e..c0b5bd59 100644 --- a/robot/testsuites/post-install-tests.robot +++ b/robot/testsuites/post-install-tests.robot @@ -1,7 +1,7 @@ *** Settings *** -Documentation Testing Installation +Documentation Testing Installation ... Tests that confirm an installation is valid and not meant as recurring health test -... +... Test Timeout 10 second diff --git a/robot/testsuites/vnf-orchestration-direct-so.robot b/robot/testsuites/vnf-orchestration-direct-so.robot index ee2759cb..1ba62520 100644 --- a/robot/testsuites/vnf-orchestration-direct-so.robot +++ b/robot/testsuites/vnf-orchestration-direct-so.robot @@ -1,11 +1,11 @@ *** Settings *** -Documentation Instantiate VNF via Direct SO Calls +Documentation Instantiate VNF via Direct SO Calls ... Test Timeout 600 second Resource ../resources/so/direct_instantiate.robot *** Variables *** -${CSAR_FILE} +${CSAR_FILE} ${VFW_TEMPLATE} robot/assets/templates/vcpeutils/template.vfw_vfmodule.json diff --git a/robot/testsuites/vnf-orchestration-ovp.robot b/robot/testsuites/vnf-orchestration-ovp.robot index 70d89791..aeabb4d3 100644 --- a/robot/testsuites/vnf-orchestration-ovp.robot +++ b/robot/testsuites/vnf-orchestration-ovp.robot @@ -37,7 +37,7 @@ VNF Instantiation #### Runtime Service Name #### ${new_vnf_service_name}= Set Variable ${new_vnf_name}_${GLOBAL_BUILD_NUMBER} - + #### Getting Manifest Data #### ${subscriber}= Retrieve Manifest Data subscriber ${service_type}= Retrieve Manifest Data service_type @@ -60,7 +60,7 @@ VNF Instantiation #### VID Stuff #### Log Instantiating Service ${new_vnf_service_name} console=yes ${vnf_details}= Instantiate VNF ${subscriber} ${new_vnf_name} ${service_type} ${new_vnf_service_name} ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${service_type} ${tenant_name} ${region_id} ${cloud_owner} ${project_name} ${owning_entity} ${api_type} platform=${platform} line_of_business=${line_of_business} - + # sleeping after instantiation, seems to occasionally have some issues if running validation immediately Sleep 30 @@ -115,7 +115,7 @@ Add Service Mapping set to dictionary ${SERVICE_MAPPING} GLOBAL_SERVICE_FOLDER_MAPPING=${GLOBAL_SERVICE_FOLDER_MAPPING} GLOBAL_SERVICE_VNF_MAPPING=${GLOBAL_SERVICE_VNF_MAPPING} GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING=${GLOBAL_SERVICE_GEN_NEUTRON_NETWORK_MAPPING} GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING=${GLOBAL_SERVICE_DEPLOYMENT_ARTIFACT_MAPPING} GLOBAL_SERVICE_TEMPLATE_MAPPING=${GLOBAL_SERVICE_TEMPLATE_MAPPING} GLOBAL_VALIDATE_NAME_MAPPING= ${json_string}= evaluate json.dumps(${SERVICE_MAPPING}) json - OperatingSystem.Create File ${GLOBAL_SERVICE_MAPPING_DIRECTORY}/${vnf_name}/service_mapping.json ${json_string} + OperatingSystem.Create File ${GLOBAL_SERVICE_MAPPING_DIRECTORY}/${vnf_name}/service_mapping.json ${json_string} [Return] ${vnf_name} Retrieve Manifest Data diff --git a/robot/testsuites/vnf-orchestration.robot b/robot/testsuites/vnf-orchestration.robot index 8706f2e5..a6a57dfb 100644 --- a/robot/testsuites/vnf-orchestration.robot +++ b/robot/testsuites/vnf-orchestration.robot @@ -11,19 +11,14 @@ ${API_TYPE} VNF_API *** Test Cases *** CUSTOMER SERVICE PRODUCT_FAMILY -Instantiate Virtual DNS ETE_Customer vLB vLB +Instantiate Virtual DNS ETE_Customer vLB vLB [Tags] instantiate stability72hr stability72hrvLB -Instantiate Virtual Volume Group ETE_Customer vVG vVG +Instantiate Virtual Volume Group ETE_Customer vVG vVG [Tags] instantiate stability72hr stability72hrvVG -Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL +Instantiate Virtual FirewallCL ETE_Customer vFWCL vFWCL [Tags] instantiate stability72hr stability72hrvFWCL Instantiate Virtual DNS No Delete ETE_Customer vLB vLB KEEP [Tags] instantiateNoDelete Instantiate Virtual FirewallCL No Delete ETE_Customer vFWCL vFWCL KEEP [Tags] instantiateNoDelete Instantiate Virtual Firewall ETE_Customer vFW vFW - - - - - -- cgit 1.2.3-korg