From 2d2ac618f8538fe243c292540fedfbf45e19b118 Mon Sep 17 00:00:00 2001 From: Sastry Isukapalli Date: Sun, 11 Feb 2018 21:09:32 -0500 Subject: Removed unused DB-adapters, test cases, 60+% cover We are not using OracleDB, PostgresDB, and VerticaDB, so there is no need to keep the "dead code" -- we can always add it back as needed. Added test cases so that all the files are at least minimally covered. Overall coverage on my local tox shows 66% coverage (I manually ensured all files are included in the coverage report). Issue-ID: OPTFRA-95 Change-Id: If1cab112236b4f32a96315308ce815088fa092d1 Signed-off-by: Sastry Isukapalli --- osdf/adapters/database/OracleDB.py | 32 ------------- osdf/adapters/database/PostgresDB.py | 31 ------------ osdf/adapters/database/VerticaDB.py | 55 ---------------------- osdf/adapters/database/__init__.py | 0 osdf/adapters/request_parsing/__init__.py | 0 osdf/adapters/request_parsing/placement.py | 33 ------------- osdf/adapters/sdc/asdc.py | 40 ---------------- osdf/adapters/sdc/sdc.py | 40 ++++++++++++++++ osdf/models/api/placementRequest.py | 25 ++++------ .../licenseopt/simple_license_allocation.py | 8 ++-- osdf/utils/local_processing.py | 43 ----------------- 11 files changed, 52 insertions(+), 255 deletions(-) delete mode 100644 osdf/adapters/database/OracleDB.py delete mode 100644 osdf/adapters/database/PostgresDB.py delete mode 100644 osdf/adapters/database/VerticaDB.py delete mode 100644 osdf/adapters/database/__init__.py delete mode 100644 osdf/adapters/request_parsing/__init__.py delete mode 100644 osdf/adapters/request_parsing/placement.py delete mode 100755 osdf/adapters/sdc/asdc.py create mode 100755 osdf/adapters/sdc/sdc.py delete mode 100644 osdf/utils/local_processing.py (limited to 'osdf') diff --git a/osdf/adapters/database/OracleDB.py b/osdf/adapters/database/OracleDB.py deleted file mode 100644 index 655dd27..0000000 --- a/osdf/adapters/database/OracleDB.py +++ /dev/null @@ -1,32 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 cx_Oracle - -from osdf.utils.programming_utils import MetaSingleton - - -class OracleDB(metaclass=MetaSingleton): - conn, cur = None, None - - def connect(self, host=None, sid=None, user=None, passwd=None, port=5432): - if self.conn is None: - tns_info = cx_Oracle.makedsn(host=host, port=port, sid=sid) - self.conn = cx_Oracle.connect(user=user, password=passwd, dsn=tns_info, threaded=True) - self.cur = self.conn.cursor() - return self.conn, self.cur diff --git a/osdf/adapters/database/PostgresDB.py b/osdf/adapters/database/PostgresDB.py deleted file mode 100644 index 6689566..0000000 --- a/osdf/adapters/database/PostgresDB.py +++ /dev/null @@ -1,31 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 psycopg2 - -from osdf.utils.programming_utils import MetaSingleton - - -class PostgresDB(metaclass=MetaSingleton): - conn, cur = None, None - - def connect(self, host=None, db=None, user=None, passwd=None, port=5432): - if self.conn is None: - self.conn = psycopg2.connect(host=host, port=port, user=user, password=passwd, database=db) - self.cur = self.conn.cursor() - return self.conn, self.cur diff --git a/osdf/adapters/database/VerticaDB.py b/osdf/adapters/database/VerticaDB.py deleted file mode 100644 index ad961d7..0000000 --- a/osdf/adapters/database/VerticaDB.py +++ /dev/null @@ -1,55 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 jaydebeapi -import sqlalchemy.pool as pool - -from jaydebeapi import _DEFAULT_CONVERTERS, _java_to_py -from osdf.utils.programming_utils import MetaSingleton -from osdf.config.base import osdf_config - -_DEFAULT_CONVERTERS.update({'BIGINT': _java_to_py('longValue')}) - - -class VerticaDB(metaclass=MetaSingleton): - connection_pool = None - - def get_connection(self): - p = self.get_config_params() - c = jaydebeapi.connect( - 'com.vertica.jdbc.Driver', - 'jdbc:vertica://{}:{}/{}'.format(p['host'], p['port'], p['db']), - {'user': p['user'], 'password': p['passwd'], 'CHARSET': 'UTF8'}, - jars=[p['db_driver']] - ) - return c - - def get_config_params(self): - config = osdf_config["deployment"] - host, port, db = config["verticaHost"], config["verticaPort"], config.get("verticaDB") - user, passwd = config["verticaUsername"], config["verticaPassword"] - jar_path = osdf_config['core']['osdf_system']['vertica_jar'] - params = dict(host=host, db=db, user=user, passwd=passwd, port=port, db_driver=jar_path) - return params - - def connect(self): - if self.connection_pool is None: - self.connection_pool = pool.QueuePool(self.get_connection, max_overflow=10, pool_size=5, recycle=600) - conn = self.connection_pool.connect() - cursor = conn.cursor() - return conn, cursor diff --git a/osdf/adapters/database/__init__.py b/osdf/adapters/database/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/osdf/adapters/request_parsing/__init__.py b/osdf/adapters/request_parsing/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/osdf/adapters/request_parsing/placement.py b/osdf/adapters/request_parsing/placement.py deleted file mode 100644 index d7a6575..0000000 --- a/osdf/adapters/request_parsing/placement.py +++ /dev/null @@ -1,33 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 copy -import json -from osdf.utils.programming_utils import list_flatten, dot_notation - - -def json_path_after_expansion(req_json, reference): - """ - Get the child node(s) from the dot-notation [reference] and parent [req_json]. - For placement and other requests, there are encoded JSONs inside the request or policy, - so we need to expand it and then do a search over the parent plus expanded JSON. - """ - req_json_copy = copy.deepcopy(req_json) # since we expand the JSON in place, we work on a copy - req_json_copy['placementInfo']['orderInfo'] = json.loads(req_json_copy['placementInfo']['orderInfo']) - info = dot_notation(req_json_copy, reference) - return list_flatten(info) if isinstance(info, list) else info diff --git a/osdf/adapters/sdc/asdc.py b/osdf/adapters/sdc/asdc.py deleted file mode 100755 index 43932ba..0000000 --- a/osdf/adapters/sdc/asdc.py +++ /dev/null @@ -1,40 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 osdf.utils.interfaces import RestClient -import xml.etree.ElementTree as ET - -def request(model_version_id, request_id, config): - """Get all of the license artifacts from SDC using service_resource_id and model_version_id - :param model_version_id: model_version_id - :param request_id: request_id - :return: license artifacts from SDC - """ - base_url = config['sdcUrl'] - uid, passwd = config['sdcUsername'], config['sdcPassword'] - headers = {"CSP_UID": config['sdcMechId'], "X-ONAP-InstanceID": "osdf"} - rc = RestClient(userid=uid, passwd=passwd, headers=headers, method="GET", req_id=request_id) - resource_data = rc.request(base_url + '/resources/{}/metadata'.format(model_version_id)) - - artifact_ids = [x['artifactURL'].split("/resources/")[-1] # get the part after /resources/ - for x in resource_data.get('artifacts', []) if x.get('artifactType') == "VF_LICENSE"] - artifact_urls = [base_url + '/resources/' + str(artifact_id) for artifact_id in artifact_ids] - licenses = [] - for x in artifact_urls: - licenses.append(ET.fromstring(rc.request(x, asjson=False))) - return licenses diff --git a/osdf/adapters/sdc/sdc.py b/osdf/adapters/sdc/sdc.py new file mode 100755 index 0000000..43932ba --- /dev/null +++ b/osdf/adapters/sdc/sdc.py @@ -0,0 +1,40 @@ +# ------------------------------------------------------------------------- +# Copyright (c) 2015-2017 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 osdf.utils.interfaces import RestClient +import xml.etree.ElementTree as ET + +def request(model_version_id, request_id, config): + """Get all of the license artifacts from SDC using service_resource_id and model_version_id + :param model_version_id: model_version_id + :param request_id: request_id + :return: license artifacts from SDC + """ + base_url = config['sdcUrl'] + uid, passwd = config['sdcUsername'], config['sdcPassword'] + headers = {"CSP_UID": config['sdcMechId'], "X-ONAP-InstanceID": "osdf"} + rc = RestClient(userid=uid, passwd=passwd, headers=headers, method="GET", req_id=request_id) + resource_data = rc.request(base_url + '/resources/{}/metadata'.format(model_version_id)) + + artifact_ids = [x['artifactURL'].split("/resources/")[-1] # get the part after /resources/ + for x in resource_data.get('artifacts', []) if x.get('artifactType') == "VF_LICENSE"] + artifact_urls = [base_url + '/resources/' + str(artifact_id) for artifact_id in artifact_ids] + licenses = [] + for x in artifact_urls: + licenses.append(ET.fromstring(rc.request(x, asjson=False))) + return licenses diff --git a/osdf/models/api/placementRequest.py b/osdf/models/api/placementRequest.py index 73eac75..df5f931 100644 --- a/osdf/models/api/placementRequest.py +++ b/osdf/models/api/placementRequest.py @@ -17,8 +17,8 @@ # from .common import OSDFModel -from schematics.types import StringType, URLType, IntType, FloatType -from schematics.types.compound import ModelType, ListType +from schematics.types import BaseType, StringType, URLType, IntType +from schematics.types.compound import ModelType, ListType, DictType class RequestInfo(OSDFModel): @@ -27,7 +27,7 @@ class RequestInfo(OSDFModel): requestId = StringType(required=True) callbackUrl = URLType(required=True) sourceId = StringType(required=True) - optimizer = ListType(StringType()) + optimizers = ListType(StringType(required=True)) numSolutions = IntType() timeout = IntType() requestType = StringType() @@ -47,7 +47,6 @@ class ResourceModelInfo(OSDFModel): modelVersion = StringType() modelVersionId = StringType() modelType = StringType() - operationalStatus = StringType() class ExistingLicenseInfo(OSDFModel): @@ -70,10 +69,9 @@ class PlacementDemand(OSDFModel): exclusionCandidateInfo = ListType(ModelType(CandidateInfo)) requiredCandidateInfo = ListType(ModelType(CandidateInfo)) resourceModelInfo = ModelType(ResourceModelInfo) - tenantId = StringType() + tenantId = StringType(required=True) tenantName = StringType() - class ExistingPlacementInfo(OSDFModel): serviceInstanceId = StringType(required=True) @@ -100,22 +98,15 @@ class ServiceModelInfo(OSDFModel): modelVersion = StringType(required=True) -class Location(OSDFModel): - latitude = FloatType(required=True) - longitude = FloatType(required=True) - - class PlacementInfo(OSDFModel): """Information specific to placement optimization""" - serviceModelInfo = ModelType(ServiceModelInfo) - subscriberInfo = ModelType(SubscriberInfo) + serviceModelInfo = ModelType(ServiceModelInfo, required=True) + subscriberInfo = ModelType(SubscriberInfo, required=True) demandInfo = ModelType(DemandInfo, required=True) - orderInfo = StringType() + requestParameters = DictType(BaseType) policyId = ListType(StringType()) - serviceInstanceId = StringType() + serviceInstanceId = StringType(required=True) existingPlacement = ModelType(ExistingPlacementInfo) - location = ModelType(Location) - serviceType = StringType() class PlacementAPI(OSDFModel): diff --git a/osdf/optimizers/licenseopt/simple_license_allocation.py b/osdf/optimizers/licenseopt/simple_license_allocation.py index 1b5b670..beafbe4 100644 --- a/osdf/optimizers/licenseopt/simple_license_allocation.py +++ b/osdf/optimizers/licenseopt/simple_license_allocation.py @@ -19,10 +19,9 @@ import json from requests import RequestException -from osdf.datasources.sdc import sdc, constraint_handler +from osdf.adapters.sdc import sdc, constraint_handler from osdf.logging.osdf_logging import audit_log, metrics_log, MH from osdf.config.base import osdf_config -from osdf.utils import data_mapping def license_optim(request_json): @@ -36,11 +35,12 @@ def license_optim(request_json): config = osdf_config.deployment model_name = request_json['placementInfo']['serviceModelInfo']['modelName'] - service_name = data_mapping.get_service_type(model_name) + # service_name = data_mapping.get_service_type(model_name) + service_name = model_name license_info = [] - order_info = json.loads(request_json["placementInfo"]["orderInfo"]) + order_info = json.loads(request_json["placementInfo"]["requestParameters"]) if service_name == 'VPE': data_mapping.normalize_user_params(order_info) for licenseDemand in request_json['placementInfo']['demandInfo']['licenseDemand']: diff --git a/osdf/utils/local_processing.py b/osdf/utils/local_processing.py deleted file mode 100644 index 6768839..0000000 --- a/osdf/utils/local_processing.py +++ /dev/null @@ -1,43 +0,0 @@ -# ------------------------------------------------------------------------- -# Copyright (c) 2015-2017 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 os - -from osdf.logging.osdf_logging import metrics_log, MH, warn_audit_error - - -def local_create_job_file(req_id, json_req, fname='osdf-req-data.json'): - """Creates a "work" folder for local processing and place relevant - job task file in there""" - - work_dir = 'osdf-optim/work/' + req_id - work_file = '{}/{}'.format(work_dir, fname) - try: - cur_task = "Making a local directory in the OSDF manager for req-id: {}".format(req_id) - metrics_log.info(MH.creating_local_env(cur_task)) - os.makedirs(work_dir, exist_ok=True) - except Exception as err: - warn_audit_error(MH.error_local_env(req_id, "Can't create directory {}".format(work_dir), err)) - return None - try: - with open(work_file, 'w') as fid: - fid.write(json_req['payload']) - return work_dir - except Exception as err: - warn_audit_error(MH.error_local_env(req_id, "can't create file {}".format(work_file), err)) - return None -- cgit 1.2.3-korg