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

massive overhaul

Browse Source
This commit is contained in:
Matt Love
2019-07-29 22:13:11 -07:00
parent 4bc56895a9
commit 3f7988910d
31 changed files with 860 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

104
hyperglass/configuration/__init__.py
View File

@@ -65,7 +65,7 @@ try:
devices = models.Routers.import_params(user_devices["router"])
credentials = models.Credentials.import_params(user_devices["credential"])
proxies = models.Proxies.import_params(user_devices["proxy"])
networks = models.Networks.import_params(user_devices["network"])
_networks = models.Networks.import_params(user_devices["network"])
except ValidationError as validation_errors:
errors = validation_errors.errors()
for error in errors:
@@ -86,3 +86,105 @@ logzero_formatter = logzero.LogFormatter(fmt=log_format, datefmt=date_format)
logzero_config = logzero.setup_default_logger(
formatter=logzero_formatter, level=log_level
)
class Networks:
def __init__(self):
self.routers = devices.routers
self.networks = _networks.networks
def networks_verbose(self):
locations_dict = {}
for (router, router_params) in self.routers.items():
for (netname, net_params) in self.networks.items():
if router_params["network"] == netname:
net_display = net_params["display_name"]
if net_display in locations_dict:
locations_dict[net_display].append(
{
"location": router_params["location"],
"hostname": router,
"display_name": router_params["display_name"],
}
)
elif net_display not in locations_dict:
locations_dict[net_display] = [
{
"location": router_params["location"],
"hostname": router,
"display_name": router_params["display_name"],
}
]
if not locations_dict:
raise ConfigError("Unable to build network to device mapping")
return locations_dict
def networks_display(self):
locations_dict = {}
for (router, router_params) in devices.routers.items():
for (netname, net_params) in _networks.networks.items():
if router_params["network"] == netname:
net_display = net_params["display_name"]
if net_display in locations_dict:
locations_dict[net_display].append(
router_params["display_name"]
)
elif net_display not in locations_dict:
locations_dict[net_display] = [router_params["display_name"]]
if not locations_dict:
raise ConfigError("Unable to build network to device mapping")
return [
{"network_name": netname, "location_names": display_name}
for (netname, display_name) in locations_dict.items()
]
net = Networks()
networks = net.networks_verbose()
logger.debug(networks)
display_networks = net.networks_display()
# def networks():
# locations_dict = {}
# for (router, router_params) in devices.routers.items():
# for (netname, net_params) in _networks.networks.items():
# if router_params["network"] == netname:
# net_display = net_params["display_name"]
# if net_display in locations_dict:
# locations_dict[net_display].append(
# {
# "location": router_params["location"],
# "hostname": router,
# "display_name": router_params["display_name"],
# }
# )
# elif net_display not in locations_dict:
# locations_dict[net_display] = [
# {
# "location": router_params["location"],
# "hostname": router,
# "display_name": router_params["display_name"],
# }
# ]
# if not locations_dict:
# raise ConfigError("Unable to build network to device mapping")
# return locations_dict
# def display_networks():
# locations_dict = {}
# for (router, router_params) in devices.routers.items():
# for (netname, net_params) in _networks.networks.items():
# if router_params["network"] == netname:
# net_display = net_params["display_name"]
# if net_display in locations_dict:
# locations_dict[net_display].append(router_params["display_name"])
# elif net_display not in locations_dict:
# locations_dict[net_display] = [router_params["display_name"]]
# if not locations_dict:
# raise ConfigError("Unable to build network to device mapping")
# return locations_dict
# networks = networks()
# display_networks = display_networks()

79
hyperglass/configuration/models.py
View File

@@ -44,7 +44,8 @@ class Router(BaseSettings):
"""Model for per-router config in devices.yaml."""
address: Union[IPvAnyAddress, str]
asn: int
# asn: int
network: str
src_addr_ipv4: IPv4Address
src_addr_ipv6: IPv6Address
credential: str
@@ -70,6 +71,42 @@ class Router(BaseSettings):
class Routers(BaseSettings):
"""Base model for devices class."""
# @staticmethod
# def build_network_lists(valid_devices):
# """
# Builds locations dict, which is converted to JSON and passed to
# JavaScript to associate locations with the selected network/ASN.
# Builds networks dict, which is used to render the network/ASN
# select element contents.
# """
# locations_dict = {}
# networks_dict = {}
# for (dev, params) in valid_devices.items():
# asn = str(params["asn"])
# if asn in locations_dict:
# locations_dict[asn].append(
# {
# "location": params["location"],
# "hostname": dev,
# "display_name": params["display_name"],
# }
# )
# networks_dict[asn].append(params["location"])
# elif asn not in locations_dict:
# locations_dict[asn] = [
# {
# "location": params["location"],
# "hostname": dev,
# "display_name": params["display_name"],
# }
# ]
# networks_dict[asn] = [params["location"]]
# if not locations_dict:
# raise ConfigError('Unable to build locations list from "devices.yaml"')
# if not networks_dict:
# raise ConfigError('Unable to build networks list from "devices.yaml"')
# return (locations_dict, networks_dict)
@staticmethod
def build_network_lists(valid_devices):
"""
@@ -79,33 +116,6 @@ class Routers(BaseSettings):
Builds networks dict, which is used to render the network/ASN
select element contents.
"""
locations_dict = {}
networks_dict = {}
for (dev, params) in valid_devices.items():
asn = str(params["asn"])
if asn in locations_dict:
locations_dict[asn].append(
{
"location": params["location"],
"hostname": dev,
"display_name": params["display_name"],
}
)
networks_dict[asn].append(params["location"])
elif asn not in locations_dict:
locations_dict[asn] = [
{
"location": params["location"],
"hostname": dev,
"display_name": params["display_name"],
}
]
networks_dict[asn] = [params["location"]]
if not locations_dict:
raise ConfigError('Unable to build locations list from "devices.yaml"')
if not networks_dict:
raise ConfigError('Unable to build networks list from "devices.yaml"')
return (locations_dict, networks_dict)
@classmethod
def import_params(cls, input_params):
@@ -122,11 +132,11 @@ class Routers(BaseSettings):
setattr(Routers, dev, router_params)
routers.update({dev: router_params.dict()})
hostnames.append(dev)
locations_dict, networks_dict = Routers.build_network_lists(routers)
# locations_dict, networks_dict = Routers.build_network_lists(routers)
Routers.routers = routers
Routers.hostnames = hostnames
Routers.locations = locations_dict
Routers.networks = networks_dict
# Routers.locations = locations_dict
# Routers.networks = networks_dict
return Routers()
class Config:
@@ -139,7 +149,6 @@ class Routers(BaseSettings):
class Network(BaseSettings):
"""Model for per-network/asn config in devices.yaml"""
asn: int
display_name: str
@@ -154,9 +163,12 @@ class Networks(BaseSettings):
the credentials class.
"""
obj = Networks()
networks = {}
for (netname, params) in input_params.items():
netname = clean_name(netname)
setattr(Networks, netname, Network(**params))
networks.update({netname: Network(**params).dict()})
Networks.networks = networks
return obj
class Config:
@@ -339,7 +351,8 @@ class Branding(BaseSettings):
"""Class model for 404 Error Page"""
title: str = "Error"
subtitle: str = "Page Not Found"
subtitle: str = "{uri} isn't a thing"
button: str = "Home"
class Error500(BaseSettings):
"""Class model for 500 Error Page"""