Fixed tosca models, updated code and policies

[optf/osdf.git] / osdf / optimizers / placementopt / conductor / api_builder.py

diff --git a/osdf/optimizers/placementopt/conductor/api_builder.py b/osdf/optimizers/placementopt/conductor/api_builder.py
index 209aa3b..187f9f5 100644 (file)
--- a/osdf/optimizers/placementopt/conductor/api_builder.py
+++ b/osdf/optimizers/placementopt/conductor/api_builder.py
@@ -40,8 +40,7 @@ def conductor_api_builder(request_json, flat_policies: list, local_config,
     demand_vnf_name_list = []
 
     for placementDemand in request_json['placementInfo']['placementDemands']:
-        demand_vnf_name_list.append(placementDemand['resourceModuleName'])
-
+        demand_vnf_name_list.append(placementDemand['resourceModuleName'].lower())
     demand_list = tr.gen_demands(request_json, gp['vnfPolicy'])
     attribute_policy_list = tr.gen_attribute_policy(demand_vnf_name_list, gp['attribute'])
     distance_to_location_policy_list = tr.gen_distance_to_location_policy(
@@ -51,11 +50,11 @@ def conductor_api_builder(request_json, flat_policies: list, local_config,
         demand_vnf_name_list, gp['instance_fit'])
     resource_region_policy_list = tr.gen_resource_region_policy(demand_vnf_name_list, gp['region_fit'])
     zone_policy_list = tr.gen_zone_policy(demand_vnf_name_list, gp['zone'])
-    optimization_policy_list = tr.gen_optimization_policy(demand_vnf_name_list, gp['placementOptimization'])
+    optimization_policy_list = tr.gen_optimization_policy(demand_vnf_name_list, gp['placement_optimization'])
     reservation_policy_list = tr.gen_reservation_policy(demand_vnf_name_list, gp['instance_reservation'])
     capacity_policy_list = tr.gen_capacity_policy(demand_vnf_name_list, gp['vim_fit'])
     hpa_policy_list = tr.gen_hpa_policy(demand_vnf_name_list, gp['hpa'])
-    req_params_dict = tr.get_opt_query_data(request_json, gp['optimizationQueryPolicy'])
+    req_params_dict = tr.get_opt_query_data(request_json, gp['request_param_query'])
     conductor_policies = [attribute_policy_list, distance_to_location_policy_list, inventory_policy_list,
                           resource_instance_policy_list, resource_region_policy_list, zone_policy_list,
                           reservation_policy_list, capacity_policy_list, hpa_policy_list]
@@ -75,6 +74,8 @@ def conductor_api_builder(request_json, flat_policies: list, local_config,
         service_id=request_json['serviceInfo']['serviceInstanceId'],
         latitude=req_params_dict.get("customerLatitude", 0.0),
         longitude=req_params_dict.get("customerLongitude", 0.0),
+        required_disk=req_params_dict.get("requiredDisk", ""),
+        required_mem=req_params_dict.get("requiredMemory", ""),
         json=json)
     json_payload = json.dumps(json.loads(rendered_req))  # need this because template's JSON is ugly!
     return json_payload