From: tierno Date: Thu, 14 Nov 2019 14:06:31 +0000 (+0000) Subject: fix in VIM openvim connector X-Git-Tag: v7.0.0rc1~13^2~1^2 X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FRO.git;a=commitdiff_plain;h=refs%2Fchanges%2F75%2F8175%2F1 fix in VIM openvim connector Change-Id: I3f504273444b31e06094feceea9ef413a53c6db9 Signed-off-by: tierno --- diff --git a/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py b/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py index c89a3037..86ee02fa 100644 --- a/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py +++ b/RO-VIM-openvim/osm_rovim_openvim/vimconn_openvim.py @@ -323,6 +323,7 @@ get_processor_rankings_response_schema = { } } + class vimconnector(vimconn.vimconnector): def __init__(self, uuid, name, tenant_id, tenant_name, url, url_admin=None, user=None, passwd=None, log_level="DEBUG", config={}, persistent_info={}): @@ -391,13 +392,16 @@ class vimconnector(vimconn.vimconnector): a= self._remove_extra_items(d, schema['items']) if a is not None: deleted.append(a) elif type(data) is dict: + to_delete = [] for k in data.keys(): if 'properties' not in schema or k not in schema['properties'].keys(): - del data[k] + to_delete.append(k) deleted.append(k) else: a = self._remove_extra_items(data[k], schema['properties'][k]) if a is not None: deleted.append({k:a}) + for k in to_delete: + del data[k] if len(deleted) == 0: return None elif len(deleted) == 1: return deleted[0] else: return deleted