Skip to content

fix #25 #26

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

Merged
merged 5 commits into from
Dec 23, 2021
Merged

fix #25 #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba03e7b
fix value parser
lvrfrc87 Dec 23, 2021
3e8c999
fix value parser
lvrfrc87 Dec 23, 2021
92c3099
integrate comments from PR
lvrfrc87 Dec 23, 2021
dbbd62e
fix pycodestyle
lvrfrc87 Dec 23, 2021
c145a57
integrate comments from PR
lvrfrc87 Dec 23, 2021
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
30 changes: 20 additions & 10 deletions netcompare/utils/jmspath_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,31 @@ def jmspath_value_parser(path: str):
"""
Get the JMSPath value path from 'path'.

Two combinations are possible based on where reference key is defined. See example below.

Args:
path: "result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesReceived]"
path: "result[0].$vrfs$.default.peerList[*].[peerAddress, prefixesReceived]"

Return:
"result[0].vrfs.default.peerList[*].[prefixesReceived]"
"result[0].vrfs.default.peerList[*].[peerAddress, prefixesReceived]"
"""
regex_match_value = re.search(r"\$.*\$\.|\$.*\$,|,\$.*\$", path)

if not regex_match_value:
return path
# $peers$. --> peers
regex_normalized_value = re.search(r"\$.*\$", regex_match_value.group())
if regex_normalized_value:
normalized_value = regex_match_value.group().split("$")[1]
return path.replace(regex_normalized_value.group(), normalized_value)

regex_ref_key = re.compile(r"\$.*\$\.|\$.*\$,|,\$.*\$")
regex_match_ref_key = regex_ref_key.search(path)
path_suffix = path.split(".")[-1]

if regex_match_ref_key:
if regex_ref_key.search(path_suffix):
# [$peerAddress$,prefixesReceived] --> [prefixesReceived]
reference_key = regex_match_ref_key.group()
return path.replace(reference_key, "")

# result[0].$vrfs$.default... --> result[0].vrfs.default....
regex_normalized_value = re.search(r"\$.*\$", regex_match_ref_key.group())
if regex_normalized_value:
normalized_value = regex_match_ref_key.group().split("$")[1]
return path.replace(regex_normalized_value.group(), normalized_value)
return path


Expand Down
6 changes: 3 additions & 3 deletions tests/test_jmspath_parsers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@

value_parser_case_1 = (
"result[0].vrfs.default.peerList[*].[$peerAddress$,prefixesReceived]",
"result[0].vrfs.default.peerList[*].[peerAddress,prefixesReceived]",
"result[0].vrfs.default.peerList[*].[prefixesReceived]",
)
value_parser_case_2 = (
"result[0].vrfs.default.peerList[*].[peerAddress,$prefixesReceived$]",
"result[0].vrfs.default.peerList[*].[peerAddress,prefixesReceived]",
"result[0].vrfs.default.peerList[*].[peerAddress]",
)
value_parser_case_3 = (
"result[0].vrfs.default.peerList[*].[interfaceCounters,$peerAddress$,prefixesReceived]",
"result[0].vrfs.default.peerList[*].[interfaceCounters,peerAddress,prefixesReceived]",
"result[0].vrfs.default.peerList[*].[interfaceCounters,prefixesReceived]",
)
value_parser_case_4 = (
"result[0].$vrfs$.default.peerList[*].[peerAddress,prefixesReceived]",
Expand Down