diff options
author | Ankitkumar Patel <ankit@research.att.com> | 2018-03-27 11:54:53 -0400 |
---|---|---|
committer | Ankitkumar Patel <ankit@research.att.com> | 2018-03-27 11:55:13 -0400 |
commit | f1e95cd95c05be145c3fde9f08404724937edf49 (patch) | |
tree | 9b189af4508a2450dc92132e761beebed18ec168 /osdf/optimizers/placementopt | |
parent | 4de3bb8c9f62f15d6aeb965f9d4c47edb7efd2e9 (diff) |
Updates to address new HPA policies
Issue-ID: OPTFRA-100
Change-Id: Iaff7b50dc5394546cc46591bef9b054cd6cde792
Signed-off-by: Ankitkumar Patel <ankit@research.att.com>
Diffstat (limited to 'osdf/optimizers/placementopt')
-rw-r--r-- | osdf/optimizers/placementopt/conductor/api_builder.py | 43 | ||||
-rw-r--r-- | osdf/optimizers/placementopt/conductor/translation.py | 24 |
2 files changed, 32 insertions, 35 deletions
diff --git a/osdf/optimizers/placementopt/conductor/api_builder.py b/osdf/optimizers/placementopt/conductor/api_builder.py index bfc7f19..55044d0 100644 --- a/osdf/optimizers/placementopt/conductor/api_builder.py +++ b/osdf/optimizers/placementopt/conductor/api_builder.py @@ -21,12 +21,11 @@ import json from jinja2 import Template import osdf.optimizers.placementopt.conductor.translation as tr -from osdf.adapters.policy.utils import group_policies +from osdf.adapters.policy.utils import group_policies_gen from osdf.utils.programming_utils import list_flatten -def conductor_api_builder(request_json, flat_policies: list, local_config, prov_status, - template="templates/conductor_interface.json"): +def conductor_api_builder(request_json, flat_policies: list, local_config, template="templates/conductor_interface.json"): """Build an OSDF southbound API call for HAS-Conductor/Placement optimization :param request_json: parameter data received from a client :param flat_policies: policy data received from the policy platform (flat policies) @@ -36,7 +35,7 @@ def conductor_api_builder(request_json, flat_policies: list, local_config, prov_ :return: json to be sent to Conductor/placement optimization """ templ = Template(open(template).read()) - gp = group_policies(flat_policies) + gp = group_policies_gen(flat_policies, local_config) demand_vnf_name_list = [] for placementDemand in request_json['placementInfo']['placementDemands']: @@ -60,31 +59,29 @@ def conductor_api_builder(request_json, flat_policies: list, local_config, prov_ reservation_policies = [x for x in reservation_policy_list if len(x) > 0] reservation_groups = list_flatten(reservation_policies) req_info = request_json['requestInfo'] - model_name = request_json['serviceInfo']['serviceName'] - service_type = model_name + request_type = req_info.get('requestType', None) + service_type = request_json['serviceInfo']['serviceName'] service_info = local_config.get('service_info', {}).get(service_type, {}) order_info = {} if 'orderInfo' in request_json["placementInfo"]: order_info = json.loads(request_json["placementInfo"]["orderInfo"]) - request_type = req_info.get('requestType', None) + subs_com_site_id = "" if 'subscriberInfo' in request_json['placementInfo']: subs_com_site_id = request_json['placementInfo']['subscriberInfo'].get('subscriberCommonSiteId', "") - rendered_req = None - if service_type == 'vCPE': - rendered_req = templ.render( - requestType=request_type, - chosenComplex=subs_com_site_id, - demand_list=demand_list, - policy_groups=policy_groups, - optimization_policies=optimization_policy_list, - name=req_info['requestId'], - timeout=req_info['timeout'], - limit=req_info['numSolutions'], - serviceType=service_type, - serviceInstance=request_json['serviceInfo']['serviceInstanceId'], - provStatus=prov_status, - chosenRegion=order_info.get('requestParameters', {}).get('lcpCloudRegionId'), - json=json) + rendered_req = templ.render( + requestType=request_type, + chosenComplex=subs_com_site_id, + demand_list=demand_list, + policy_groups=policy_groups, + optimization_policies=optimization_policy_list, + name=req_info['requestId'], + timeout=req_info['timeout'], + limit=req_info['numSolutions'], + service_type=request_json['serviceInfo']['serviceName'], + service_id=request_json['serviceInfo']['serviceInstanceId'], + provStatus="", + chosenRegion=order_info.get('requestParameters', {}).get('lcpCloudRegionId'), + json=json) json_payload = json.dumps(json.loads(rendered_req)) # need this because template's JSON is ugly! return json_payload diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py index 9111c81..91706b7 100644 --- a/osdf/optimizers/placementopt/conductor/translation.py +++ b/osdf/optimizers/placementopt/conductor/translation.py @@ -37,8 +37,8 @@ def gen_optimization_policy(vnf_list, optimization_policy): for attr in content['objectiveParameter']['parameterAttributes']: parameter = attr['parameter'] if attr['parameter'] == "cloud_version" else attr['parameter']+"_between" - for res in attr['resource']: - vnf = get_matching_vnf(res, vnf_list) + vnfs = get_matching_vnfs(attr['resources'], vnf_list) + for vnf in vnfs: value = [vnf] if attr['parameter'] == "cloud_version" else [attr['customerLocationInfo'], vnf] parameter_list.append({ attr['operator']: [attr['weight'], {parameter: value}] @@ -66,7 +66,7 @@ def get_matching_vnfs(resources, vnf_list, match_type="intersection"): :return: List of matching VNFs """ if match_type == "all": # don't bother with any comparisons - return resources + return resources if set(resources) <= set(vnf_list) else None common_vnfs = set(vnf_list) & set(resources) if match_type == "intersection": # specifically requested intersection return list(common_vnfs) @@ -87,8 +87,8 @@ def gen_policy_instance(vnf_list, resource_policy, match_type="intersection", rt related_policies = [] for policy in resource_policy: pc = policy['content'] - demands = get_matching_vnfs(pc['resourceInstanceType'], vnf_list, match_type=match_type) - resource = {pc['identity']: {'type': pc['type'], 'demands': demands}} + demands = get_matching_vnfs(pc['resources'], vnf_list, match_type=match_type) + resource = {pc['identity']: {'type': pc['policyType'], 'demands': demands}} if rtype: resource[pc['identity']]['properties'] = {'controller': pc[rtype]['controller'], @@ -127,10 +127,10 @@ def gen_distance_to_location_policy(vnf_list, distance_to_location_policy): """Get policies governing distance-to-location for VNFs in order to populate the Conductor API call""" cur_policies, related_policies = gen_policy_instance(vnf_list, distance_to_location_policy, rtype=None) for p_new, p_main in zip(cur_policies, related_policies): # add additional fields to each policy - properties = p_main['content']['distanceToLocationProperty'] - pcp_d = properties['distanceCondition'] + properties = p_main['content']['distanceProperties'] + pcp_d = properties['distance'] p_new[p_main['content']['identity']]['properties'] = { - 'distance': text_to_symbol[pcp_d['operator']] + " " + pcp_d['value'].lower(), + 'distance': pcp_d['operator'] + " " + pcp_d['value'].lower() + " " + pcp_d['unit'].lower(), 'location': properties['locationInfo'] } return cur_policies @@ -150,9 +150,9 @@ def gen_attribute_policy(vnf_list, attribute_policy): def gen_zone_policy(vnf_list, zone_policy): """Get zone policies in order to populate the Conductor API call""" - cur_policies, related_policies = gen_policy_instance(vnf_list, zone_policy, rtype=None) + cur_policies, related_policies = gen_policy_instance(vnf_list, zone_policy, match_type="all", rtype=None) for p_new, p_main in zip(cur_policies, related_policies): # add additional fields to each policy - pmz = p_main['content']['zoneProperty'] + pmz = p_main['content']['affinityProperty'] p_new[p_main['content']['identity']]['properties'] = {'category': pmz['category'], 'qualifier': pmz['qualifier']} return cur_policies @@ -179,9 +179,9 @@ def get_candidates_demands(demand): def get_policy_properties(demand, policies): """Get policy_properties for cases where there is a match with the demand""" for policy in policies: - if not set(policy['content'].get('resourceInstanceType', [])) & set(demand['resourceModuleName']): + if demand['resourceModuleName'] not in set(policy['content'].get('resources', [])): continue # no match for this policy - for policy_property in policy['content']['property']: + for policy_property in policy['content']['vnfProperties']: yield policy_property |