summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChayal, Avteet (ac229e) <ac229e@att.com>2019-02-12 18:37:26 +0000
committerChayal, Avteet (ac229e) <ac229e@att.com>2019-02-12 18:37:53 +0000
commit785714bc52f66efec8044933779bd3b1f41f29c5 (patch)
tree69963df5dfdff2841309acbd8dd60a44e913997e
parent7132d6dc7d09fef84b3454b0ca7a71134d18be5c (diff)
Fix to populate missing fields in request to HASHEADmaster
Populate requiredCandidates and excludedCandidates for HAS Issue-ID: OPTFRA-438 Change-Id: I23702a572ce3645aa52d27e7a8d58f775349cbb8 Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>
-rw-r--r--config/has_config.yaml6
-rw-r--r--osdf/optimizers/placementopt/conductor/translation.py2
2 files changed, 4 insertions, 4 deletions
diff --git a/config/has_config.yaml b/config/has_config.yaml
index 9200daf..cf8a80c 100644
--- a/config/has_config.yaml
+++ b/config/has_config.yaml
@@ -18,9 +18,9 @@ policy_config_mapping:
model-version-id: modelVersionId
candidates:
# for (k1, v1), if k1 is in demand, set prop[k2] = _get_candidates(demand[k1])
- exclusionCandidateInfo: excluded_candidates,
- requiredCandidateInfo: required_candidates
+ excludedCandidates: excluded_candidates,
+ requiredCandidates: required_candidates
extra_fields:
# we have [k1, k2, k3, k4] type items and x is policy-content-properties
# if x[k1] == k2: set prop[k3] = k4
- - [inventoryType, cloud, region, {get_param: CHOSEN_REGION}] \ No newline at end of file
+ - [inventoryType, cloud, region, {get_param: CHOSEN_REGION}]
diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py
index f74f461..93b80bf 100644
--- a/osdf/optimizers/placementopt/conductor/translation.py
+++ b/osdf/optimizers/placementopt/conductor/translation.py
@@ -205,7 +205,7 @@ def get_candidates_demands(demand):
for k, v in policy_config_mapping['candidates'].items():
if k not in demand:
continue
- res[v] = [{'inventory_type': x['candidateType'], 'candidate_id': x['candidates']} for x in demand[k]]
+ res[v] = [{'inventory_type': x['identifierType'], 'candidate_id': x['identifiers']} for x in demand[k]]
return res