Fix bug 2220 to solve sol003_01 test

[osm/tests.git] / robot-systest / lib / vnfd_lib.robot

diff --git a/robot-systest/lib/vnfd_lib.robot b/robot-systest/lib/vnfd_lib.robot
index 1d57598..4433a48 100644 (file)
--- a/robot-systest/lib/vnfd_lib.robot
+++ b/robot-systest/lib/vnfd_lib.robot
@@ -28,7 +28,7 @@ Library   String
 
 *** Variables ***
 ${success_return_code}   0
-${failure_return_code}   0
+${failure_return_code}   1
 ${delete_max_wait_time}   1min
 ${delete_pol_time}   15sec
 
@@ -36,8 +36,8 @@ ${delete_pol_time}   15sec
 *** Keywords ***
 Get VNFDs List
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-list
-    log   ${stdout}
-    log   ${rc}
+    Log   ${stdout}
+    Log   ${rc}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
 
 
@@ -59,16 +59,34 @@ Create VNFD
     [Arguments]   ${vnfd_pkg}   ${overrides}=${EMPTY}
 
     # If env variable "OVERRIDES" exists, it prevails over the value in the argument
-    ${overrides}=   Get Environment Variable    OVERRIDES   default=${overrides}
+    ${overrides}=   Get Environment Variable   OVERRIDES   default=${overrides}
 
     # Proceedes with the onboarding with the appropriate arguments
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-create ${overrides} ${vnfd_pkg}
-    log   ${stdout}
+    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}
+
+
+Update VNFD
+    [Documentation]   Onboards ("Updates") a NF Package into OSM.
+    ...               - Parameters:
+    ...                 - vnfd_pkg: Name (and location) of the NF Package
+    ...                 - vnfd_name: Name of the existing NF Package
+
+    [Arguments]   ${vnfd_pkg}   ${vnfd_name}
+
+    # Proceedes with the onboarding with the appropriate arguments
+    ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-update --content ${vnfd_pkg} ${vnfd_name}
+    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}
 
 
 Create VNFD Overriding Fields
@@ -90,23 +108,23 @@ Create VNFD Overriding Fields
     [Arguments]   ${vnfd_pkg}   ${override_fields}   ${overrides}=${EMPTY}
 
     # If env variable "OVERRIDES" exists, it prevails over the value in the argument
-    ${overrides}=   Get Environment Variable    OVERRIDES   default=${overrides}
+    ${overrides}=   Get Environment Variable   OVERRIDES   default=${overrides}
 
     # Proceedes with the onboarding with the appropriate arguments
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-create ${overrides} ${vnfd_pkg} --override '${override_fields}'
-    log   ${stdout}
+    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 VNFD
     [Arguments]   ${vnfd_id}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-delete ${vnfd_id}
-    log   ${stdout}
+    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}
 
@@ -116,16 +134,16 @@ Assert Failure Delete VNFD
     [Arguments]   ${vnfd_id}
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-delete ${vnfd_id}
-    log   ${stdout}
+    Log   ${stdout}
     Should Be Equal As Integers   ${rc}   ${failure_return_code}
-    Should Contain  ${stdout}  409  msg=Expected Conflict  values=False
+    Should Contain   ${stdout}   409   msg=Expected Conflict   values=False
     WAIT UNTIL KEYWORD SUCCEEDS   ${delete_max_wait_time}   ${delete_pol_time}   Check For VNFD   ${vnfd_id}   True
 
 
 Check For VNFD
-    [Arguments]   ${vnfd_id}  ${exists}=False
+    [Arguments]   ${vnfd_id}   ${exists}=False
 
     ${rc}   ${stdout}=   Run and Return RC and Output   osm vnfpkg-list | awk '{print $2}' | grep ${vnfd_id}
-    Run Keyword If  ${exists}  Should Be Equal As Strings  ${stdout}   ${vnfd_id}
-    ...  ELSE  Should Not Be Equal As Strings  ${stdout}   ${vnfd_id}
+    Run Keyword If   ${exists}   Should Be Equal As Strings   ${stdout}   ${vnfd_id}
+    ...   ELSE   Should Not Be Equal As Strings   ${stdout}   ${vnfd_id}