projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add OSM_SERVER and OSMUI_SQL_DATABASE_URI to Dockerfile
[osm/devops.git]
/
robot-systest
/
testsuite
/
cli
/
TS03__Hackfest_Basic_NS.robot
diff --git
a/robot-systest/testsuite/cli/TS03__Hackfest_Basic_NS.robot
b/robot-systest/testsuite/cli/TS03__Hackfest_Basic_NS.robot
index
d55540a
..
40492f7
100644
(file)
--- a/
robot-systest/testsuite/cli/TS03__Hackfest_Basic_NS.robot
+++ b/
robot-systest/testsuite/cli/TS03__Hackfest_Basic_NS.robot
@@
-43,7
+43,6
@@
Suite Teardown Run Keyword And Ignore Error Test Cleanup
${nsd_id}
@{nsd_ids}
@{ns_ids}
${nsd_id}
@{nsd_ids}
@{ns_ids}
-@{vim}
*** Test Cases ***
*** Test Cases ***
@@
-66,14
+65,18
@@
Create Hackfest Basic NS Descriptor
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] comprehensive hackfest_basic_ns
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] comprehensive hackfest_basic_ns
- [Setup] VIM Setup To Launch Network Services
- [Teardown] Run Keyword And Ignore Error Network Service Instance Cleanup
- Should Not Be Empty ${vim} VIM details not provided
: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_basic_ns
+
+ :FOR ${ns} IN @{ns_ids}
+ \ Delete NS ${ns}
+
+
Delete NS Descriptor Test
[Tags] comprehensive hackfest_basic_ns
Delete NS Descriptor Test
[Tags] comprehensive hackfest_basic_ns
@@
-90,20
+93,16
@@
Delete VNF Descriptor Test
*** Keywords ***
Test Cleanup
*** Keywords ***
Test Cleanup
- [Documentation] Test Suit Cleanup:
Forcefully delete NSD and VNFD
+ [Documentation] Test Suit Cleanup:
Deliting Descriptor, instance and vim
- :FOR ${ns
d} IN @{nsd
_ids}
- \
Force Delete NSD ${nsd_id
}
+ :FOR ${ns
} IN @{ns
_ids}
+ \
Delete NS ${ns
}
- :FOR ${vnfd_id} IN @{vnfd_ids}
- \ Force Delete VNFD ${vnfd_id}
-
-
-Network Service Instance Cleanup
- [Documentation] Forcefully delete created network service instances and vim account
+ :FOR ${nsd} IN @{nsd_ids}
+ \ Delete NSD ${nsd}
- :FOR ${
ns_id} IN @{ns
_ids}
- \
Force Delete NS ${ns_i
d}
+ :FOR ${
vnfd} IN @{vnfd
_ids}
+ \
Delete VNFD ${vnf
d}
- :FOR ${vim_id} IN @{vim}
-
\ Force
Delete Vim Account ${vim_id}
+
#
:FOR ${vim_id} IN @{vim}
+
# \
Delete Vim Account ${vim_id}