X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FNBI.git;a=blobdiff_plain;f=osm_nbi%2Ftests%2Fclear-all.sh;h=4bcd7f067a6efde1f7497707397e5a19407ded80;hp=dc9dca7335824b9ba1a44162f88d814978e9802c;hb=29933fc257389f16f9c798f52a43e43800475a4a;hpb=d125caf630021538f19aadab045b5d17def67cdd;ds=sidebyside

diff --git a/osm_nbi/tests/clear-all.sh b/osm_nbi/tests/clear-all.sh
index dc9dca7..4bcd7f0 100755
--- a/osm_nbi/tests/clear-all.sh
+++ b/osm_nbi/tests/clear-all.sh
@@ -80,14 +80,14 @@ then
     done
 fi
 
-for item in vim_accounts sdns nsrs vnfrs nslcmops nsds vnfds projects pdus nsts nsis nsilcmops # vims
+for item in vim_accounts wim_accounts sdns nsrs vnfrs nslcmops nsds vnfds projects pdus nsts nsis nsilcmops # vims
 do
     curl --insecure ${OSMNBI_URL}/test/db-clear/${item}
-    echo " ${item}"
 done
+    curl --insecure ${OSMNBI_URL}/test/fs-clear
 if [ -n "$OSMNBI_COMPLETELY" ] ; then
-    curl --insecure ${OSMNBI_URL}/test/db-clear/users && echo " ${item}"
-    curl --insecure ${OSMNBI_URL}/test/db-clear/version && echo " ${item}"
+    curl --insecure ${OSMNBI_URL}/test/db-clear/users
+    curl --insecure ${OSMNBI_URL}/test/db-clear/admin
 else
     # delete all users except admin
     curl --insecure ${OSMNBI_URL}/test/db-clear/users?username.ne=admin
@@ -98,6 +98,8 @@ then
     for dc in `openmano datacenter-list | awk '{print $1}'` ; do openmano datacenter-detach $dc ; done
     for dc in `openmano datacenter-list --all | awk '{print $1}'` ; do openmano datacenter-delete -f  $dc ; done
     for dc in `openmano sdn-controller-list | awk '{print $1}'` ; do openmano sdn-controller-delete -f $dc ; done
+    for dc in `openmano wim-list | awk '{print $1}'` ; do openmano wim-detach $dc ; done
+    for dc in `openmano wim-list --all | awk '{print $1}'` ; do openmano wim-delete -f  $dc ; done
 fi
 
 if [ -n "$OSMNBI_CLEAN_VCA" ]