From 5ed5cb0da819b8063387105e2e81f3be5d413384 Mon Sep 17 00:00:00 2001
From: Jorge Sasiain <jorge.sasiain@ehu.eus>
Date: Mon, 24 Jul 2023 08:32:01 +0000
Subject: [PATCH] NAT-212/213: tox after merge develop
---
gso/services/ipam.py | 4 ++--
gso/workflows/device/create_device.py | 2 +-
gso/workflows/device/terminate_device.py | 3 +--
gso/workflows/iptrunk/create_iptrunk.py | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/gso/services/ipam.py b/gso/services/ipam.py
index 3ddab7e7..a4fe5294 100644
--- a/gso/services/ipam.py
+++ b/gso/services/ipam.py
@@ -325,7 +325,7 @@ def find_next_available_ip(infoblox_params, network_ref: str = ""):
return received_ip[0]
-def allocate_host_inner( # noqa: max-complexity=15
+def allocate_host_inner( # noqa: C901
hostname: str = "",
addrs: Optional[Tuple] = None,
networks: Optional[Tuple] = None,
@@ -419,7 +419,7 @@ def allocate_host_inner( # noqa: max-complexity=15
return HostAddresses(v4=ipaddress.ip_address(ipv4_addr), v6=ipaddress.ip_address(ipv6_addr))
-def allocate_host( # noqa: max-complexity=15
+def allocate_host( # noqa: C901
hostname: str = "",
service_type: str = "",
service_networks: Optional[ServiceNetworks] = None,
diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py
index ce27a9d9..391b48b4 100644
--- a/gso/workflows/device/create_device.py
+++ b/gso/workflows/device/create_device.py
@@ -17,7 +17,7 @@ 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 import _ipam, provisioning_proxy
+from gso.services import ipam, provisioning_proxy
from gso.services.provisioning_proxy import pp_interaction
diff --git a/gso/workflows/device/terminate_device.py b/gso/workflows/device/terminate_device.py
index f9786c11..4b82c0d6 100644
--- a/gso/workflows/device/terminate_device.py
+++ b/gso/workflows/device/terminate_device.py
@@ -11,8 +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, V6HostAddress
-from gso.services.ipam import V4ServiceNetwork, V6ServiceNetwork
+from gso.services.ipam import V4HostAddress, V4ServiceNetwork, V6HostAddress, V6ServiceNetwork
logger = logging.getLogger(__name__)
diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py
index 6e5ce450..222d8a97 100644
--- a/gso/workflows/iptrunk/create_iptrunk.py
+++ b/gso/workflows/iptrunk/create_iptrunk.py
@@ -13,7 +13,7 @@ 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 import _ipam, provisioning_proxy
+from gso.services import ipam, provisioning_proxy
from gso.services.provisioning_proxy import pp_interaction
--
GitLab