Skip to content

Bug Fix: Update _match_keys() #206

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
toeknee2120 wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bug Fix: Update _match_keys() #206

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cedb29d
Update _match_keys()
toeknee2120 Jun 29, 2026
d6c3ddb
Refactor key matching logic in rev1/interface.py
toeknee2120 Jul 4, 2026
046ff78
Add unittest
Jul 4, 2026
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
6 changes: 3 additions & 3 deletions pkgs/ops-pkg/src/genie/libs/ops/interface/nxos/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,11 +464,11 @@ def _match_keys(self, dic, match):
if isinstance(dic, dict):
for key, value in match.items():
for dic_key in dic:
if key in dic[dic_key] and dic[dic_key][key] == value:
if not isinstance(dic[dic_key], dict):
Comment thread
toeknee2120 marked this conversation as resolved.
pass
elif key in dic[dic_key] and dic[dic_key][key] == value:
self.ret_dict.update(dic)
break
elif not isinstance(dic[dic_key], dict):
pass
else:
self._match_keys(dic=dic[dic_key], match=match)
return(self.ret_dict)
Expand Down
8 changes: 4 additions & 4 deletions pkgs/ops-pkg/src/genie/libs/ops/interface/nxos/rev1/interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,11 +485,11 @@ def _match_keys(self, dic, match):
if isinstance(dic, dict):
for key, value in match.items():
for dic_key in dic:
if key in dic[dic_key] and dic[dic_key][key] == value:
if not isinstance(dic[dic_key], dict):
pass
elif key in dic[dic_key] and dic[dic_key][key] == value:
self.ret_dict.update(dic)
break
elif not isinstance(dic[dic_key], dict):
pass
else:
self._match_keys(dic=dic[dic_key], match=match)
return(self.ret_dict)
return(self.ret_dict)
16 changes: 16 additions & 0 deletions pkgs/ops-pkg/src/genie/libs/ops/interface/nxos/tests/test_interface.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,22 @@ def test_incomplete_output(self):
# Verify Ops was created successfully
self.assertDictEqual(intf.info, expect_dict)

def test_match_keys_ignores_scalar_values(self):
intf = Interface(device=self.device)
intf.ret_dict = {}
g
routing_dict = {
"route1": {
"interface": "Ethernet2/1",
"tag": 10,
},
"scalar": "not-a-dict",
}

intf._match_keys(dic=routing_dict, match={"interface": "Ethernet2/1"})

self.assertEqual(intf.ret_dict, routing_dict)

def test_brief_output(self):
self.maxDiff = None
intf = InterfaceRev1(device=self.device)
Expand Down