projects
/
osm
/
N2VC.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix bug 601
[osm/N2VC.git]
/
tests
/
base.py
diff --git
a/tests/base.py
b/tests/base.py
index
8b61461
..
41fa191
100644
(file)
--- a/
tests/base.py
+++ b/
tests/base.py
@@
-25,8
+25,7
@@
here = os.path.dirname(os.path.realpath(__file__))
def is_bootstrapped():
result = subprocess.run(['juju', 'switch'], stdout=subprocess.PIPE)
return (
def is_bootstrapped():
result = subprocess.run(['juju', 'switch'], stdout=subprocess.PIPE)
return (
- result.returncode == 0 and
- len(result.stdout.decode().strip()) > 0)
+ result.returncode == 0 and len(result.stdout.decode().strip()) > 0)
bootstrapped = pytest.mark.skipif(
bootstrapped = pytest.mark.skipif(
@@
-587,6
+586,9
@@
class TestN2VC(object):
if not self.n2vc:
self.n2vc = get_n2vc(loop=loop)
if not self.n2vc:
self.n2vc = get_n2vc(loop=loop)
+ debug("Creating model for Network Service {}".format(self.ns_name))
+ await self.n2vc.CreateNetworkService(self.ns_name)
+
application = self.n2vc.FormatApplicationName(
self.ns_name,
self.vnf_name,
application = self.n2vc.FormatApplicationName(
self.ns_name,
self.vnf_name,
@@
-890,6
+892,8
@@
class TestN2VC(object):
try:
await self.n2vc.RemoveCharms(self.ns_name, application)
try:
await self.n2vc.RemoveCharms(self.ns_name, application)
+ await self.n2vc.DestroyNetworkService(self.ns_name)
+
while True:
# Wait for the application to be removed
await asyncio.sleep(10)
while True:
# Wait for the application to be removed
await asyncio.sleep(10)