X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2Ftestcases%2Fvnfs%2Ftest_vnfs.py;h=e7e1dce9750fdaf8fc4dfaab87a69552a08c75a3;hb=9de4ec10ffdc139ae00704091978bbb40011dc2d;hp=53f39acd25974fafeb6acf8d16280ab7bdfc1848;hpb=5d0de92d12be3a2522fe36bdb8fdbae3d939d156;p=osm%2Fdevops.git

diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index 53f39acd..e7e1dce9 100644
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -90,16 +90,16 @@ class TestClass(object):
 
             assert osm.get_api().ns.create(nsd_desc['name'],ns_name,vim.vim_name)
 
-            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='init', wait_time=10):
+            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='init', wait_time=30):
                 nsr=osm.get_api().ns.get(ns_name)
                 pprint.pprint(nsr)
-                assert Fail, "operational-status != init"
+                assert True, "operational-status != init"
 
             # make sure ns is running
             if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=240):
                 nsr=osm.get_api().ns.get(ns_name)
                 pprint.pprint(nsr)
-                assert Fail, "operational-status != running"
+                assert True, "operational-status != running"
 
             if ns_scale:
                 # for each descriptor, scale it
@@ -117,6 +117,12 @@ class TestClass(object):
 
             assert not osm.get_api().ns.delete(ns_name)
 
+            #wait for the ns to delete
+            try:
+                utils.wait_for_value( lambda: osm.get_api().ns.get(ns_name), result=False, wait_time=180)
+            except:
+                pass
+
             assert not osm.get_api().nsd.delete(nsd_desc['name'])
 
         for file in vnfd_file_list: