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
/
TS01__Test_VNF.robot
diff --git
a/robot-systest/testsuite/cli/TS01__Test_VNF.robot
b/robot-systest/testsuite/cli/TS01__Test_VNF.robot
index
4059cff
..
84e1f92
100644
(file)
--- a/
robot-systest/testsuite/cli/TS01__Test_VNF.robot
+++ b/
robot-systest/testsuite/cli/TS01__Test_VNF.robot
@@
-64,12
+64,18
@@
Create NS Descriptor Test
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] sanity
Network Service Instance Test
[Documentation] Launch and terminate network services
[Tags] sanity
- [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] sanity
+
+ :FOR ${ns} IN @{ns_ids}
+ \ Delete NS ${ns}
+
+
Delete NS Descriptor Test
[Tags] sanity smoke
Delete NS Descriptor Test
[Tags] sanity smoke
@@
-86,17
+92,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} IN @{ns_ids}
+ \ Delete NS ${ns}
:FOR ${nsd} IN @{nsd_ids}
:FOR ${nsd} IN @{nsd_ids}
- \
Force
Delete NSD ${nsd}
+ \ Delete NSD ${nsd}
:FOR ${vnfd} IN @{vnfd_ids}
:FOR ${vnfd} IN @{vnfd_ids}
- \ Force Delete VNFD ${vnfd}
-
-
-Network Service Instance Cleanup
- [Documentation] Forcefully delete created network service instances and vim account
+ \ Delete VNFD ${vnfd}
-
:FOR ${ns} IN @{ns_ids
}
-
\ Force Delete NS ${ns
}
+
# :FOR ${vim_id} IN @{vim
}
+
# \ Delete Vim Account ${vim_id
}