summaryrefslogtreecommitdiffstats
path: root/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib
diff options
context:
space:
mode:
authorAlex Shatov <alexs@att.com>2018-03-23 14:34:34 -0400
committerAlex Shatov <alexs@att.com>2018-03-23 14:34:34 -0400
commitb73f81e6d155610a9279ae5a1fd6f1298cc21173 (patch)
treec119fee2742c207b9291e2ed31ce832039876210 /onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib
parent8374ca27bb8ad13be686d689301edef2f4c1fb0f (diff)
2.3.0 onap-dcae-dcaepolicy-lib
- configAttributes in policy_filter being a stringified json, rather than the map due to SDC UI limitations - safely parse the configAttributes string into json waiting for the merge before uploading to public pypi Change-Id: If054c2c5e3d95bb97057bb4b2486dbff40e6b244 Signed-off-by: Alex Shatov <alexs@att.com> Issue-ID: DCAEGEN2-414
Diffstat (limited to 'onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib')
-rw-r--r--onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py27
1 files changed, 24 insertions, 3 deletions
diff --git a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
index 5a3a0b2..65c2614 100644
--- a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
+++ b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/dcae_policy.py
@@ -48,6 +48,8 @@ DCAE_POLICIES_TYPE = 'dcae.nodes.policies'
ACTION_GATHERED = "gathered"
ACTION_UPDATED = "updated"
+CONFIG_ATTRIBUTES = "configAttributes"
+
class Policies(object):
"""static class for policy operations"""
_updated_policies = {}
@@ -99,6 +101,23 @@ class Policies(object):
return True
@staticmethod
+ def _fix_policy_filter(policy_filter):
+ if CONFIG_ATTRIBUTES in policy_filter:
+ config_attributes = policy_filter.get(CONFIG_ATTRIBUTES)
+ if isinstance(config_attributes, dict):
+ return
+ try:
+ config_attributes = json.loads(config_attributes)
+ if config_attributes and isinstance(config_attributes, dict):
+ policy_filter[CONFIG_ATTRIBUTES] = config_attributes
+ return
+ except (ValueError, TypeError):
+ pass
+ if config_attributes:
+ ctx.logger.warn("unexpected %s: %s", CONFIG_ATTRIBUTES, config_attributes)
+ del policy_filter[CONFIG_ATTRIBUTES]
+
+ @staticmethod
def _gather_policies(target, policies, policy_filters):
"""adds the policies and policy-filter from dcae.nodes.policies node to policies"""
if DCAE_POLICIES_TYPE not in target.node.type_hierarchy:
@@ -106,14 +125,16 @@ class Policies(object):
property_policy_filter = target.node.properties.get(POLICY_FILTER)
if property_policy_filter:
- policy_filter = dict(
+ policy_filter = deepcopy(dict(
(k, v) for (k, v) in dict(property_policy_filter).iteritems()
if v or isinstance(v, (int, float))
- )
+ ))
+ Policies._fix_policy_filter(policy_filter)
+
if policy_filter:
policy_filters[target.instance.id] = {
POLICY_FILTER_ID : target.instance.id,
- POLICY_FILTER : deepcopy(policy_filter)
+ POLICY_FILTER : policy_filter
}
filtered_policies = target.instance.runtime_properties.get(POLICIES_FILTERED)