From 55a9918fd0255e53650d0901975700021bcc29d3 Mon Sep 17 00:00:00 2001 From: thatmattlove Date: Mon, 6 Dec 2021 12:14:00 -0700 Subject: [PATCH] Minor improvements --- hyperglass/cli/main.py | 2 +- hyperglass/main.py | 2 +- hyperglass/models/config/credential.py | 2 +- hyperglass/models/system.py | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hyperglass/cli/main.py b/hyperglass/cli/main.py index 6e89d2e..818a3b7 100644 --- a/hyperglass/cli/main.py +++ b/hyperglass/cli/main.py @@ -78,7 +78,7 @@ def _build_ui(timeout: int = typer.Option(180, help="Timeout in seconds")) -> No f"Starting new UI build with a {timeout} second timeout...", spinner="aesthetic" ): - _build_ui() + _build_ui(timeout=120) @cli.command(name="system-info") diff --git a/hyperglass/main.py b/hyperglass/main.py index dc8c414..cf58629 100644 --- a/hyperglass/main.py +++ b/hyperglass/main.py @@ -30,7 +30,7 @@ if sys.version_info < MIN_PYTHON_VERSION: # Ensure the NodeJS version meets the minimum requirements. node_major, _, __ = get_node_version() -if node_major != MIN_NODE_VERSION: +if node_major < MIN_NODE_VERSION: raise RuntimeError(f"NodeJS {MIN_NODE_VERSION!s}+ is required.") diff --git a/hyperglass/models/config/credential.py b/hyperglass/models/config/credential.py index 3a28eda..d986238 100644 --- a/hyperglass/models/config/credential.py +++ b/hyperglass/models/config/credential.py @@ -22,7 +22,7 @@ class Credential(HyperglassModel, extra="allow"): @root_validator def validate_credential(cls, values): """Ensure either a password or an SSH key is set.""" - if values["key"] is None and values["password"] is None: + if values.get("key") is None and values.get("password") is None: raise ValueError( "Either a password or an SSH key must be specified for user '{}'".format( values["username"] diff --git a/hyperglass/models/system.py b/hyperglass/models/system.py index d55f297..e6df93f 100644 --- a/hyperglass/models/system.py +++ b/hyperglass/models/system.py @@ -81,9 +81,9 @@ class HyperglassSettings(BaseSettings): if value is None: if values["debug"] is False: - return ip_address("127.0.0.1") + return ip_address("::1") elif values["debug"] is True: - return ip_address("0.0.0.0") + return ip_address("::") if isinstance(value, str): if value != "localhost": @@ -93,7 +93,7 @@ class HyperglassSettings(BaseSettings): raise ValueError(str(value)) elif value == "localhost": - return ip_address("127.0.0.1") + return ip_address("::1") raise ValueError(str(value))