Feature/nat 212 213

This PR covers NAT-212 and NAT-213.

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
 
 
@@ -98,11 +98,11 @@ 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(
+    subscription.iptrunk.iptrunk_ipv4_network = ipam.allocate_ipv4_network(
         service_type="TRUNK",
         comment=subscription.iptrunk.iptrunk_description,
     ).v4
-    subscription.iptrunk.iptrunk_ipv6_network = _ipam.allocate_service_ipv6_network(
+    subscription.iptrunk.iptrunk_ipv6_network = ipam.allocate_ipv6_network(
         service_type="TRUNK",
         comment=subscription.iptrunk.iptrunk_description,
     ).v6