NAT-212/213: tox after merge develop

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,

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
 
 

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__)
 

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