From bb017097136b5a3fac7e9965b06f9d2b5d464fb0 Mon Sep 17 00:00:00 2001 From: checktheroads Date: Wed, 16 Oct 2019 01:17:44 -0700 Subject: [PATCH] remove legacy fields --- hyperglass/configuration/models/branding.py | 12 +++--------- hyperglass/configuration/models/messages.py | 2 +- hyperglass/configuration/models/proxies.py | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/hyperglass/configuration/models/branding.py b/hyperglass/configuration/models/branding.py index d769b91..60991d2 100644 --- a/hyperglass/configuration/models/branding.py +++ b/hyperglass/configuration/models/branding.py @@ -18,7 +18,7 @@ from hyperglass.configuration.models._utils import HyperglassModel class Branding(HyperglassModel): """Class model for params.branding""" - site_name: str = "hyperglass" + site_title: str = "hyperglass" class Colors(HyperglassModel): """Class model for params.colors""" @@ -61,7 +61,7 @@ class Branding(HyperglassModel): favicons: str = "ui/images/favicons/" @validator("favicons") - def favicons_trailing_slash(value): + def favicons_trailing_slash(cls, value): """ If the favicons path does not end in a '/', append it. """ @@ -89,6 +89,7 @@ class Branding(HyperglassModel): query_location: str = "Location" query_type: str = "Query Type" query_target: str = "Target" + query_vrf: str = "Routing Table" terms: str = "Terms" info: str = "Help" peeringdb = "PeeringDB" @@ -97,7 +98,6 @@ class Branding(HyperglassModel): bgp_aspath: str = "BGP AS Path" ping: str = "Ping" traceroute: str = "Traceroute" - vrf: str = "Routing Table" class Error404(HyperglassModel): """Class model for 404 Error Page""" @@ -113,14 +113,8 @@ class Branding(HyperglassModel): subtitle: str = "Something Went Wrong" button: str = "Home" - class Error504(HyperglassModel): - """Class model for 504 Error Element""" - - message: str = "Unable to reach {target}" - error404: Error404 = Error404() error500: Error500 = Error500() - error504: Error504 = Error504() colors: Colors = Colors() credit: Credit = Credit() diff --git a/hyperglass/configuration/models/messages.py b/hyperglass/configuration/models/messages.py index 037e581..45c3053 100644 --- a/hyperglass/configuration/models/messages.py +++ b/hyperglass/configuration/models/messages.py @@ -32,5 +32,5 @@ class Messages(HyperglassModel): authentication_error: str = "Authentication error occurred." noresponse_error: str = "No response." vrf_not_associated: str = "VRF {vrf_name} is not associated with {device_name}." - no_matching_vrfs: str = "No VRFs Match" + no_matching_vrfs: str = "No VRFs in Common" no_output: str = "No output." diff --git a/hyperglass/configuration/models/proxies.py b/hyperglass/configuration/models/proxies.py index 7bb0a17..d8f39ca 100644 --- a/hyperglass/configuration/models/proxies.py +++ b/hyperglass/configuration/models/proxies.py @@ -23,8 +23,7 @@ class Proxy(HyperglassModel): address: str port: int = 22 credential: Credential - nos: str - ssh_command: str = "ssh -l {username} {host}" + nos: str = "linux_ssh" @validator("nos") def supported_nos(cls, v): # noqa: N805