projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fix: The vim-emu installation requires OVS to be installed on the host machine...
[osm/devops.git]
/
robot-systest
/
testsuite
/
cli
/
TS04__Hackfest_Simplecharm_NS.robot
diff --git
a/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
b/robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
index
6534deb
..
2a22478
100644
(file)
--- a/
robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
+++ b/
robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
@@
-70,12
+70,18
@@
Create Hackfest Simple Charm NS Descriptor
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] hackfest_simplecharm comprehensive
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] hackfest_simplecharm comprehensive
- [Teardown] Run Keyword And Ignore Error Network Service Instance Cleanup
:FOR ${vim_name} IN @{vim}
\ Launch Network Services and Return ${vim_name}
:FOR ${vim_name} IN @{vim}
\ Launch Network Services and Return ${vim_name}
+Delete NS Instance Test
+ [Tags] comprehensive hackfest_simplecharm
+
+ :FOR ${ns} IN @{ns_ids}
+ \ Delete NS ${ns}
+
+
Delete NS Descriptor Test
[Tags] hackfest_simplecharm comprehensive
Delete NS Descriptor Test
[Tags] hackfest_simplecharm comprehensive
@@
-92,17
+98,16
@@
Delete VNF Descriptor Test
*** Keywords ***
Test Cleanup
*** Keywords ***
Test Cleanup
- [Documentation] Test Suit Cleanup: Forcefully delete NSD and VNFD
-
- :FOR ${nsd} IN @{nsd_ids}
- \ Force Delete NSD ${nsd_id}
+ [Documentation] Test Suit Cleanup: Deliting Descriptor, instance and vim
- :FOR ${
vnfd_id} IN @{vnfd
_ids}
- \
Force Delete VNFD ${vnfd_id
}
+ :FOR ${
ns} IN @{ns
_ids}
+ \
Delete NS ${ns
}
+ :FOR ${nsd} IN @{nsd_ids}
+ \ Delete NSD ${nsd}
-Network Service Instance Cleanup
- [Documentation] Forcefully delete created network service instances and vim account
+ :FOR ${vnfd} IN @{vnfd_ids}
+ \ Delete VNFD ${vnfd}
-
:FOR ${ns_id} IN @{ns_ids
}
-
\ Force Delete NS ${ns
_id}
+
# :FOR ${vim_id} IN @{vim
}
+
# \ Delete Vim Account ${vim
_id}