Removed unused DB-adapters, test cases, 60+% cover

[optf/osdf.git] / osdf / optimizers / licenseopt / simple_license_allocation.py

diff --git a/osdf/optimizers/licenseopt/simple_license_allocation.py b/osdf/optimizers/licenseopt/simple_license_allocation.py
index 1b5b670..beafbe4 100644 (file)
--- 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']: