diff --git a/gso/services/ipam.py b/gso/services/ipam.py index eacb46a80e08f6c8356810e3afcac92776afb4f0..c46650f334727b31ea84b06f5c2a9e60b38e61b9 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 2656c621b6755d39b40d75b2ef60fd5b87d2c71f..391b48b4a919e5a900c16c39d4e798e6227cc35b 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 96d60f43470697ae03302c56830de5e8ead8e61f..ac81a231189fa8d0582569b5ecce35ec73acded9 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 271d2700f035ab337c8a35fffd145233d8a98e76..2b70dc70a0562078c3fa7a08770b600d0e64bc42 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 706c9d856d2e03ed86cd49acea181bf4a45fb9bf..13d24b34b3d1696720025673fc8850057a8369bc 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 -