diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py index 73459908963c4fc4fe4c5be936fe6110f1746dec..8168f0cf285646084ceebac9b67ccd6b403286e7 100644 --- a/gso/workflows/device/create_device.py +++ b/gso/workflows/device/create_device.py @@ -19,6 +19,7 @@ from gso.products.product_types import device from gso.products.product_types.device import DeviceInactive, \ DeviceProvisioning from gso.products.product_types.site import Site +# noinspection PyProtectedMember from gso.services import _ipam from gso.services import provisioning_proxy from gso.services.provisioning_proxy import await_pp_results, \ @@ -96,11 +97,14 @@ def get_info_from_ipam(subscription: DeviceProvisioning) -> State: subscription.device.device_lo_iso_address \ = iso_from_ipv4(str(subscription.device.device_lo_ipv4_address)) subscription.device.device_si_ipv4_network \ - = _ipam.allocate_service_ipv4_network(service_type='SI', comment=f"SI for {lo0_name}").v4 + = _ipam.allocate_service_ipv4_network(service_type='SI', + comment=f'SI for {lo0_name}').v4 subscription.device.device_ias_lt_ipv4_network \ - = _ipam.allocate_service_ipv4_network(service_type='LT_IAS', comment=f"LT for {lo0_name}").v4 + = _ipam.allocate_service_ipv4_network(service_type='LT_IAS', + comment=f'LT for {lo0_name}').v4 subscription.device.device_ias_lt_ipv6_network \ - = _ipam.allocate_service_ipv6_network(service_type='LT_IAS', comment=f"LT for {lo0_name}").v6 + = _ipam.allocate_service_ipv6_network(service_type='LT_IAS', + comment=f'LT for {lo0_name}').v6 return {'subscription': subscription} diff --git a/gso/workflows/iptrunk/create_iptrunk.py b/gso/workflows/iptrunk/create_iptrunk.py index 48e15393817947d424dec916da628fa4c8e9e770..bf7934bbcb54479e9272bb0d2733ad5897eee00a 100644 --- a/gso/workflows/iptrunk/create_iptrunk.py +++ b/gso/workflows/iptrunk/create_iptrunk.py @@ -17,6 +17,7 @@ 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 +# noinspection PyProtectedMember from gso.services import provisioning_proxy, _ipam from gso.services.provisioning_proxy import confirm_pp_results, \ await_pp_results @@ -92,11 +93,16 @@ def create_subscription(product: UUIDstr) -> State: @step('Get information from IPAM') def get_info_from_ipam(subscription: IptrunkProvisioning) -> State: - # TODO: get info about how these should be generated subscription.iptrunk.iptrunk_ipv4_network \ - = _ipam.allocate_service_ipv4_network(service_type="TRUNK", comment=subscription.iptrunk.iptrunk_description).v4 + = _ipam.allocate_service_ipv4_network( + service_type='TRUNK', + comment=subscription.iptrunk.iptrunk_description + ).v4 subscription.iptrunk.iptrunk_ipv6_network \ - = _ipam.allocate_service_ipv6_network(service_type="TRUNK", comment=subscription.iptrunk.iptrunk_description).v6 + = _ipam.allocate_service_ipv6_network( + service_type='TRUNK', + comment=subscription.iptrunk.iptrunk_description + ).v6 return {'subscription': subscription}