diff options
author | mrichomme <morgan.richomme@orange.com> | 2020-03-09 11:23:35 +0100 |
---|---|---|
committer | mrichomme <morgan.richomme@orange.com> | 2020-04-05 11:05:58 +0200 |
commit | 3256fa2ce9d99ae4b94ab202f5c36339e0159cc8 (patch) | |
tree | c1285a287708e03ba3e279b78db88198dea3ab26 /robot/resources/test_templates | |
parent | 021a5ae19631c3e8e641c497ebd2783538d29c3e (diff) |
Remove trailing spaces in robot scripts
warning raised when using robotframework-linter
Issue-ID: INT-1478
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Change-Id: I8eb97ef9e3651c0d8f9de6647ebc917d1addf9d0
Signed-off-by: mrichomme <morgan.richomme@orange.com>
Diffstat (limited to 'robot/resources/test_templates')
4 files changed, 12 insertions, 13 deletions
diff --git a/robot/resources/test_templates/model_test_template.robot b/robot/resources/test_templates/model_test_template.robot index 2ad85d83..40fb38d8 100644 --- a/robot/resources/test_templates/model_test_template.robot +++ b/robot/resources/test_templates/model_test_template.robot @@ -34,7 +34,7 @@ Model Distribution For Directory Run Keyword If '${resourceType}'=='PNF' Create CSARSs in SDC Onboarding Packages Directory ${directory_list} ${ziplist} ... ELSE Create ZIPs in SDC ZIP Directory ${directory_list} ${ziplist} ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute Model From SDC ${ziplist} ${catalog_service_name} ${cds} ${service} instantiationType=${instantiationType} resourceType=${resourceType} - Download CSAR ${catalog_service_id} + Download CSAR ${catalog_service_id} [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} ${catalog_resource_ids} ${catalog_service_id} Create ZIPs in SDC ZIP Directory diff --git a/robot/resources/test_templates/model_test_template_vcperescust.robot b/robot/resources/test_templates/model_test_template_vcperescust.robot index 8baca3f4..06df414d 100644 --- a/robot/resources/test_templates/model_test_template_vcperescust.robot +++ b/robot/resources/test_templates/model_test_template_vcperescust.robot @@ -30,5 +30,5 @@ Model Distribution For vCPEResCust Directory \ Create Zip From Files In Directory ${folder} ${zip} \ Append To List ${ziplist} ${zip} ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resource_ids} ${catalog_service_id} ${catalog_resources} Distribute vCPEResCust Model From SDC ${ziplist} ${catalog_service_name} ${cds} ${service} - Download CSAR ${catalog_service_id} - [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources}
\ No newline at end of file + Download CSAR ${catalog_service_id} + [Return] ${catalog_service_name} ${catalog_resource_name} ${vf_modules} ${catalog_resources} diff --git a/robot/resources/test_templates/vnf_instantiation_ovp.robot b/robot/resources/test_templates/vnf_instantiation_ovp.robot index ea7b0f92..65ff37c3 100644 --- a/robot/resources/test_templates/vnf_instantiation_ovp.robot +++ b/robot/resources/test_templates/vnf_instantiation_ovp.robot @@ -13,7 +13,7 @@ Library ONAPLibrary.ServiceMapping WITH NAME ServiceMapping *** Keywords *** Instantiate VNF - [Documentation] Log into VID, create service instance, vnf instance, and module. This handles an arbitrary, single VNF service w/ volume modules. + [Documentation] Log into VID, create service instance, vnf instance, and module. This handles an arbitrary, single VNF service w/ volume modules. [Arguments] ${customer_name} ${service} ${service_type} ${service_name} ${service_model_type} ${vnf_type} ${vf_modules} ${catalog_resources} ${product_family} ${tenant_name} ${lcp_region} ${cloud_owner} ${project_name} ${owning_entity} ${api_type} ${line_of_business}=LOB-Demonstration ${platform}=Platform-Demonstration ${uuid}= Generate UUID4 ${list}= Create List @@ -22,7 +22,7 @@ Instantiate VNF Login To VID GUI api_type=${api_type} Log Creating ${service_name} in VID console=yes - ${service_instance_id}= Wait Until Keyword Succeeds 900s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service_type} ${service_name} ${project_name} ${owning_entity} + ${service_instance_id}= Wait Until Keyword Succeeds 900s 5s Create VID Service Instance ${customer_name} ${service_model_type} ${service_type} ${service_name} ${project_name} ${owning_entity} Validate Service Instance ${service_instance_id} ${service_type} ${customer_name} ServiceMapping.Set Directory default ${GLOBAL_SERVICE_MAPPING_DIRECTORY} @@ -65,7 +65,7 @@ Loop and Create Modules in VID \ ${preload_file} ${isBase}= Retrieve Module Preload and isBase ${template_name} \ ${temp_dict_for_report} = Run Keyword If "${isBase}"=="false" Create Module in VID ${vnf_name} ${template_name} ${vf_module_type} ${generic_vnf_type} ${preload_file} ${service_instance_id} ${lcp_region} ${tenant_name} ${customer_name} ${cloud_owner} \ Run Keyword If "${isBase}"=="false" Append To List ${temp_list_for_report} ${temp_dict_for_report} - + [Return] ${temp_list_for_report} Create Module in VID @@ -73,7 +73,7 @@ Create Module in VID ${vf_module_name}= Catenate Vfmodule_${vnf_name}_${template_name} ${vf_module_name}= Remove String ${vf_module_name} .yaml .yml - ${Module_name}= Set Variable + ${Module_name}= Set Variable ${api_type}= Retrieve Manifest Data api_type Create Preload From JSON ${BUILD_DIR}/preloads/${preload_file} ${api_type} ${vf_module_name} ${vf_module_type} ${vnf_name} ${generic_vnf_type} @@ -122,7 +122,7 @@ Get Artifact Name From Artifacts \ ${artifactType}= Get From Dictionary ${artifact} artifactType \ ${csar_id}= Set Variable '' \ ${csar_id}= Run Keyword If "${artifactType}"=="HEAT" Get From Dictionary ${artifact} artifactUUID - \ ${artifactName}= Run Keyword If $csar_id in $artifact_ids Get From Dictionary ${artifact} artifactName + \ ${artifactName}= Run Keyword If $csar_id in $artifact_ids Get From Dictionary ${artifact} artifactName \ Return From Keyword If $csar_id in $artifact_ids ${artifactName} [Return] NOTFOUND diff --git a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot index 21a07fc4..63266aa5 100644 --- a/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot +++ b/robot/resources/test_templates/vnf_orchestration_with_cds_test_template.robot @@ -33,7 +33,7 @@ Library ONAPLibrary.SO WITH NAME SO *** Variables *** ${service_template} robot/assets/cds/service-Vfirewall0911-template.yml ${env} robot/assets/cds/env.yml -${so_request_template} so/cds_request.jinja +${so_request_template} so/cds_request.jinja ${vnf_template_name} so/cds_vnf.jinja ${vfmodule_template_name} so/cds_vfmodule.jinja ${so_uri_path} /onap/so/infra/serviceInstantiation/v7/serviceInstances @@ -81,14 +81,14 @@ Orchestrate VNF With CDS \ Set To Dictionary ${dict} vf_modules=${vfmodules} \ ${vnf_payload}= Templating.Apply Template cds ${vnf_template_name} ${dict} \ ${data}= Catenate [${vnf_payload}] - + Set To Dictionary ${dict} vnfs=${data} ${request}= Templating.Apply Template cds ${so_request_template} ${dict} Log --------request-------- Log ${request} Log --------end request-------- ${auth}= Create List ${GLOBAL_SO_USERNAME} ${GLOBAL_SO_PASSWORD} - ${resp}= SO.Run Post Request ${GLOBAL_SO_ENDPOINT} ${so_uri_path} ${data} auth=${auth} + ${resp}= SO.Run Post Request ${GLOBAL_SO_ENDPOINT} ${so_uri_path} ${data} auth=${auth} Log --------response------- ${json_string}= Evaluate json.dumps(${resp.json()}) json Log ${json_string} @@ -108,7 +108,7 @@ Get VNF Info Set To Dictionary ${dict} vnf_model_version_id=${metadata['UUID']} Set To Dictionary ${dict} vnf_model_customization_name=${metadata['name']} Set To Dictionary ${dict} vnf_model_customization_id=${metadata['customizationUUID']} - + Get VFModule Info [Documentation] Dig the vf module names from the VID service model @@ -136,4 +136,3 @@ set vfmodule param Set To Dictionary ${dict} vf_module_model_version_id=${vfmodule['metadata']['vfModuleModelUUID']} Set To Dictionary ${dict} vf_module_model_customization_id=${vfmodule['metadata']['vfModuleModelCustomizationUUID']} Set To Dictionary ${dict} vf_module_name=${vfmodule_name} - |