diff --git a/gso/workflows/device/create_device.py b/gso/workflows/device/create_device.py index 18956707d37a8b54cbadcb9ec962f6fe6b85019f..4f791fcac00b023dae66a5f97e8478a35ad7ff02 100644 --- a/gso/workflows/device/create_device.py +++ b/gso/workflows/device/create_device.py @@ -73,12 +73,14 @@ def create_subscription(product: UUIDstr) -> State: 'subscription_id': subscription.subscription_id, } + def iso_from_ipv4(ipv4_address): padded_octets = [f'{x:>03}' for x in ipv4_address.split('.')] joined_octets = ''.join(padded_octets) re_split = '.'.join(re.findall('....', joined_octets)) result = '.'.join(['49.51e5.0001', re_split, '00']) - return (result) + return result + @step('Get information from IPAM') def get_info_from_ipam(subscription: DeviceInactive) -> State: @@ -90,14 +92,12 @@ def get_info_from_ipam(subscription: DeviceInactive) -> State: ipaddress.ip_address('10.10.10.10') subscription.device.device_lo_ipv6_address = \ ipaddress.ip_address('fc00:798:10::10') - #subscription.device.device_lo_iso_address \ - # = "49.51e5.0001.0620.4009.6047.00" subscription.device.device_lo_iso_address \ - = iso_from_ipv4(str(subscription.device.device_lo_ipv4_address)) - subscription.device.device_si_ipv4_network = "192.168.0.0/31" - subscription.device.device_ias_lt_ipv4_network = "192.168.1.0/31" - subscription.device.device_ias_lt_ipv6_network = "fc00:798:1::150/126" - return {"subscription": subscription} + = iso_from_ipv4(str(subscription.device.device_lo_ipv4_address)) + subscription.device.device_si_ipv4_network = '192.168.0.0/31' + subscription.device.device_ias_lt_ipv4_network = '192.168.1.0/31' + subscription.device.device_ias_lt_ipv6_network = 'fc00:798:1::150/126' + return {'subscription': subscription} @step('Initialize subscription')