projects
/
osm
/
devops.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "cirros test code changes for VCD"
[osm/devops.git]
/
systest
/
testcases
/
vnfs
/
test_vnfs.py
diff --git
a/systest/testcases/vnfs/test_vnfs.py
b/systest/testcases/vnfs/test_vnfs.py
index
3eee94d
..
b84da44
100644
(file)
--- a/
systest/testcases/vnfs/test_vnfs.py
+++ b/
systest/testcases/vnfs/test_vnfs.py
@@
-79,6
+79,10
@@
class TestClass(object):
time.sleep(5)
def vnf_test(self,osm, openstack, vim, vmware, vnfd_file_list, nsd_file_list, ns_scale=False):
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 file in nsd_file_list:
nsd_desc = osm.get_api().package.get_key_val_from_pkg(file)
@@
-92,7
+96,7
@@
class TestClass(object):
assert Fail, "operational-status != init"
# make sure ns is running
assert Fail, "operational-status != init"
# make sure ns is running
- if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=
3
0):
+ if not utils.wait_for_value(lambda: osm.get_api().ns.get_field(ns_name,'operational-status'),result='running',wait_time=
24
0):
nsr=osm.get_api().ns.get(ns_name)
pprint.pprint(nsr)
assert Fail, "operational-status != running"
nsr=osm.get_api().ns.get(ns_name)
pprint.pprint(nsr)
assert Fail, "operational-status != running"
@@
-113,6
+117,12
@@
class TestClass(object):
assert not osm.get_api().ns.delete(ns_name)
assert not osm.get_api().ns.delete(ns_name)
+ #wait for the ns to delete
+ try:
+ utils.wait_for_value( lambda: osm.get_api().ns.get(nsd_desc['name']), result=False, wait_time=60)
+ except:
+ pass
+
assert not osm.get_api().nsd.delete(nsd_desc['name'])
for file in vnfd_file_list:
assert not osm.get_api().nsd.delete(nsd_desc['name'])
for file in vnfd_file_list: