diff options
Diffstat (limited to 'osdf')
| -rw-r--r-- | osdf/models/api/pciOptimizationRequest.py | 6 | ||||
| -rw-r--r-- | osdf/models/api/pciOptimizationResponse.py | 6 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/optimizer.py | 6 |
3 files changed, 14 insertions, 4 deletions
diff --git a/osdf/models/api/pciOptimizationRequest.py b/osdf/models/api/pciOptimizationRequest.py index 47b4eba..6cb34c7 100644 --- a/osdf/models/api/pciOptimizationRequest.py +++ b/osdf/models/api/pciOptimizationRequest.py @@ -35,10 +35,16 @@ class RequestInfo(OSDFModel): timeout = IntType() +class ANRInfo(OSDFModel): + cellId = StringType(required=True) + removeableNeighbors = ListType(StringType()) + + class CellInfo(OSDFModel): """Information specific to CellInfo """ networkId = StringType(required=True) cellIdList = ListType(StringType(required=True)) + anrInputList = ListType(ModelType(ANRInfo), min_size=1) trigger = StringType() diff --git a/osdf/models/api/pciOptimizationResponse.py b/osdf/models/api/pciOptimizationResponse.py index 876c380..71d0986 100644 --- a/osdf/models/api/pciOptimizationResponse.py +++ b/osdf/models/api/pciOptimizationResponse.py @@ -27,9 +27,15 @@ class PCISolution(OSDFModel): pci = IntType(required=True) +class ANRSolution(OSDFModel): + cellId = StringType(required=True) + removeableNeighbors = ListType(StringType()) + + class Solution(OSDFModel): networkId = StringType(required=True) pciSolutions = ListType(ListType(ModelType(PCISolution), min_size=1)) + anrSolutions = ListType(ListType(ModelType(ANRSolution), min_size=1)) class PCIOptimizationResponse(OSDFModel): diff --git a/osdf/optimizers/pciopt/solver/optimizer.py b/osdf/optimizers/pciopt/solver/optimizer.py index 5a1a5c2..2825536 100644 --- a/osdf/optimizers/pciopt/solver/optimizer.py +++ b/osdf/optimizers/pciopt/solver/optimizer.py @@ -65,8 +65,7 @@ def add_to_neighbor_list(network_cell_info, cell, neighbor_list): host_id = cell['id'] nbr_id = get_id(network_cell_info, nbr['cellId']) if nbr_id and host_id != nbr_id: - entry = sorted([host_id, nbr_id]) - neighbor_list.add((entry[0], entry[1])) + neighbor_list.add((host_id, nbr_id)) def get_second_level_neighbor(network_cell_info): @@ -75,8 +74,7 @@ def get_second_level_neighbor(network_cell_info): comb_list = build_second_level_list(network_cell_info, cell) for comb in comb_list: if comb[0] and comb[1]: - s = sorted(comb) - second_neighbor_list.add((s[0], s[1])) + second_neighbor_list.add((comb[0], comb[1])) return sorted(second_neighbor_list) |