Skip to content

Client leaflist fix #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ramichael77 wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −16
Open

Client leaflist fix #175

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions pygnmi/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -589,24 +589,28 @@ def get(

elif update_msg.val.HasField("leaflist_val"):
val_leaflist = update_msg.val
element_val = None
if all([isinstance(e, TypedValue) for e in val_leaflist.leaflist_val.element]):
element_val = {}
element_val = []
for e in val_leaflist.leaflist_val.element:
if hasattr(e, "json_val"):
element_val.update(json.loads(e.json_val))
elif hasattr(e, "json_ietf_val"):
element_val.update(json.loads(e.json_ietf_val))
if e.HasField("json_val"):
element_val.append(json.loads(e.json_val))
elif e.HasField("json_ietf_val"):
element_val.append(json.loads(e.json_ietf_val))
else:
raise TypeError(f"Neither json_val nor json_ietf_val found in element {e}.")
for leaf_val in e.ListFields():
if isinstance(leaf_val, tuple):
element_val.append(leaf_val[1])
else:
raise TypeError(f"Not tuple element {leaf_val}.")
elif all([isinstance(e, str) for e in val_leaflist.leaflist_val.element]):
element_val = ""
for e in val_leaflist.leaflist_val.element:
element_val += e
else:
raise Exception("leaflist elements have differing types. Only str and TypedValue are supported.")

update_container.update({"val": element_val})
if element_val:
update_container.update({"val": element_val})

notification_container["update"].append(update_container)

Expand Down Expand Up @@ -1414,24 +1418,28 @@ def telemetryParser(in_message=None, debug: bool = False):

elif update_msg.val.HasField("leaflist_val"):
val_leaflist = update_msg.val
element_val = None
if all([isinstance(e, TypedValue) for e in val_leaflist.leaflist_val.element]):
element_val = {}
element_val = []
for e in val_leaflist.leaflist_val.element:
if hasattr(e, "json_val"):
element_val.update(json.loads(e.json_val))
elif hasattr(e, "json_ietf_val"):
element_val.update(json.loads(e.json_ietf_val))
if e.HasField("json_val"):
element_val.append(json.loads(e.json_val))
elif e.HasField("json_ietf_val"):
element_val.append(json.loads(e.json_ietf_val))
else:
raise TypeError(f"Neither json_val nor json_ietf_val found in element {e}.")
for leaf_val in e.ListFields():
if isinstance(leaf_val, tuple):
element_val.append(leaf_val[1])
else:
raise TypeError(f"Not tuple element {leaf_val}.")
elif all([isinstance(e, str) for e in val_leaflist.leaflist_val.element]):
element_val = ""
for e in val_leaflist.leaflist_val.element:
element_val += e
else:
raise Exception("leaflist elements have differing types. Only str and TypedValue are supported.")

update_container.update({"val": element_val})
if element_val:
update_container.update({"val": element_val})

response["update"]["update"].append(update_container)

Expand Down