X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=robot-systest%2Ftestsuite%2Fbasic_23-sol004_sol007_packages.robot;h=cb7ad656a9dafb93bb0d0f3b53427d23a5a18f28;hb=refs%2Fchanges%2F16%2F14116%2F1;hp=a45159a7f387c215d76e681f721fdb2dc74cf22e;hpb=5e001f506b744021d5ef25999c9da28cf56d8fbc;p=osm%2Ftests.git

diff --git a/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
index a45159a..cb7ad65 100644
--- a/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
+++ b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
@@ -1,4 +1,3 @@
-*** Comments ***
 #   Licensed under the Apache License, Version 2.0 (the "License");
 #   you may not use this file except in compliance with the License.
 #   You may obtain a copy of the License at
@@ -11,7 +10,6 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-
 *** Settings ***
 Documentation   [BASIC-23] Creation and deletion of SOL004 and SOL007 packages.
 
@@ -21,48 +19,55 @@ Library   Collections
 Library   Process
 Library   SSHLibrary
 
-Resource   ../lib/vnfd_lib.resource
-Resource   ../lib/nsd_lib.resource
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
 
-Test Tags   basic_23   cluster_main   daily   regression   azure
+Force Tags   basic_23   cluster_main   daily   regression   azure
 
 Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
 # NS and VNF descriptor package folder and ids
-${VNFD_PKG}   sol004_hackfest_basic_vnf
-${VNFD_NAME}   sol004_hackfest_basic-vnf
-${NSD_PKG}   sol007_hackfest_basic_ns
-${NSD_NAME}   sol007_hackfest_basic-ns
+${vnfd_pkg}   sol004_hackfest_basic_vnf
+${vnfd_name}   sol004_hackfest_basic-vnf
+${nsd_pkg}   sol007_hackfest_basic_ns
+${nsd_name}   sol007_hackfest_basic-ns
 
 
 *** Test Cases ***
 Create VNF Package
-    [Documentation]   Upload VNF package for the testsuite.
-    Create VNFD   '%{PACKAGES_FOLDER}/${VNFD_PKG}'
+
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
 
 Create NS Package
-    [Documentation]   Upload NS package for the testsuite.
-    Create NSD   '%{PACKAGES_FOLDER}/${NSD_PKG}'
+
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
+
 
 Cannot Delete VNF Package
-    [Documentation]   Assert that the VNF package cannot be deleted before the NS package is deleted.
-    Assert Failure Delete VNFD   ${VNFD_NAME}
+
+    Assert Failure Delete VNFD   ${vnfd_name}
+
 
 Delete NS Package
-    [Documentation]   Delete NS package.
     [Tags]   cleanup
-    Delete NSD   ${NSD_NAME}
+
+    Delete NSD   ${nsd_name}
+
 
 Delete VNF Package
-    [Documentation]   Delete VNF package.
     [Tags]   cleanup
-    Delete VNFD   ${VNFD_NAME}
+
+    Delete VNFD   ${vnfd_name}
 
 
 *** Keywords ***
 Suite Cleanup
     [Documentation]   Test Suit Cleanup: Deleting NS and VNF packages
-    Run Keyword If Any Tests Failed   Delete NSD   ${NSD_NAME}
-    Run Keyword If Any Tests Failed   Delete VNFD   ${VNFD_NAME}
+
+    Run Keyword If Any Tests Failed   Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed   Delete VNFD   ${vnfd_name}
+
+