diff options
Diffstat (limited to 'osdf/optimizers/pciopt')
| -rw-r--r-- | osdf/optimizers/pciopt/__init__.py | 0 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/configdb.py | 65 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/pci_opt_processor.py | 103 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/__init__.py | 0 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/min_confusion.mzn | 98 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn | 86 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/optimizer.py | 87 | ||||
| -rw-r--r-- | osdf/optimizers/pciopt/solver/pci_utils.py | 40 |
8 files changed, 0 insertions, 479 deletions
diff --git a/osdf/optimizers/pciopt/__init__.py b/osdf/optimizers/pciopt/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/osdf/optimizers/pciopt/__init__.py +++ /dev/null diff --git a/osdf/optimizers/pciopt/configdb.py b/osdf/optimizers/pciopt/configdb.py deleted file mode 100644 index 0e76884..0000000 --- a/osdf/optimizers/pciopt/configdb.py +++ /dev/null @@ -1,65 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -from datetime import datetime as dt - -from osdf.logging.osdf_logging import debug_log -from osdf.utils.interfaces import RestClient - - -def request(req_object, osdf_config, flat_policies): - """ - Process a configdb request from a Client (build Conductor API call, make the call, return result) - :param req_object: Request parameters from the client - :param osdf_config: Configuration specific to OSDF application (core + deployment) - :param flat_policies: policies related to PCI Opt (fetched based on request) - :return: response from ConfigDB (accounting for redirects from Conductor service - """ - cell_list_response = {} - config = osdf_config.deployment - local_config = osdf_config.core - uid, passwd = config['configDbUserName'], config['configDbPassword'] - req_id = req_object['requestInfo']['requestId'] - transaction_id = req_object['requestInfo']['transactionId'] - headers = dict(transaction_id=transaction_id) - - network_id = req_object['cellInfo']['networkId'] - - cell_list_response['network_id'] = network_id - - ts = dt.strftime(dt.now(), '%Y-%m-%d %H:%M:%S%z') - - rc = RestClient(userid=uid, passwd=passwd, method="GET", log_func=debug_log.debug, headers=headers) - - cell_list_url = '{}/{}/{}/{}'.format(config['configDbUrl'], config['configDbGetCellListUrl'], network_id, ts) - - cell_list_resp = rc.request(raw_response=True, url=cell_list_url) - cell_resp = cell_list_resp.json() - - cell_list = [] - count = 0 - for cell_id in cell_resp: - 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_list.append(cell_info) - count += 1 - - cell_list_response['cell_list'] = cell_list - return cell_resp, cell_list_response diff --git a/osdf/optimizers/pciopt/pci_opt_processor.py b/osdf/optimizers/pciopt/pci_opt_processor.py deleted file mode 100644 index da87b83..0000000 --- a/osdf/optimizers/pciopt/pci_opt_processor.py +++ /dev/null @@ -1,103 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -import traceback - -from requests import RequestException - -from osdf.logging.osdf_logging import metrics_log, MH, error_log -from osdf.operation.error_handling import build_json_error_body -from osdf.utils.interfaces import get_rest_client -from .configdb import request as config_request -from .solver.optimizer import pci_optimize as optimize -from .solver.pci_utils import get_cell_id, get_pci_value - -""" -This application generates PCI Optimization API calls using the information received from PCI-Handler-MS, SDN-C -and Policy. -""" - - -def process_pci_optimation(request_json, osdf_config, flat_policies): - """ - Process a PCI request from a Client (build config-db, policy and API call, make the call, return result) - :param req_object: Request parameters from the client - :param osdf_config: Configuration specific to OSDF application (core + deployment) - :param flat_policies: policies related to pci (fetched based on request) - :return: response from PCI Opt - """ - try: - rc = get_rest_client(request_json, service="pcih") - req_id = request_json["requestInfo"]["requestId"] - cell_info_list, network_cell_info = config_request(request_json, osdf_config, flat_policies) - pci_response = get_solutions(cell_info_list, network_cell_info, request_json) - - metrics_log.info(MH.inside_worker_thread(req_id)) - except Exception as err: - error_log.error("Error for {} {}".format(req_id, traceback.format_exc())) - - try: - body = build_json_error_body(err) - metrics_log.info(MH.sending_response(req_id, "ERROR")) - rc.request(json=body, noresponse=True) - except RequestException: - error_log.error("Error sending asynchronous notification for {} {}".format(req_id, traceback.format_exc())) - return - - try: - metrics_log.info(MH.calling_back_with_body(req_id, rc.url, pci_response)) - rc.request(json=pci_response, noresponse=True) - except RequestException: # can't do much here but log it and move on - error_log.error("Error sending asynchronous notification for {} {}".format(req_id, traceback.format_exc())) - - -def get_solutions(cell_info_list, network_cell_info, request_json): - status, solutions = build_solution_list(cell_info_list, network_cell_info, request_json) - return { - "transactionId": request_json['requestInfo']['transactionId'], - "requestId": request_json["requestInfo"]["requestId"], - "requestStatus": "completed", - "statusMessage": status, - "solutions": [ - { - 'networkId': request_json['cellInfo']['networkId'], - 'pciSolutions': solutions - } - ] - } - - -def build_solution_list(cell_info_list, network_cell_info, request_json): - solution_list = [] - status = "success" - req_id = request_json["requestInfo"]["requestId"] - try: - opt_solution = optimize(network_cell_info, cell_info_list) - sol = opt_solution[0]['pci'] - for k, v in sol.items(): - old_pci = get_pci_value(network_cell_info, k) - if old_pci != v: - response = { - 'cellId': get_cell_id(network_cell_info, k), - 'pci': v - } - solution_list.append(response) - except RuntimeError: - error_log.error("Failed finding solution for {} {}".format(req_id, traceback.format_exc())) - status = "failed" - return status, solution_list diff --git a/osdf/optimizers/pciopt/solver/__init__.py b/osdf/optimizers/pciopt/solver/__init__.py deleted file mode 100644 index e69de29..0000000 --- a/osdf/optimizers/pciopt/solver/__init__.py +++ /dev/null diff --git a/osdf/optimizers/pciopt/solver/min_confusion.mzn b/osdf/optimizers/pciopt/solver/min_confusion.mzn deleted file mode 100644 index ff56c18..0000000 --- a/osdf/optimizers/pciopt/solver/min_confusion.mzn +++ /dev/null @@ -1,98 +0,0 @@ -% ------------------------------------------------------------------------- -% Copyright (c) 2018 AT&T Intellectual Property -% -% Licensed under the Apache License, Version 2.0 (the "License"); -% you may not use this file except in compliance with the License. -% You may obtain a copy of the License at -% -% http://www.apache.org/licenses/LICENSE-2.0 -% -% Unless required by applicable law or agreed to in writing, software -% distributed under the License is distributed on an "AS IS" BASIS, -% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -% See the License for the specific language governing permissions and -% limitations under the License. -% -% ------------------------------------------------------------------------- -% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Parameters and its assertions -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Number of cells/radios. -int: NUM_NODES; - -% Maximum number of Physical Cell Identifiers to be assigned to the nodes. -int: NUM_PCIS; - -% Number of edges between neighbor nodes. There is a edge (i,j) if and only -% if nodes i and j are neighbors, i.e., an user equipment (UE) can make -% handoff between i and j. Such edges are used to avoid **COLLISION**, i.e., -% to guarantee that nodes i and j have different PCIs. -int: NUM_NEIGHBORS; - -% Each line represents an edge between direct neighbors as defined before. -array[1..NUM_NEIGHBORS, 1..2] of int: NEIGHBORS; - -% Number of undirect neighbor pairs (j, k) such that both j and k are direct -% neighbors of node i, i.e., (j, k) exits if and only if exists (i, j) and -% (i, k). Nodes (i, k) can generate "confunsions" in the network if they have -% the same PCI. Such edges are used to avoid/minimize **CONFUSIONS**. -int: NUM_SECOND_LEVEL_NEIGHBORS; - -% Each line represents an edge between undirect neighbors as defined before. -array[1..NUM_SECOND_LEVEL_NEIGHBORS, 1..2] of int: SECOND_LEVEL_NEIGHBORS; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Decision variables -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Defines the PCI for each node. -array[0..NUM_NODES-1] of var 0..NUM_PCIS-1: pci; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Constraints -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Direct neighbors must have different PCIs for avoid **COLLISION**. -constraint -forall(i in 1..NUM_NEIGHBORS)( - pci[NEIGHBORS[i, 1]] != pci[NEIGHBORS[i, 2]] -); - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Objective function -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Total number of confusions. -var int: total_confusions = - sum([bool2int(pci[SECOND_LEVEL_NEIGHBORS[i, 1]] == - pci[SECOND_LEVEL_NEIGHBORS[i, 2]]) - | i in 1..NUM_SECOND_LEVEL_NEIGHBORS]); - -% Minimize the total number of confusions. -solve :: int_search(pci, smallest, indomain_min, complete) -minimize total_confusions; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Output -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -output -["PCI assigment"] ++ -["\nnode,pci"] ++ -[ - "\n" ++ show(node) ++ "," ++ show(pci[node]) -| node in 0..NUM_NODES-1 -] ++ - -["\n\nConfusions"] ++ -["\nTotal confusions: " ++ show(total_confusions)] ++ -["\nConfusion pairs"] ++ -[ - "\n" ++ show(SECOND_LEVEL_NEIGHBORS[i, 1]) ++ "," ++ - show(SECOND_LEVEL_NEIGHBORS[i, 2]) -| i in 1..NUM_SECOND_LEVEL_NEIGHBORS where - fix(pci[SECOND_LEVEL_NEIGHBORS[i, 1]] == pci[SECOND_LEVEL_NEIGHBORS[i, 2]]) -] diff --git a/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn b/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn deleted file mode 100644 index 0a9b3e3..0000000 --- a/osdf/optimizers/pciopt/solver/no_conflicts_no_confusion.mzn +++ /dev/null @@ -1,86 +0,0 @@ -% ------------------------------------------------------------------------- -% Copyright (c) 2018 AT&T Intellectual Property -% -% Licensed under the Apache License, Version 2.0 (the "License"); -% you may not use this file except in compliance with the License. -% You may obtain a copy of the License at -% -% http://www.apache.org/licenses/LICENSE-2.0 -% -% Unless required by applicable law or agreed to in writing, software -% distributed under the License is distributed on an "AS IS" BASIS, -% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -% See the License for the specific language governing permissions and -% limitations under the License. -% -% ------------------------------------------------------------------------- -% - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Parameters and its assertions -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Number of cells/radios. -int: NUM_NODES; - -% Maximum number of Physical Cell Identifiers to be assigned to the nodes. -int: NUM_PCIS; - -% Number of edges between neighbor nodes. There is a edge (i,j) if and only -% if nodes i and j are neighbors, i.e., an user equipment (UE) can make -% handoff between i and j. Such edges are used to avoid **COLLISIONS**, i.e., -% to guarantee that nodes i and j have different PCIs. -int: NUM_NEIGHBORS; - -% Each line represents an edge between direct neighbors as defined before. -array[1..NUM_NEIGHBORS, 1..2] of int: NEIGHBORS; - -% Number of undirect neighbor pairs (j, k) such that both j and k are direct -% neighbors of node i, i.e., (j, k) exits if and only if exists (i, j) and -% (i, k). Nodes (i, k) can generate "confunsions" in the network if they have -% the same PCI. Such edges are used to avoid/minimize **CONFUSIONS**. -int: NUM_SECOND_LEVEL_NEIGHBORS; - -% Each line represents an edge between undirect neighbors as defined before. -array[1..NUM_SECOND_LEVEL_NEIGHBORS, 1..2] of int: SECOND_LEVEL_NEIGHBORS; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Decision variables -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Defines the PCI for each node. -array[0..NUM_NODES-1] of var 0..NUM_PCIS-1: pci; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Constraints -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Direct neighbors must have different PCIs for avoid **COLLISION**. -constraint -forall(i in 1..NUM_NEIGHBORS)( - pci[NEIGHBORS[i, 1]] != pci[NEIGHBORS[i, 2]] -); - -% Undirect neighbors must have different PCIs for avoid **CONFUSIONS**. -constraint -forall(i in 1..NUM_SECOND_LEVEL_NEIGHBORS)( - pci[SECOND_LEVEL_NEIGHBORS[i, 1]] != pci[SECOND_LEVEL_NEIGHBORS[i, 2]] -); - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Objective function -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -% Just satisfy the problem. -solve :: int_search(pci, smallest, indomain_min, complete) satisfy; - -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% Output -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% - -output -["node,pci\n"] ++ -[ - show(node) ++ "," ++ show(pci[node]) ++ "\n" -| node in 0..NUM_NODES-1 -] diff --git a/osdf/optimizers/pciopt/solver/optimizer.py b/osdf/optimizers/pciopt/solver/optimizer.py deleted file mode 100644 index 5a1a5c2..0000000 --- a/osdf/optimizers/pciopt/solver/optimizer.py +++ /dev/null @@ -1,87 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - -import itertools -import os - -import pymzn - -from .pci_utils import get_id - -BASE_DIR = os.path.dirname(__file__) -MZN_FILE_NAME = os.path.join(BASE_DIR, 'no_conflicts_no_confusion.mzn') - - -def pci_optimize(network_cell_info, cell_info_list): - neighbor_edges = get_neighbor_list(network_cell_info) - second_level_edges = get_second_level_neighbor(network_cell_info) - dzn_data = { - 'NUM_NODES': len(cell_info_list), - 'NUM_PCIS': len(cell_info_list), - 'NUM_NEIGHBORS': len(neighbor_edges), - 'NEIGHBORS': get_list(neighbor_edges), - 'NUM_SECOND_LEVEL_NEIGHBORS': len(second_level_edges), - 'SECOND_LEVEL_NEIGHBORS': get_list(second_level_edges) - } - - return solve(dzn_data) - - -def get_list(edge_list): - array_list = [] - for s in edge_list: - array_list.append([s[0], s[1]]) - return sorted(array_list) - - -def solve(dzn_data): - return pymzn.minizinc(MZN_FILE_NAME, data=dzn_data) - - -def get_neighbor_list(network_cell_info): - neighbor_list = set() - for cell in network_cell_info['cell_list']: - add_to_neighbor_list(network_cell_info, cell, neighbor_list) - return neighbor_list - - -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 nbr_id and host_id != nbr_id: - entry = sorted([host_id, nbr_id]) - neighbor_list.add((entry[0], entry[1])) - - -def get_second_level_neighbor(network_cell_info): - second_neighbor_list = set() - for cell in network_cell_info['cell_list']: - 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])) - return sorted(second_neighbor_list) - - -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'])) - 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 deleted file mode 100644 index df46d1b..0000000 --- a/osdf/optimizers/pciopt/solver/pci_utils.py +++ /dev/null @@ -1,40 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2018 AT&T Intellectual Property -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -# ------------------------------------------------------------------------- -# - - -def get_id(network_cell_info, cell_id): - for i in network_cell_info['cell_list']: - if i['cell_id'] == cell_id: - return i['id'] - return None - - -def get_cell_id(network_cell_info, id): - for i in network_cell_info['cell_list']: - if i['id'] == id: - return i['cell_id'] - return None - - -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']: - return j['pciValue'] - return None |