X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fproject_lib.robot;h=f44ddac2f873a440648fd52a5e4a22ec8eadeaa9;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=ae4f5cc82404a443285c3e9c83103790c90e62cb;hpb=d90c14aa761a796cf74563812fb5a01f3b145ee9;p=osm%2Ftests.git diff --git a/robot-systest/lib/project_lib.robot b/robot-systest/lib/project_lib.robot index ae4f5cc..f44ddac 100644 --- a/robot-systest/lib/project_lib.robot +++ b/robot-systest/lib/project_lib.robot @@ -22,7 +22,7 @@ Create Project ${rc} ${stdout}= Run and Return RC and Output osm project-create ${project_name} Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Create Project With Quotas @@ -33,7 +33,7 @@ Create Project With Quotas ${rc} ${stdout}= Run and Return RC and Output osm project-create ${project_name} --quotas ${project_quotas} Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Get Project Quotas @@ -44,7 +44,7 @@ Get Project Quotas ${rc} ${stdout}= Run and Return RC and Output osm project-show ${project_name} | grep '${quotas_name}' | awk -F ',|: ' '{print $2}' | awk '{print $1}' Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Update Project Quotas @@ -68,7 +68,7 @@ Update Project Name Check If User Is Assigned To Project - [Arguments] ${user_name} ${project_name} + [Arguments] ${user_name} ${project_name} Should Not Be Empty ${user_name} Should Not Be Empty ${project_name} @@ -78,7 +78,7 @@ Check If User Is Assigned To Project Create VNFD In Project - [Documentation] Onboards a VNFD package into an OSM project. + [Documentation] Onboards a VNFD package into an OSM project. ... Extra parameters (such as 'override') are given to this function in name=value format. These parameters will be appended to the 'osm vnfpkg-create' command with the next syntax: --param_name=param_value [Arguments] ${project_name} ${vnfd_pkg} ${project_user} ${user_password} @{optional_parameters} @@ -88,16 +88,16 @@ Create VNFD In Project Should Not Be Empty ${project_user} Should Not Be Empty ${user_password} - ${osm_pkg_create_command}= Set Variable osm --project ${project_name} --user ${project_user} --password ${user_password} vnfpkg-create ${vnfd_pkg} - FOR ${param} IN @{optional_parameters} - ${match} ${param_name} ${param_value} = Should Match Regexp ${param} (.+)=(.+) msg=Syntax error in optional parameters - ${osm_pkg_create_command}= Catenate ${osm_pkg_create_command} --${param_name}=${param_value} + ${osm_pkg_create_command}= Set Variable osm --project ${project_name} --user ${project_user} --password ${user_password} vnfpkg-create ${vnfd_pkg} + FOR ${param} IN @{optional_parameters} + ${match} ${param_name} ${param_value} = Should Match Regexp ${param} (.+)=(.+) msg=Syntax error in optional parameters + ${osm_pkg_create_command}= Catenate ${osm_pkg_create_command} --${param_name}=${param_value} END ${rc} ${stdout}= Run and Return RC and Output ${osm_pkg_create_command} Log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - [Return] ${stdout} + [Return] ${stdout} Delete VNFD In Project @@ -113,7 +113,7 @@ Delete VNFD In Project Remove User From Project - [Arguments] ${user_name} ${project_name} + [Arguments] ${user_name} ${project_name} Should Not Be Empty ${user_name} Should Not Be Empty ${project_name} @@ -123,7 +123,7 @@ Remove User From Project Delete Project - [Arguments] ${project_name} + [Arguments] ${project_name} ${rc} ${stdout}= Run and Return RC and Output osm project-delete ${project_name} Log ${stdout}