diff options
author | Schmalzried, Terry (ts862m) <ts862m@att.com> | 2019-11-25 18:09:53 -0500 |
---|---|---|
committer | Schmalzried, Terry (ts862m) <ts862m@att.com> | 2019-11-26 10:37:13 -0500 |
commit | 0095ee39734b4f58ec8fc72fc09d7e3bc167d274 (patch) | |
tree | fea94c02ea25005951d7f58d59877bf053ef2896 /onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py | |
parent | 8060697f3634bd21a66347114160ed416a9f617e (diff) |
policy lib 3.x support
Issue-ID: DCAEGEN2-1548
Change-Id: Id1c10f08f1375554aa744332bdfe37e1d6afc9d8
Signed-off-by: Schmalzried, Terry (ts862m) <ts862m@att.com>
Diffstat (limited to 'onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py')
-rw-r--r-- | onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py index d8125c0..0034b9c 100644 --- a/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py +++ b/onap-dcae-dcaepolicy-lib/onap_dcae_dcaepolicy_lib/policies_output.py @@ -1,5 +1,5 @@ # ================================================================================ -# Copyright (c) 2018 AT&T Intellectual Property. All rights reserved. +# Copyright (c) 2019 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -20,7 +20,10 @@ import base64 import json -import urllib +try: + from urllib.parse import quote +except ImportError: + from urllib import quote import uuid from datetime import datetime @@ -51,7 +54,7 @@ class PoliciesOutput(object): def _gen_txn_operation(verb, service_component_name, key=None, value=None): """returns the properly formatted operation to be used inside transaction""" key = PoliciesOutput.POLICIES_FOLDER_MASK.format( - service_component_name, urllib.quote(key or "") + service_component_name, quote(key or "") ) if value: return {"KV": {"Verb": verb, "Key": key, "Value": base64.b64encode(value)}} @@ -108,7 +111,7 @@ class PoliciesOutput(object): store_policies = [ PoliciesOutput._gen_txn_operation(PoliciesOutput.OPERATION_SET, service_component_name, "items/" + policy_id, json.dumps(policy_body)) - for policy_id, policy_body in policy_bodies.iteritems() + for policy_id, policy_body in policy_bodies.items() ] txn = [ PoliciesOutput._gen_txn_operation( @@ -117,7 +120,7 @@ class PoliciesOutput(object): PoliciesOutput.OPERATION_SET, service_component_name, "event", json.dumps(event)) ] idx_step = PoliciesOutput.MAX_OPS_PER_TXN - len(txn) - for idx in xrange(0, len(store_policies), idx_step): + for idx in range(0, len(store_policies), idx_step): txn += store_policies[idx : idx + idx_step] if not PoliciesOutput._run_transaction("store_policies", txn): return False |