projects
/
osm
/
tests.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update heal tests to use new NF and NS packages without charms
[osm/tests.git]
/
robot-systest
/
testsuite
/
basic_17-delete_vnf_package.robot
diff --git
a/robot-systest/testsuite/basic_17-delete_vnf_package.robot
b/robot-systest/testsuite/basic_17-delete_vnf_package.robot
index
d61e682
..
253665c
100644
(file)
--- a/
robot-systest/testsuite/basic_17-delete_vnf_package.robot
+++ b/
robot-systest/testsuite/basic_17-delete_vnf_package.robot
@@
-1,3
+1,4
@@
+*** 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
# 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
@@
-10,8
+11,9
@@
# See the License for the specific language governing permissions and
# limitations under the License.
# See the License for the specific language governing permissions and
# limitations under the License.
+
*** Settings ***
*** Settings ***
-Documentation
[BASIC-17] Delete VNF Package Before NS Package.
+Documentation [BASIC-17] Delete VNF Package Before NS Package.
Library OperatingSystem
Library String
Library OperatingSystem
Library String
@@
-19,49
+21,48
@@
Library Collections
Library Process
Library SSHLibrary
Library Process
Library SSHLibrary
-Resource %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
-Resource %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
-
-Variables %{ROBOT_DEVOPS_FOLDER}/resources/basic_17-delete_vnf_package_data.py
+Resource ../lib/vnfd_lib.resource
+Resource ../lib/nsd_lib.resource
-Force Tags basic_17 cluster_main daily regression
+Test Tags basic_17 cluster_main daily regression azure
Suite Teardown Run Keyword And Ignore Error Suite Cleanup
Suite Teardown Run Keyword And Ignore Error Suite Cleanup
-*** Test Cases ***
-Create VNF Package
+*** Variables ***
+# NS and VNF descriptor package folder and ids
+${VNFD_PKG} hackfest_basic_vnf
+${VNFD_NAME} hackfest_basic-vnf
+${NSD_PKG} hackfest_basic_ns
+${NSD_NAME} hackfest_basic-ns
- Create VNFD '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+*** Test Cases ***
+Create VNF Package
+ [Documentation] Upload VNF package for the testsuite.
+ Create VNFD '%{PACKAGES_FOLDER}/${VNFD_PKG}'
Create NS Package
Create NS Package
-
- Create NSD '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
+ [Documentation] Upload NS package for the testsuite.
+ Create NSD '%{PACKAGES_FOLDER}/${NSD_PKG}'
Cannot Delete VNF Package
Cannot Delete VNF Package
-
- Assert Failure Delete VNFD ${vnfd_name}
-
+ [Documentation] Assert that the VNF package cannot be deleted without deleting the corresponding NS package using it.
+ Assert Failure Delete VNFD ${VNFD_NAME}
Delete NS Package
Delete NS Package
+ [Documentation] Delete NS package from OSM.
[Tags] cleanup
[Tags] cleanup
-
- Delete NSD ${nsd_name}
-
+ Delete NSD ${NSD_NAME}
Delete VNF Package
Delete VNF Package
+ [Documentation] Delete VNF package from OSM.
[Tags] cleanup
[Tags] cleanup
-
- Delete VNFD ${vnfd_name}
+ Delete VNFD ${VNFD_NAME}
*** Keywords ***
Suite Cleanup
*** 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}
-
-
+ [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}