From e60d6f9e6af352a6f52113469dd7853d97b056ab Mon Sep 17 00:00:00 2001
From: Simone Spinelli <simone.spinelli@geant.org>
Date: Mon, 7 Aug 2023 14:06:14 +0200
Subject: [PATCH] Making linters happy
---
gso/services/ipam.py | 1 -
gso/workflows/device/create_device.py | 2 +-
gso/workflows/device/terminate_device.py | 2 +-
gso/workflows/iptrunk/create_iptrunk.py | 2 +-
test/test_ipam.py | 1 -
5 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gso/services/ipam.py b/gso/services/ipam.py
index eacb46a8..c46650f3 100644
--- a/gso/services/ipam.py
+++ b/gso/services/ipam.py
@@ -785,4 +785,3 @@ def validate_host(
assert provided_cnames == found_cnames, "Provided CNAME alias names don't match the ones poiting to hostname."
return host_addresses
-
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index 2656c621..391b48b4 100644
--- a/gso/workflows/device/create_device.py
+++ b/gso/workflows/device/create_device.py
@@ -17,8 +17,8 @@ from gso.products.product_blocks import device as device_pb
from gso.products.product_types import device
from gso.products.product_types.device import DeviceInactive, DeviceProvisioning
from gso.products.product_types.site import Site
-from gso.services.provisioning_proxy import pp_interaction
from gso.services import ipam, provisioning_proxy
+from gso.services.provisioning_proxy import pp_interaction
def site_selector() -> Choice:
diff --git a/gso/workflows/device/terminate_device.py b/gso/workflows/device/terminate_device.py
index 96d60f43..ac81a231 100644
--- a/gso/workflows/device/terminate_device.py
+++ b/gso/workflows/device/terminate_device.py
@@ -11,7 +11,7 @@ from orchestrator.workflows.utils import wrap_modify_initial_input_form
from gso.products.product_types.device import Device
from gso.services import ipam
-from gso.services.ipam import V4HostAddress, V4ServiceNetwork, V6HostAddress, V6ServiceNetwork
+from gso.services.ipam import HostAddresses, V4ServiceNetwork, V6ServiceNetwork
logger = logging.getLogger(__name__)
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 271d2700..2b70dc70 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -13,8 +13,8 @@ from gso.products.product_blocks import PhyPortCapacity
from gso.products.product_blocks.iptrunk import IptrunkType
from gso.products.product_types.device import Device
from gso.products.product_types.iptrunk import IptrunkInactive, IptrunkProvisioning
-from gso.services.provisioning_proxy import pp_interaction
from gso.services import ipam, provisioning_proxy
+from gso.services.provisioning_proxy import pp_interaction
def initial_input_form_generator(product_name: str) -> FormGenerator:
diff --git a/test/test_ipam.py b/test/test_ipam.py
index 706c9d85..13d24b34 100644
--- a/test/test_ipam.py
+++ b/test/test_ipam.py
@@ -464,4 +464,3 @@ def test_validate_host(data_config_filename: PathLike):
v4=ipaddress.ip_address("10.255.255.1"), v6=ipaddress.ip_address("dead:beef::1")
)
assert host_addresses is None
-
--
GitLab