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
0959059
..
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(
@@
-65,9
+64,9
@@
def debug(msg):
logging.debug(
"[{}] {}".format(now.strftime('%Y-%m-%dT%H:%M:%S'), msg)
)
logging.debug(
"[{}] {}".format(now.strftime('%Y-%m-%dT%H:%M:%S'), msg)
)
-
#
print(
-
#
"[{}] {}".format(now.strftime('%Y-%m-%dT%H:%M:%S'), msg)
-
#
)
+ print(
+ "[{}] {}".format(now.strftime('%Y-%m-%dT%H:%M:%S'), msg)
+ )
def get_charm_path():
def get_charm_path():
@@
-432,9
+431,6
@@
class TestN2VC(object):
self.ns_name = self.nsd['name']
self.vnf_name = self.vnfd['name']
self.ns_name = self.nsd['name']
self.vnf_name = self.vnfd['name']
- # Hard-coded to default for now, but this may change in the future.
- self.model = "default"
-
self.charms = {}
self.parse_vnf_descriptor()
assert self.charms is not {}
self.charms = {}
self.parse_vnf_descriptor()
assert self.charms is not {}
@@
-553,7
+549,7
@@
class TestN2VC(object):
# Make sure the charm snap is installed
try:
subprocess.check_call(['which', 'charm'])
# Make sure the charm snap is installed
try:
subprocess.check_call(['which', 'charm'])
- except subprocess.CalledProcessError
as e
:
+ except subprocess.CalledProcessError:
raise Exception("charm snap not installed.")
if charm not in self.artifacts:
raise Exception("charm snap not installed.")
if charm not in self.artifacts:
@@
-565,7
+561,7
@@
class TestN2VC(object):
builds = get_charm_path()
if not os.path.exists("{}/builds/{}".format(builds, charm)):
builds = get_charm_path()
if not os.path.exists("{}/builds/{}".format(builds, charm)):
- cmd = "charm build {}/{} -o {}/".format(
+ cmd = "charm build
--no-local-layers
{}/{} -o {}/".format(
get_layer_path(),
charm,
builds,
get_layer_path(),
charm,
builds,
@@
-590,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,
@@
-891,13
+890,15
@@
class TestN2VC(object):
for application in self.charms:
try:
for application in self.charms:
try:
- await self.n2vc.RemoveCharms(self.model, application)
+ 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)
if not await self.n2vc.HasApplication(
while True:
# Wait for the application to be removed
await asyncio.sleep(10)
if not await self.n2vc.HasApplication(
- self.
model
,
+ self.
ns_name
,
application,
):
break
application,
):
break
@@
-962,7
+963,7
@@
class TestN2VC(object):
)
await self.n2vc.ExecutePrimitive(
)
await self.n2vc.ExecutePrimitive(
- self.
model
,
+ self.
ns_name
,
application,
"config",
None,
application,
"config",
None,
@@
-987,7
+988,7
@@
class TestN2VC(object):
Re-run those actions so we can inspect the status.
"""
uuids = await self.n2vc.ExecuteInitialPrimitives(
Re-run those actions so we can inspect the status.
"""
uuids = await self.n2vc.ExecuteInitialPrimitives(
- self.
model
,
+ self.
ns_name
,
application,
init_config,
)
application,
init_config,
)
@@
-1019,7
+1020,7
@@
class TestN2VC(object):
debug("Collecting metrics for {}".format(application))
metrics = await self.n2vc.GetMetrics(
debug("Collecting metrics for {}".format(application))
metrics = await self.n2vc.GetMetrics(
- self.
model
,
+ self.
ns_name
,
application,
)
application,
)
@@
-1069,7
+1070,7
@@
class TestN2VC(object):
debug("Getting status of {} ({})...".format(uid, status))
status = await self.n2vc.GetPrimitiveStatus(
debug("Getting status of {} ({})...".format(uid, status))
status = await self.n2vc.GetPrimitiveStatus(
- self.
model
,
+ self.
ns_name
,
uid,
)
debug("...state of {} is {}".format(uid, status))
uid,
)
debug("...state of {} is {}".format(uid, status))