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
/
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
7439259
..
2a22478
100644
(file)
--- a/
robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_NS.robot
+++ b/
robot-systest/testsuite/cli/TS04__Hackfest_Simplecharm_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}
${vnfdftpPath} https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/hackfest_simplecharm_vnf.tar.gz
${nsdftpPath} https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/hackfest_simplecharm_ns.tar.gz
${vnfdftpPath} https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/hackfest_simplecharm_vnf.tar.gz
${nsdftpPath} https://osm-download.etsi.org/ftp/osm-6.0-six/7th-hackfest/packages/hackfest_simplecharm_ns.tar.gz
@@
-54,7
+53,7
@@
Create Hackfest Simple Charm VNF Descriptor
#Build VNF Descriptor ${vnfdPckgPath}
#Workarround for charm build issue
#Build VNF Descriptor ${vnfdPckgPath}
#Workarround for charm build issue
- ${rc} ${stdout}= Run and Return RC and Output
wget -P '${CURDIR}${/}../../..${vnfdPckgPath}${/}build/' ${vnfdftpPath}
+ ${rc} ${stdout}= Run and Return RC and Output wget -P '${CURDIR}${/}../../..${vnfdPckgPath}${/}build/' ${vnfdftpPath}
${vnfd_id}= Create VNFD '${CURDIR}${/}../../..${vnfdPckgPath}${vnfdPckg}'
Append To List ${vnfd_ids} ${vnfd_id}
${vnfd_id}= Create VNFD '${CURDIR}${/}../../..${vnfdPckgPath}${vnfdPckg}'
Append To List ${vnfd_ids} ${vnfd_id}
@@
-63,7
+62,7
@@
Create Hackfest Simple Charm NS Descriptor
[Tags] hackfest_simplecharm comprehensive
#Build NS Descriptor ${nsdPckgPath}
[Tags] hackfest_simplecharm comprehensive
#Build NS Descriptor ${nsdPckgPath}
-
${rc} ${stdout}= Run and Return RC and Output
wget -P '${CURDIR}${/}../../..${nsdPckgPath}${/}build/' ${nsdftpPath}
+
${rc} ${stdout}= Run and Return RC and Output
wget -P '${CURDIR}${/}../../..${nsdPckgPath}${/}build/' ${nsdftpPath}
${nsd_id}= Create NSD '${CURDIR}${/}../../..${nsdPckgPath}${nsdPckg}'
Append To List ${nsd_ids} ${nsd_id}
${nsd_id}= Create NSD '${CURDIR}${/}../../..${nsdPckgPath}${nsdPckg}'
Append To List ${nsd_ids} ${nsd_id}
@@
-71,14
+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
- [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_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
@@
-95,20
+98,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}