X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2Ftestcases%2Fvnfs%2Ftest_vnfs.py;h=3eee94d692edf1271d55fbf1bb63ea0f140eaaf7;hb=7cb84dea04ef7db9174e83bfe3d8dd553e38319b;hp=79d9ae2a95199ee43d60b62e041027750b7b4fd6;hpb=12aa2cf9b6f165943bf1411f4da9c5c69b9ff904;p=osm%2Fdevops.git

diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index 79d9ae2a..3eee94d6 100644
--- a/systest/testcases/vnfs/test_vnfs.py
+++ b/systest/testcases/vnfs/test_vnfs.py
@@ -18,7 +18,7 @@ import pytest
 import pprint
 import time
 from osmclient.common import utils
-
+import pprint
 
 class TestClass(object):
 
@@ -34,7 +34,7 @@ class TestClass(object):
             for file in nsd_file_list:
                 try:
                     desc = osm.get_api().package.get_key_val_from_pkg(file)
-                    ns_name=osm.ns_name_prefix+nsd_desc['name']
+                    ns_name=osm.ns_name_prefix+desc['name']
                     osm.get_api().ns.delete(ns_name)
                 except:
                     pass
@@ -84,12 +84,18 @@ class TestClass(object):
 
             ns_name=osm.ns_name_prefix+nsd_desc['name']
 
-            assert not osm.get_api().ns.create(nsd_desc['name'],ns_name,vim.vim_name)
+            assert osm.get_api().ns.create(nsd_desc['name'],ns_name,vim.vim_name)
 
-            assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='vnf-init-phase')
+            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='init', wait_time=10):
+                nsr=osm.get_api().ns.get(ns_name)
+                pprint.pprint(nsr)
+                assert Fail, "operational-status != init"
 
             # make sure ns is running
-            assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=300)
+            if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=30):
+                nsr=osm.get_api().ns.get(ns_name)
+                pprint.pprint(nsr)
+                assert Fail, "operational-status != running"
 
             if ns_scale:
                 # for each descriptor, scale it