X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2Ftestcases%2Fvnfs%2Ftest_vnfs.py;h=a95f72b07576af01cb5e3454404df6803cf5f7f5;hb=dc782d58f440e71f9ccccb76d11f9e8d554e02cc;hp=d32fc7186e8c922c572f48f512a1c4031f4fc29a;hpb=8d38950dbdd0459d78fef2c594236e03d7945e66;p=osm%2Fdevops.git

diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py
index d32fc718..a95f72b0 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
@@ -78,18 +78,28 @@ class TestClass(object):
         # another way to check if the nsd is really ready via API?
         time.sleep(5)
 
-    def vnf_test(self,osm, openstack, vim, vnfd_file_list, nsd_file_list, ns_scale=False):
+    def vnf_test(self,osm, openstack, vim, vmware, vnfd_file_list, nsd_file_list, ns_scale=False):
+
+        # FIXME: need sleep after vim creation. Need a way to validate vim is ready to handle requests
+        time.sleep(20)
+
         for file in nsd_file_list:
             nsd_desc = osm.get_api().package.get_key_val_from_pkg(file)
 
             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=240)
+            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
@@ -98,10 +108,10 @@ class TestClass(object):
                     assert not osm.get_api().ns.scale(ns_name, scale['name'], 1)
 
                     # ensure ns is scaling-out
-                    assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='scaling-out',wait_time=240)
+                    assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='scaling-out',wait_time=120)
 
                     # wait for ns to be in running-state
-                    assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=240)
+                    assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=300)
 
             time.sleep(10)
 
@@ -115,18 +125,20 @@ class TestClass(object):
 
     @pytest.mark.openstack
     @pytest.mark.vnf
-    def test_vnf(self,osm, vim, openstack, cleanup_test_vnf):
+    @pytest.mark.vmware
+    def test_vnf(self,osm, vim, openstack, vmware, cleanup_test_vnf):
         vnfd_file_list = osm.vnfd_descriptors_list
         nsd_file_list = osm.nsd_descriptors_list
 
         self.vnf_upload_packages(osm, vnfd_file_list, nsd_file_list )
-        self.vnf_test(osm,openstack, vim, vnfd_file_list, nsd_file_list)
+        self.vnf_test(osm,openstack, vim, vmware, vnfd_file_list, nsd_file_list)
 
     @pytest.mark.openstack
     @pytest.mark.ns_scale
-    def test_scale_vnf(self,osm, vim, openstack, cleanup_test_vnf):
+    @pytest.mark.vmware
+    def test_scale_vnf(self,osm, vim, openstack, vmware, cleanup_test_vnf):
         vnfd_file_list = osm.vnfd_descriptors_list
         nsd_file_list = osm.nsd_descriptors_list
 
         self.vnf_upload_packages(osm, vnfd_file_list, nsd_file_list )
-        self.vnf_test(osm,openstack, vim, vnfd_file_list, nsd_file_list, ns_scale=True)
+        self.vnf_test(osm,openstack, vim, vmware, vnfd_file_list, nsd_file_list, ns_scale=True)