summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--osdf/optimizers/placementopt/conductor/translation.py5
-rw-r--r--test/placement-tests/request_placement_vfmod.json2
2 files changed, 2 insertions, 5 deletions
diff --git a/osdf/optimizers/placementopt/conductor/translation.py b/osdf/optimizers/placementopt/conductor/translation.py
index e09ecd3..d14f3e1 100644
--- a/osdf/optimizers/placementopt/conductor/translation.py
+++ b/osdf/optimizers/placementopt/conductor/translation.py
@@ -206,10 +206,7 @@ def get_candidates_demands(demand):
for k, v in policy_config_mapping['candidates'].items():
if k not in demand:
continue
- res[v] = list()
- for x in demand[k]:
- for candidate_id in x['identifiers']:
- res[v].append({'inventory_type': x['identifierType'], 'candidate_id': candidate_id})
+ res[v] = [{'inventory_type': x['identifierType'], 'candidate_id': x['identifiers']} for x in demand[k]]
return res
diff --git a/test/placement-tests/request_placement_vfmod.json b/test/placement-tests/request_placement_vfmod.json
index e4186d6..7c3a2e1 100644
--- a/test/placement-tests/request_placement_vfmod.json
+++ b/test/placement-tests/request_placement_vfmod.json
@@ -53,7 +53,7 @@
"service_type": "vFW-SINK-XX",
"excluded_candidates": [{
"inventory_type": "vfmodule",
- "candidate_id": "e765d576-8755-4145-8536-0bb6d9b1dc9a"
+ "candidate_id": ["e765d576-8755-4145-8536-0bb6d9b1dc9a"]
}]
}],
"vPGN": [{