X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2Ftestcases%2Fvnfs%2Ftest_vnfs.py;h=e7e1dce9750fdaf8fc4dfaab87a69552a08c75a3;hb=9de4ec10ffdc139ae00704091978bbb40011dc2d;hp=618f3e304a7079984e18dd71562edc006088e4a1;hpb=9829cae3e6c071bde28a69d5411bb895d967f010;p=osm%2Fdevops.git diff --git a/systest/testcases/vnfs/test_vnfs.py b/systest/testcases/vnfs/test_vnfs.py index 618f3e30..e7e1dce9 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): @@ -33,8 +33,8 @@ class TestClass(object): # first delete all nsd's for file in nsd_file_list: try: - desc = osm.get_api().package.get_descriptor_type_from_pkg(file) - ns_name=osm.ns_name_prefix+nsd_desc['name'] + desc = osm.get_api().package.get_key_val_from_pkg(file) + ns_name=osm.ns_name_prefix+desc['name'] osm.get_api().ns.delete(ns_name) except: pass @@ -42,7 +42,7 @@ class TestClass(object): # delete all nsd packages for file in nsd_file_list: try: - desc = osm.get_api().package.get_descriptor_type_from_pkg(file) + desc = osm.get_api().package.get_key_val_from_pkg(file) osm.get_api().nsd.delete(desc['name']) except: pass @@ -50,19 +50,19 @@ class TestClass(object): # delete all vnfd packages for file in vnfd_file_list: try: - desc = osm.get_api().package.get_descriptor_type_from_pkg(file) + desc = osm.get_api().package.get_key_val_from_pkg(file) osm.get_api().vnfd.delete(desc['name']) except: pass request.addfinalizer(teardown) - def vnf_test(self,osm, openstack, vim, vnfd_file_list, nsd_file_list): + def vnf_upload_packages(self, osm, vnfd_file_list, nsd_file_list ): vnfd_descriptors=[] for file in vnfd_file_list: assert not osm.get_api().package.upload(file) assert not osm.get_api().package.wait_for_upload(file) - desc = osm.get_api().package.get_descriptor_type_from_pkg(file) + desc = osm.get_api().package.get_key_val_from_pkg(file) assert desc vnfd_descriptors.append(desc) @@ -70,37 +70,81 @@ class TestClass(object): for file in nsd_file_list: assert not osm.get_api().package.upload(file) assert not osm.get_api().package.wait_for_upload(file) - desc = osm.get_api().package.get_descriptor_type_from_pkg(file) + desc = osm.get_api().package.get_key_val_from_pkg(file) assert desc nsd_descriptors.append(desc) - # TODO/HACK: need to figure out why this is necessary. # vnfd/nsd is there (seen on ping_pong), but the ns fails that nsd is not there, # another way to check if the nsd is really ready via API? - time.sleep(10) + time.sleep(5) + + 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) - for nsd_desc in nsd_descriptors: 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='init') + 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 True, "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=120) + 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 True, "operational-status != running" + + if ns_scale: + # for each descriptor, scale it + for scale in nsd_desc['scaling-group-descriptor']: + # scale it. + 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=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=300) + + time.sleep(10) assert not osm.get_api().ns.delete(ns_name) - assert not osm.get_api().nsd.delete(nsd_desc['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 - for vnfd_desc in vnfd_descriptors: + assert not osm.get_api().nsd.delete(nsd_desc['name']) + for file in vnfd_file_list: + vnfd_desc = osm.get_api().package.get_key_val_from_pkg(file) assert not osm.get_api().vnfd.delete(vnfd_desc['name']) @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, vmware, vnfd_file_list, nsd_file_list) + + @pytest.mark.openstack + @pytest.mark.ns_scale + @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_test(osm,openstack, vim, vnfd_file_list, nsd_file_list) + self.vnf_upload_packages(osm, vnfd_file_list, nsd_file_list ) + self.vnf_test(osm,openstack, vim, vmware, vnfd_file_list, nsd_file_list, ns_scale=True)