Merge branch 'master' into v7.0

Change-Id: Iec1f1db2b2d4953e560c8e8b7be2f6ddca86edd1
Signed-off-by: beierlm <mark.beierl@canonical.com>
diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index ab3a162..58fc240 100644
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -116,13 +116,13 @@
 
             time.sleep(10)
 
-            assert not osm.get_api().ns.delete(ns_name)
+            assert not osm.get_api().ns.delete(ns_name, wait=True)
 
             #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:
-                print("Exception: Failed to get NAME after NS DELETE ... ")
+            #try:
+            #    utils.wait_for_value( lambda: osm.get_api().ns.get(ns_name), result=False, wait_time=180)
+            #except:
+            #    print("Exception: Failed to get NAME after NS DELETE ... ")
             
             #TODO find the reason for 502 exception from osmclient/nbi            
             try: