From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue, 29 Sep 2020 15:38:47 +0000 (+0000)
Subject: Updated deprecated command-line osm commands: vnfd-, nsd-
X-Git-Tag: release-v9.0-start~21
X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Ftests.git;a=commitdiff_plain;h=f70f53628d0352f5641c5679aab74d65c42a04c2;hp=36b0312c543c3166e72d46af3879258f4ef71650

Updated deprecated command-line osm commands: vnfd-, nsd-

Change-Id: If87358c9c56d32e5b1de5fb1b4a943129224e974
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/robot-systest/lib/nsd_lib.robot b/robot-systest/lib/nsd_lib.robot
index c7ebbe7..884ba6d 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,7 +42,7 @@ 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}
@@ -54,7 +54,7 @@ Create NSD
 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}
diff --git a/robot-systest/lib/vnfd_lib.robot b/robot-systest/lib/vnfd_lib.robot
index 5785172..8251cb2 100644
--- a/robot-systest/lib/vnfd_lib.robot
+++ b/robot-systest/lib/vnfd_lib.robot
@@ -34,7 +34,7 @@ ${delete_pol_time}   15sec
 
 *** Keywords ***
 Get VNFDs List
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfd-list
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-list
     log   ${stdout}
     log   ${rc}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
@@ -61,7 +61,7 @@ Create VNFD
     ${overrides}=   Get Environment Variable    OVERRIDES   default=${overrides}
 
     # Proceedes with the onboarding with the appropriate arguments
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfd-create ${overrides} ${vnfd_pkg}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-create ${overrides} ${vnfd_pkg}
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     ${lines}=  Get Line Count  ${stdout}
@@ -73,7 +73,7 @@ Create VNFD
 Delete VNFD
     [Arguments]   ${vnfd_id}
 
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfd-delete ${vnfd_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-delete ${vnfd_id}
     log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     WAIT UNTIL KEYWORD SUCCEEDS   ${delete_max_wait_time}   ${delete_pol_time}   Check For VNFD   ${vnfd_id}
@@ -82,5 +82,5 @@ Delete VNFD
 Check For VNFD
     [Arguments]   ${vnfd_id}
 
-    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfd-list | awk '{print $2}' | grep ${vnfd_id}
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-list | awk '{print $2}' | grep ${vnfd_id}
     Should Not Be Equal As Strings   ${stdout}   ${vnfd_id}