Skip to content
Snippets Groups Projects
Commit 1e6c78af authored by Simone Spinelli's avatar Simone Spinelli
Browse files

Resolv conflicts

parent 804d524b
Branches
Tags
1 merge request!12Add sites, and add integration of IPtrunks and routers with LSO deployment
This commit is part of merge request !12. Comments created here will be created in the context of that merge request.
import ipaddress import ipaddress
import re
from uuid import uuid4 from uuid import uuid4
from orchestrator.db.models import ProductTable, SubscriptionTable from orchestrator.db.models import ProductTable, SubscriptionTable
...@@ -72,6 +73,12 @@ def create_subscription(product: UUIDstr) -> State: ...@@ -72,6 +73,12 @@ def create_subscription(product: UUIDstr) -> State:
'subscription_id': subscription.subscription_id, '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)
@step('Get information from IPAM') @step('Get information from IPAM')
def get_info_from_ipam(subscription: DeviceInactive) -> State: def get_info_from_ipam(subscription: DeviceInactive) -> State:
...@@ -83,12 +90,14 @@ def get_info_from_ipam(subscription: DeviceInactive) -> State: ...@@ -83,12 +90,14 @@ def get_info_from_ipam(subscription: DeviceInactive) -> State:
ipaddress.ip_address('10.10.10.10') ipaddress.ip_address('10.10.10.10')
subscription.device.device_lo_ipv6_address = \ subscription.device.device_lo_ipv6_address = \
ipaddress.ip_address('fc00:798:10::10') 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 \ subscription.device.device_lo_iso_address \
= '49.51e5.0001.0620.4009.6047.00' = iso_from_ipv4(str(subscription.device.device_lo_ipv4_address))
subscription.device.device_si_ipv4_network = '192.168.0.0/31' 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_ipv4_network = "192.168.1.0/31"
subscription.device.device_ias_lt_ipv6_network = 'fc00:798:1::150/126' subscription.device.device_ias_lt_ipv6_network = "fc00:798:1::150/126"
return {'subscription': subscription} return {"subscription": subscription}
@step('Initialize subscription') @step('Initialize subscription')
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment