X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fnsd_lib.robot;h=cb84d7208a56fcd4f5b47a7ae8560f5232df60b2;hb=f4ebaa88025189ede4f073ab8a1f27c95efff867;hp=c7ebbe756468cb0240a00f6ea185844357e76d5c;hpb=f96bb45c0a03f2188688d90d67ea718851cec2de;p=osm%2Ftests.git diff --git a/robot-systest/lib/nsd_lib.robot b/robot-systest/lib/nsd_lib.robot index c7ebbe7..cb84d72 100644 --- a/robot-systest/lib/nsd_lib.robot +++ b/robot-systest/lib/nsd_lib.robot @@ -34,7 +34,7 @@ ${delete_pol_time} 15sec *** Keywords *** Get NSDs List - ${rc} ${stdout}= Run and Return RC and Output osm nsd-list + ${rc} ${stdout}= Run and Return RC and Output osm nspkg-list log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} @@ -42,19 +42,19 @@ Get NSDs List Create NSD [Arguments] ${nsd_pkg} - ${rc} ${stdout}= Run and Return RC and Output osm nsd-create ${nsd_pkg} + ${rc} ${stdout}= Run and Return RC and Output osm nspkg-create ${nsd_pkg} log ${stdout} Should Be Equal As Integers ${rc} ${success_return_code} - ${lines}= Get Line Count ${stdout} - ${last}= Evaluate ${lines} - 1 - ${id}= Get Line ${stdout} ${last} - [Return] ${id} + ${lines}= Get Line Count ${stdout} + ${last}= Evaluate ${lines} - 1 + ${id}= Get Line ${stdout} ${last} + [Return] ${id} Delete NSD [Arguments] ${nsd_id} - ${rc} ${stdout}= Run Keyword And Continue On Failure Run and Return RC and Output osm nsd-delete ${nsd_id} + ${rc} ${stdout}= Run Keyword And Continue On Failure Run and Return RC and Output osm nspkg-delete ${nsd_id} Should Be Equal As Integers ${rc} ${success_return_code} log ${stdout} WAIT UNTIL KEYWORD SUCCEEDS ${delete_max_wait_time} ${delete_pol_time} Check For NSD ${nsd_id} @@ -63,5 +63,5 @@ Delete NSD Check For NSD [Arguments] ${nsd_id} - ${rc} ${stdout}= Run and Return RC and Output osm nsd-list | awk '{print $2}' | grep ${nsd_id} + ${rc} ${stdout}= Run and Return RC and Output osm nspkg-list | awk '{print $2}' | grep ${nsd_id} Should Not Be Equal As Strings ${stdout} ${nsd_id}