X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Flib%2Fvnfd_lib.robot;h=fc844365b8a5439cda3fa19575e22f02b0087438;hb=f0e5c0424dedea4bb1b54114da989b8022bfb669;hp=578517250b99e8dd4bca63f19b3650faabf64d7c;hpb=89edc0745c3e458889449945c38f694821ceebdb;p=osm%2Ftests.git

diff --git a/robot-systest/lib/vnfd_lib.robot b/robot-systest/lib/vnfd_lib.robot
index 5785172..fc84436 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,38 @@ 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}
+    ${last}=  Evaluate  ${lines} - 1
+    ${id}=  Get Line  ${stdout}  ${last}
+    [Return]  ${id}
+
+
+Create VNFD Overriding Fields
+    [Documentation]   Onboards ("creates") a NF Package into OSM.
+    ...               - Parameters:
+    ...                 - vnfd_pkg: Name (and location) of the NF Package
+    ...                 - override_fields: String with options to override fields in descriptor, format: "key1.key2...=value[;key3...=value;...]"
+    ...                 - overrides (optional): String with options to override the EPA and/or interface properties of the Package.
+    ...                                        This is very useful to allow to deploy e.g. non-EPA packages in EPA VIMs (or vice-versa).
+    ...                                        Valid strings are the same as in the command. E.g.:
+    ...                                        - `--override-epa`: adds EPA attributes to all VDUs.
+    ...                                        - `--override-nonepa`: removes all EPA attributes from all VDUs.
+    ...                                        - `--override-paravirt`: converts all interfaces to `PARAVIRT`. This one can be combined with
+    ...                                           the others above (e.g. '--override-nonepa --override-paravirt').
+     ...               - Relevant environment variables:
+    ...                  - OVERRIDES: If the environment variable "OVERRIDES" exists, it prevails over the value in the argument.
+    ...                               This is often more convenient to enforce the same behaviour for every test run in a given VIM.
+
+    [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}
+
+    # 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}
     Should Be Equal As Integers   ${rc}   ${success_return_code}
     ${lines}=  Get Line Count  ${stdout}
@@ -73,7 +104,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 +113,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}