aboutsummaryrefslogtreecommitdiffstats
path: root/osdf/optimizers/pciopt/solver/optimizer.py
diff options
context:
space:
mode:
authorvrvarma <vv8305@att.com>2018-11-27 11:18:48 -0500
committervrvarma <vv8305@att.com>2018-11-27 13:46:02 -0500
commita23c6fa0ceb7ff1471b32784063735be62c990aa (patch)
tree1dafcfdd4a369cbfbfca4665852719fc0e8672c7 /osdf/optimizers/pciopt/solver/optimizer.py
parentb05fb22d90def79369e37f4e08ae19595317421a (diff)
osdf pci-opt response will have only the updates
Change the pci-optimization responses to only have the updates Return Error message in case of failures or no solutions Change-Id: Ia2efc7dc1e5cbcdc2c9425a3f58b840130d759ed Signed-off-by: vrvarma <vv8305@att.com> Issue-ID: OPTFRA-404
Diffstat (limited to 'osdf/optimizers/pciopt/solver/optimizer.py')
-rw-r--r--osdf/optimizers/pciopt/solver/optimizer.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/osdf/optimizers/pciopt/solver/optimizer.py b/osdf/optimizers/pciopt/solver/optimizer.py
index 91e693c..5a1a5c2 100644
--- a/osdf/optimizers/pciopt/solver/optimizer.py
+++ b/osdf/optimizers/pciopt/solver/optimizer.py
@@ -64,7 +64,7 @@ def add_to_neighbor_list(network_cell_info, cell, neighbor_list):
for nbr in cell.get('nbr_list', []):
host_id = cell['id']
nbr_id = get_id(network_cell_info, nbr['cellId'])
- if host_id != nbr_id:
+ if nbr_id and host_id != nbr_id:
entry = sorted([host_id, nbr_id])
neighbor_list.add((entry[0], entry[1]))
@@ -74,8 +74,9 @@ def get_second_level_neighbor(network_cell_info):
for cell in network_cell_info['cell_list']:
comb_list = build_second_level_list(network_cell_info, cell)
for comb in comb_list:
- s = sorted(comb)
- second_neighbor_list.add((s[0], s[1]))
+ if comb[0] and comb[1]:
+ s = sorted(comb)
+ second_neighbor_list.add((s[0], s[1]))
return sorted(second_neighbor_list)