bug 650 adding WIM account instantiation parameter.
Allow manual selection of wim or deployment without Wim
Change-Id: If4928ff33ebc671b6870faf20f3b4253c9f59372
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
diff --git a/osm_ro/wim/engine.py b/osm_ro/wim/engine.py
index 39defb1..a5da1dd 100644
--- a/osm_ro/wim/engine.py
+++ b/osm_ro/wim/engine.py
@@ -356,7 +356,7 @@
(NSR).
Arguments:
- wim_usage(dict): Mapping between sce_net_id and wim_id
+ wim_usage(dict): Mapping between sce_net_id and wim_id. If wim_id is False, means not create wam_links
networks(list): Dicts containing the information about the networks
that will be instantiated to materialize a Network Service
(scenario) instance.
@@ -374,11 +374,11 @@
wan_groups = [key
for key, counter in datacenters_per_group
if counter > 1]
-
+ # Keys are tuples(instance_scenario_id, sce_net_id)
return [
self.derive_wan_link(wim_usage,
key[0], key[1], grouped_networks[key], tenant)
- for key in wan_groups
+ for key in wan_groups if wim_usage.get(key[1]) is not False
]
def create_action(self, wan_link):
@@ -511,7 +511,7 @@
(scenario) instance.
Returns:
dict: Keys are tuples (instance_scenario_id, sce_net_id) and values
- are lits of networks.
+ are list of networks.
"""
criteria = itemgetter('instance_scenario_id', 'sce_net_id')