diff options
author | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-08-18 16:05:05 -0700 |
---|---|---|
committer | Kerim Gokarslan <kgokarsl@cisco.com> | 2017-08-18 16:37:24 -0700 |
commit | 1fe5e7adb3e1d90910c18386ed64d0a787a7bf94 (patch) | |
tree | 1f0de78e8851fdc0c16d7aaadf5e2a32b9df19e5 /nfvbench | |
parent | 5d2becfd9d6398ce9dfd4c83618de42e272ec830 (diff) |
[NFVBENCH-7] Return errors when unknown options are passed
1) Return all errors when unknown options are passed
2) Fixed pep8 warnings
3) Fixed image deletion
Change-Id: If21ca07c797a602b9a60f3ccae665149ed1ac148
Signed-off-by: Kerim Gokarslan <kgokarsl@cisco.com>
Diffstat (limited to 'nfvbench')
-rw-r--r-- | nfvbench/compute.py | 2 | ||||
-rw-r--r-- | nfvbench/config.py | 14 |
2 files changed, 10 insertions, 6 deletions
diff --git a/nfvbench/compute.py b/nfvbench/compute.py index c8ec383..681a852 100644 --- a/nfvbench/compute.py +++ b/nfvbench/compute.py @@ -90,7 +90,7 @@ class Compute(object): def delete_image(self, img_name): try: LOG.log("Deleting image %s...", img_name) - img = self.glance_client.images.find(name=img_name) + img = self.find_image(image_name=img_name) self.glance_client.images.delete(img.id) except Exception: LOG.error("Failed to delete the image %s.", img_name) diff --git a/nfvbench/config.py b/nfvbench/config.py index 2a67b7e..a0587b6 100644 --- a/nfvbench/config.py +++ b/nfvbench/config.py @@ -49,17 +49,21 @@ def config_loads(cfg_text, from_cfg=None): def get_err_config(subset, superset): + result = {} for k, v in subset.items(): if k not in superset: - return {k: v} - if v is not None and superset[k] is not None: + result.update({k: v}) + elif v is not None and superset[k] is not None: if not isinstance(v, type(superset[k])): - return {k: v} + result.update({k: v}) + continue if isinstance(v, dict): res = get_err_config(v, superset[k]) if res: - return {k: res} - return None + result.update({k: res}) + if not result: + return None + return result def test_config(): |