mirror/checktheroads-hyperglass
1
0
Fork 0
mirror of https://github.com/checktheroads/hyperglass synced 2024-05-11 05:55:08 +00:00
Code Releases Activity

don't require display_name for default vrf; closes #28

Browse Source
This commit is contained in:
checktheroads
2020-03-19 09:25:57 -07:00
parent 0b282965b8
commit 6780b74c63
2 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hyperglass/configuration/models/routers.py
View File

@@ -127,12 +127,9 @@ class Router(HyperglassModel):
for afi in ("ipv4", "ipv6"):
vrf_afi = vrf.get(afi)
# If AFI is actually defined (enabled), and if the
# source_address field is not set, raise an error
if vrf_afi is not None and vrf_afi.get("source_address") is None:
"""
If AFI is actually defined (enabled), and if the
source_address field is not set, raise an error
"""
raise ConfigError(
(
"VRF '{vrf}' in router '{router}' is missing a source "
@@ -143,16 +140,13 @@ class Router(HyperglassModel):
afi=afi.replace("ip", "IP"),
)
# If no display_name is set for a non-default VRF, try
# to make one by replacing non-alphanumeric characters
# with whitespaces and using str.title() to make each
# word look "pretty".
if vrf_name != "default" and not isinstance(
vrf.get("display_name"), StrictStr
):
"""
If no display_name is set for a non-default VRF, try
to make one by replacing non-alphanumeric characters
with whitespaces and using str.title() to make each
word look "pretty".
"""
new_name = vrf["name"]
new_name = re.sub(r"[^a-zA-Z0-9]", " ", new_name)
new_name = re.split(" ", new_name)
@@ -163,10 +157,11 @@ class Router(HyperglassModel):
f"Generated '{vrf['display_name']}'"
)
"""
Validate the non-default VRF against the standard
Vrf() class.
"""
elif vrf_name == "default" and vrf.get("display_name") is None:
vrf["display_name"] = "Global"
# Validate the non-default VRF against the standard
# Vrf() class.
vrf = Vrf(**vrf)
vrfs.append(vrf)

3
hyperglass/configuration/models/vrfs.py
View File

@@ -223,6 +223,9 @@ class Vrf(HyperglassModel):
values["ipv6"].protocol = protocol6
values["ipv6"].version = 6
if values.get("name") == "default" and values.get("display_name") is None:
values["display_name"] = "Global"
return values
def __getitem__(self, i):