Updated the conductor adaptor

Updated the conductor adaptor code.

Issue-ID: OPTFRA-207
Change-Id: I41bd6f2e39bc5ca6d2d27539772175363590416f
Signed-off-by: Ankitkumar Patel <ankit@research.att.com>

1 files changed, 18 insertions, 8 deletions

diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py
index 91706b7..e02ab19 100644
--- a/osdf/optimizers/placementopt/conductor/translation.py
+++ b/osdf/optimizers/placementopt/conductor/translation.py
@@ -50,14 +50,6 @@ def gen_optimization_policy(vnf_list, optimization_policy):
     return optimization_policy_list
 
 
-def get_matching_vnf(resource, vnf_list):
-
-    for vnf in vnf_list:
-        if resource in vnf:
-            return vnf
-    return resource
-
-
 def get_matching_vnfs(resources, vnf_list, match_type="intersection"):
     """Get a list of matching VNFs from the list of resources
     :param resources:
@@ -157,6 +149,24 @@ def gen_zone_policy(vnf_list, zone_policy):
     return cur_policies
 
 
+def gen_capacity_policy(vnf_list, capacity_policy):
+    """Get zone policies in order to populate the Conductor API call"""
+    cur_policies, related_policies = gen_policy_instance(vnf_list, capacity_policy, rtype=None)
+    for p_new, p_main in zip(cur_policies, related_policies):  # add additional fields to each policy
+        pmz = p_main['content']['capacityProperty']
+        p_new[p_main['content']['identity']]['properties'] = \
+            {"controller": pmz['controller'], 'request': json.loads(pmz['request'])}
+    return cur_policies
+
+
+def gen_hpa_policy(vnf_list, hpa_policy):
+    """Get zone policies in order to populate the Conductor API call"""
+    cur_policies, related_policies = gen_policy_instance(vnf_list, hpa_policy, rtype=None)
+    for p_new, p_main in zip(cur_policies, related_policies):  # add additional fields to each policy
+        p_new[p_main['content']['identity']]['properties'] = {'evaluate': p_main['content']['flavorFeatures']}
+    return cur_policies
+
+
 def get_augmented_policy_attributes(policy_property, demand):
     """Get policy attributes and augment them using policy_config_mapping and demand information"""
     attributes = copy.copy(policy_property['attributes'])