diff options
| author |   Sastry Isukapalli <sastry@research.att.com> | 2018-03-17 02:40:15 -0400 |
|---|---|---|
| committer | Sastry Isukapalli <sastry@research.att.com> | 2018-03-17 07:07:32 +0000 |
| commit | 1a9638f5d5fc78f7e8be700e71b506fed3cc9d2d (patch) | |
| tree | a5c38fbddd08beeead83c943ab2c744d448944f8 /osdf/adapters/policy/utils.py | |
| parent | 7c70d5ba1469b9ea3220bc61be1d1973e5e3e98a (diff) | |
New policies and required code changes
Issue-ID: OPTFRA-146
Change-Id: I2261ae69f52b184cd7dcb7b86d5905538666a411
Signed-off-by: Sastry Isukapalli <sastry@research.att.com>
Diffstat (limited to 'osdf/adapters/policy/utils.py')
| -rw-r--r-- | osdf/adapters/policy/utils.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/osdf/adapters/policy/utils.py b/osdf/adapters/policy/utils.py index a006f12..27885a5 100644 --- a/osdf/adapters/policy/utils.py +++ b/osdf/adapters/policy/utils.py @@ -31,10 +31,12 @@ def group_policies(flat_policies): filter_policies = defaultdict(list) policy_name = [] for policy in flat_policies: - policy_type = policy['content']['type'] + policy_type = policy['content'].get('policyType') + if not policy_type: + continue if policy_type not in aggregated_policies: aggregated_policies[policy_type] = defaultdict(list) - for resource in policy['content']['policyScope']['resourceInstanceType']: + for resource in policy['content'].get('resourceInstanceType', []): aggregated_policies[policy_type][resource].append(policy) for policy_type in aggregated_policies: for resource in aggregated_policies[policy_type]: @@ -42,7 +44,7 @@ def group_policies(flat_policies): aggregated_policies[policy_type][resource].sort(key=lambda x: x['priority'], reverse=True) policy = aggregated_policies[policy_type][resource][0] if policy['policyName'] not in policy_name: - filter_policies[policy['content']['type']].append(policy) + filter_policies[policy['content']['policyType']].append(policy) policy_name.append(policy['policyName']) return filter_policies |