${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
#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}
[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}
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}
+Delete NS Instance Test
+ [Tags] comprehensive hackfest_simplecharm
+
+ :FOR ${ns} IN @{ns_ids}
+ \ Delete NS ${ns}
+
+
Delete NS Descriptor Test
[Tags] hackfest_simplecharm comprehensive
*** Keywords ***
Test Cleanup
- [Documentation] Test Suit Cleanup: Forcefully delete NSD and VNFD
+ [Documentation] Test Suit Cleanup: Deliting Descriptor, instance and vim
- :FOR ${nsd} 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_id}
+ :FOR ${vnfd} IN @{vnfd_ids}
+ \ Delete VNFD ${vnfd}
- :FOR ${vim_id} IN @{vim}
- \ Force Delete Vim Account ${vim_id}
+# :FOR ${vim_id} IN @{vim}
+# \ Delete Vim Account ${vim_id}