Skip to content

regex fixes for cisco,nxos models #13

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

regex fixes for cisco,nxos models #13

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ciscoconfparse2/models_cisco.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1471,7 +1471,7 @@ def ipv4_addr_object(self) -> IPv4Obj:
:rtype: IPv4Obj
"""
retval = self.re_match_iter_typed(
r"^\s+ip\s+address\s+(?P<v4addr>\S+)\s+(?P<v4netmask>\d+\.\d+\.\d+\.\d+)",
r"^\s+ip\s+address\s+(?P<v4addr>\S+)\s+(?P<v4netmask>\d+\.\d+\.\d+\.\d+\s*$)",
groupdict={"v4addr": str, "v4netmask": str},
default="",
)
Expand Down
10 changes: 5 additions & 5 deletions ciscoconfparse2/models_nxos.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -943,7 +943,7 @@ def ipv4_addr_object(self) -> IPv4Obj:
:rtype: IPv4Obj
"""
retval = self.re_match_iter_typed(
r"^\s+ip\s+address\s+(?P<v4addr>\S+)\s+(?P<v4netmask>\d+\.\d+\.\d+\.\d+)",
r"^\s+ip\s+address\s+(?P<v4addr>\S+)\/(?P<v4netmask>\d+)\s*$",
groupdict={"v4addr": str, "v4netmask": str},
default="",
)
Expand Down Expand Up @@ -983,7 +983,7 @@ def ip_secondary_addresses(self) -> set[str]:
retval = set()
for obj in self.parent.all_children:
_gg = obj.re_match_iter_typed(
r"^\s*ip\s+address\s+(?P<secondary>\S+\s+\S+)\s+secondary\s*$",
r"^\s*ip\s+address\s+(?P<secondary>\S+\/\S+)\s+secondary\s*$",
groupdict={"secondary": IPv4Obj},
default=False
)
Expand Down Expand Up @@ -1248,7 +1248,7 @@ def vrf(self) -> str:
:rtype: str
"""
retval = self.re_match_iter_typed(
r"^\s*(ip\s+)*vrf\sforwarding\s(\S+)$", result_type=str, group=2, default=""
r"^\s*vrf\smember\s(\S+)$", result_type=str, group=1, default=""
)
return retval

Expand All @@ -1271,7 +1271,7 @@ def ipv4_addr(self) -> str:
:rtype: str
"""
retval = self.re_match_iter_typed(
r"^\s+ip\s+address\s+(\d+\.\d+\.\d+\.\d+)\s+\d+\.\d+\.\d+\.\d+\s*$",
r"^\s+ip\s+address\s+(\d+\.\d+\.\d+\.\d+)\/\d+\s*$",
result_type=str,
default="",
)
Expand All @@ -1297,7 +1297,7 @@ def ipv4_netmask(self) -> str:
:rtype: str
"""
retval = self.re_match_iter_typed(
r"^\s+ip\s+address\s+\d+\.\d+\.\d+\.\d+\s+(\d+\.\d+\.\d+\.\d+)\s*$",
r"^\s+ip\s+address\s+\d+\.\d+\.\d+\.\d+\/(\d+)\s*$",
result_type=str,
default="",
)
Expand Down