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
# 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):
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')
+ assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='init', wait_time=10)
# 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)
+ assert utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=30)
if ns_scale:
# for each 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=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)
@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)