From a3439d6e4ae7b518484a589abebc761122a336bf Mon Sep 17 00:00:00 2001 From: vrvarma Date: Fri, 24 May 2019 16:36:10 -0400 Subject: Fix the oof-osdf to configdb interface bugs Change-Id: I41ce7210f108195a83a35db46094e27a88f239fb Signed-off-by: vrvarma Issue-ID: OPTFRA-508 --- osdf/optimizers/pciopt/configdb.py | 6 +++++- osdf/optimizers/pciopt/solver/optimizer.py | 4 ++-- osdf/optimizers/pciopt/solver/pci_utils.py | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) (limited to 'osdf') diff --git a/osdf/optimizers/pciopt/configdb.py b/osdf/optimizers/pciopt/configdb.py index 0e76884..8f003c2 100644 --- a/osdf/optimizers/pciopt/configdb.py +++ b/osdf/optimizers/pciopt/configdb.py @@ -57,9 +57,13 @@ def request(req_object, osdf_config, flat_policies): cell_info = {'cell_id': cell_id, 'id': count} nbr_list_url = '{}/{}/{}/{}'.format(config['configDbUrl'], config['configDbGetNbrListUrl'], cell_id, ts) nbr_list_raw = rc.request(url=nbr_list_url, raw_response=True) - cell_info['nbr_list'] = nbr_list_raw.json() + cell_info['nbr_list'] = get_neighbor_list(nbr_list_raw.json()) cell_list.append(cell_info) count += 1 cell_list_response['cell_list'] = cell_list return cell_resp, cell_list_response + + +def get_neighbor_list(nbr_list_response): + return nbr_list_response.get('nbrList', []) diff --git a/osdf/optimizers/pciopt/solver/optimizer.py b/osdf/optimizers/pciopt/solver/optimizer.py index 9b2e9d9..0a6d5a4 100644 --- a/osdf/optimizers/pciopt/solver/optimizer.py +++ b/osdf/optimizers/pciopt/solver/optimizer.py @@ -103,7 +103,7 @@ def get_neighbor_list(network_cell_info): 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']) + nbr_id = get_id(network_cell_info, nbr['targetCellId']) if nbr_id and host_id != nbr_id: neighbor_list.add((host_id, nbr_id)) @@ -121,7 +121,7 @@ def get_second_level_neighbor(network_cell_info): def build_second_level_list(network_cell_info, cell): second_nbr_list = [] for nbr in cell.get('nbr_list', []): - second_nbr_list.append(get_id(network_cell_info, nbr['cellId'])) + second_nbr_list.append(get_id(network_cell_info, nbr['targetCellId'])) return [list(elem) for elem in list(itertools.combinations(second_nbr_list, 2))] diff --git a/osdf/optimizers/pciopt/solver/pci_utils.py b/osdf/optimizers/pciopt/solver/pci_utils.py index df46d1b..04829cf 100644 --- a/osdf/optimizers/pciopt/solver/pci_utils.py +++ b/osdf/optimizers/pciopt/solver/pci_utils.py @@ -35,6 +35,6 @@ def get_pci_value(network_cell_info, id): cell_id = get_cell_id(network_cell_info, id) for i in network_cell_info['cell_list']: for j in i['nbr_list']: - if cell_id == j['cellId']: + if cell_id == j['targetCellId']: return j['pciValue'] return None -- cgit 1.2.3-korg