From 49570621115a7f5c89e607e52decb7aa583af4f6 Mon Sep 17 00:00:00 2001 From: "Chayal, Avteet (ac229e)" Date: Thu, 1 Nov 2018 03:47:26 +0000 Subject: Fixed tosca models, updated code and policies Fixed tosca models, updated policies and code for conductor payload changes for vFW and vCPE Change-Id: Ia98c632fc2fd564efa3b96e8a7888bc97d1c5448 Issue-ID: OPTFRA-384 Signed-off-by: Chayal, Avteet (ac229e) --- osdf/optimizers/placementopt/conductor/api_builder.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '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 e841f48..187f9f5 100644 --- a/osdf/optimizers/placementopt/conductor/api_builder.py +++ b/osdf/optimizers/placementopt/conductor/api_builder.py @@ -50,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] @@ -74,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 -- cgit 1.2.3-korg