X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fwim%2Fengine.py;h=3fdd03244f125abdde809788deb62cf134d1a4a0;hb=1d55a23c9cd32f17bb7a6f21e5b6c2b476c5804f;hp=a5da1ddc3b4b9a578c56bb3210e152b9392c862b;hpb=fc7cfbf916777271ba2cf1c8edfa5d62ab9c8ce3;p=osm%2FRO.git diff --git a/osm_ro/wim/engine.py b/osm_ro/wim/engine.py index a5da1ddc..3fdd0324 100644 --- a/osm_ro/wim/engine.py +++ b/osm_ro/wim/engine.py @@ -331,7 +331,7 @@ class WimEngine(object): def derive_wan_link(self, wim_usage, instance_scenario_id, sce_net_id, - networks, tenant): + networks, tenant, related=None): """Create a instance_wim_nets record for the given information""" if sce_net_id in wim_usage: account_id = wim_usage[sce_net_id] @@ -347,7 +347,8 @@ class WimEngine(object): 'instance_scenario_id': instance_scenario_id, 'sce_net_id': sce_net_id, 'wim_id': wim_id, - 'wim_account_id': account['uuid'] + 'wim_account_id': account['uuid'], + 'related': related } def derive_wan_links(self, wim_usage, networks, tenant=None): @@ -366,6 +367,9 @@ class WimEngine(object): list: list of WAN links to be written to the database """ # Group networks by key=(instance_scenario_id, sce_net_id) + related = None + if networks: + related = networks[0].get("related") filtered = _filter_multi_vim(networks) grouped_networks = _group_networks(filtered) datacenters_per_group = _count_datacenters(grouped_networks) @@ -377,7 +381,7 @@ class WimEngine(object): # Keys are tuples(instance_scenario_id, sce_net_id) return [ self.derive_wan_link(wim_usage, - key[0], key[1], grouped_networks[key], tenant) + key[0], key[1], grouped_networks[key], tenant, related) for key in wan_groups if wim_usage.get(key[1]) is not False ]