summaryrefslogtreecommitdiffstats
path: root/oti/event-handler/otihandler/consul_client.py
diff options
context:
space:
mode:
authorVijay Venkatesh Kumar <vv770d@att.com>2020-03-05 05:41:53 +0000
committerGerrit Code Review <gerrit@onap.org>2020-03-05 05:41:53 +0000
commit2b2aa9977411519081fcab8ce4d1c37d3d9ee1d4 (patch)
tree635bdc444eb2f8452545d387f46f9bcf7926d602 /oti/event-handler/otihandler/consul_client.py
parentff35e66284400a0d65302b77374826faebd54925 (diff)
parent2f2980df45d2d08c7a48c4a744bd893828f725f9 (diff)
Merge "Initial unit test coverage"
Diffstat (limited to 'oti/event-handler/otihandler/consul_client.py')
-rw-r--r--oti/event-handler/otihandler/consul_client.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/oti/event-handler/otihandler/consul_client.py b/oti/event-handler/otihandler/consul_client.py
index d26d3a1..1b25f3e 100644
--- a/oti/event-handler/otihandler/consul_client.py
+++ b/oti/event-handler/otihandler/consul_client.py
@@ -410,7 +410,7 @@ class ConsulClient(object):
# key = urllib.quote(key) # can't use urllib.quote() because it kills ':' in the key
if value:
- return {"KV": {"Verb": verb, "Key": key, "Value": base64.b64encode(value)}}
+ return {"KV": {"Verb": verb, "Key": key, "Value": base64.b64encode(bytes(value, "utf-8")).decode("utf-8")}}
return {"KV": {"Verb": verb, "Key": key}}
@@ -450,7 +450,7 @@ class ConsulClient(object):
"""put kvs into consul-kv"""
if not kvs:
- ConsulClient._logger.warn("kvs not supplied to store_kvs()")
+ ConsulClient._logger.warning("kvs not supplied to store_kvs()")
return
store_kvs = [
@@ -474,7 +474,7 @@ class ConsulClient(object):
"""delete key from consul-kv"""
if not key:
- ConsulClient._logger.warn("key not supplied to delete_key()")
+ ConsulClient._logger.warning("key not supplied to delete_key()")
return
delete_key = [
@@ -488,7 +488,7 @@ class ConsulClient(object):
"""delete key from consul-kv"""
if not key:
- ConsulClient._logger.warn("key not supplied to delete_kvs()")
+ ConsulClient._logger.warning("key not supplied to delete_kvs()")
return
delete_kvs = [
@@ -555,16 +555,16 @@ class ConsulClient(object):
@staticmethod
def add_vnf_id(scn, vnf_type, vnf_id, dti_dict):
"""
- Add VNF instance to Consul scn:dti key.
+ Add VNF instance to Consul scn:oti key.
Treat its value as a JSON string representing a dict.
Extend the dict by adding a dti_dict for vnf_id under vnf_type.
Turn the resulting extended dict into a JSON string.
- Store the string back into Consul under scn:dti key.
+ Store the string back into Consul under scn:oti key.
Watch out for conflicting concurrent updates.
"""
- key = scn + ':dti'
+ key = scn + ':oti'
lc_vnf_type = vnf_type.lower()
while True: # do until update succeeds
(mod_index, v) = ConsulClient.get_value(key, get_index=True)
@@ -583,16 +583,16 @@ class ConsulClient(object):
@staticmethod
def delete_vnf_id(scn, vnf_type, vnf_id):
"""
- Delete VNF instance from Consul scn:dti key.
+ Delete VNF instance from Consul scn:oti key.
Treat its value as a JSON string representing a dict.
Modify the dict by deleting the vnf_id key entry from under vnf_type.
Turn the resulting extended dict into a JSON string.
- Store the string back into Consul under scn:dti key.
+ Store the string back into Consul under scn:oti key.
Watch out for conflicting concurrent updates.
"""
- key = scn + ':dti'
+ key = scn + ':oti'
lc_vnf_type = vnf_type.lower()
while True: # do until update succeeds
(mod_index, v) = ConsulClient.get_value(key, get_index=True)