diff --git a/gso/cli/netbox.py b/gso/cli/netbox.py index ddaa94ff7f70ab045f266629bc2e4370061cb3b7..97acdcf84bf0bd70320594c022087a6400f07486 100644 --- a/gso/cli/netbox.py +++ b/gso/cli/netbox.py @@ -17,11 +17,7 @@ def netbox_initial_setup() -> None: typer.echo("Initial setup of NetBox ...") typer.echo("Connecting to NetBox ...") - try: - nbclient = NetBoxClient() - except RequestError as e: - typer.echo(f"Error connecting to NetBox: {e}") - return + nbclient = NetBoxClient() typer.echo("Creating GEANT site ...") try: diff --git a/gso/services/netbox_client.py b/gso/services/netbox_client.py index 964fb6c2b48eb3acfd848073c3e84e9cd62d4e89..a66aae8692b91249a1c460b5aa5d120c74df6237 100644 --- a/gso/services/netbox_client.py +++ b/gso/services/netbox_client.py @@ -7,7 +7,7 @@ from pynetbox.models.dcim import Devices, DeviceTypes, Interfaces from gso.products import Router from gso.settings import load_oss_params -from gso.utils.device_info import FEASIBLE_LAG_RANGE, TierInfo +from gso.utils.device_info import FEASIBLE_IP_TRUNK_LAG_RANGE, TierInfo from gso.utils.exceptions import NotFoundError, WorkflowStateError @@ -49,8 +49,8 @@ class NetBoxClient: """Implement all methods to communicate with the NetBox API.""" def __init__(self) -> None: - netbox_params = load_oss_params().NETBOX - self.netbox = pynetbox.api(netbox_params.api, netbox_params.token) + self.netbox_params = load_oss_params().NETBOX + self.netbox = pynetbox.api(self.netbox_params.api, self.netbox_params.token) def get_all_devices(self) -> list[Devices]: return list(self.netbox.dcim.devices.all()) @@ -207,7 +207,7 @@ class NetBoxClient: ] # Generate all feasible lags - all_feasible_lags = [f"LAG-{i}" for i in FEASIBLE_LAG_RANGE] + all_feasible_lags = [f"LAG-{i}" for i in FEASIBLE_IP_TRUNK_LAG_RANGE] # Return available lags not assigned to the device return [lag for lag in all_feasible_lags if lag not in lag_interface_names] diff --git a/gso/utils/device_info.py b/gso/utils/device_info.py index c4d09ccb823a62de127093d1856f45ecb544594c..1c193557f8c21515103b210517f4c1e5ab58a597 100644 --- a/gso/utils/device_info.py +++ b/gso/utils/device_info.py @@ -30,5 +30,4 @@ class TierInfo: return getattr(self, name) -# Ranges of LAGs that are feasible for a given device type. -FEASIBLE_LAG_RANGE = range(1, 11) +FEASIBLE_IP_TRUNK_LAG_RANGE = range(1, 10)