Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support Ciena type of interface naming #150

Merged
merged 2 commits into from
Oct 3, 2024
Merged

fix: support Ciena type of interface naming #150

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
744518a
fix: support Ciena type of interface naming
xi-yang Oct 3, 2024
a610a83
fix: typo
xi-yang Oct 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 11 additions & 32 deletions fabric_am/handlers/net_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,11 +469,7 @@ def __l2bridge_create_data(self, sliver: NetworkServiceSliver, service_name: str
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'l2bridge - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'l2bridge - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None:
interface['outervlan'] = 0
else:
Expand Down Expand Up @@ -506,11 +502,7 @@ def __l2ptp_create_data(self, sliver: NetworkServiceSliver, service_name: str) -
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'l2ptp - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'l2ptp - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None or labs.vlan == 0:
raise NetHandlerException(
f'l2ptp - interface "{interface_name}" must be tagged (with vlan label in 1..4095)')
Expand Down Expand Up @@ -571,11 +563,7 @@ def __l2sts_create_data(self, sliver: NetworkServiceSliver, service_name: str) -
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'l2sts - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'l2sts - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None:
interface['outervlan'] = 0
else:
Expand Down Expand Up @@ -651,11 +639,7 @@ def __fabnetv4_create_data(self, sliver: NetworkServiceSliver, service_name: str
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'fabnetv4 - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'fabnetv4 - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None:
interface['outervlan'] = 0
else:
Expand Down Expand Up @@ -733,11 +717,7 @@ def __fabnetv6_create_data(self, sliver: NetworkServiceSliver, service_name: str
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'fabnetv6 - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'fabnetv6 - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None:
interface['outervlan'] = 0
else:
Expand Down Expand Up @@ -818,11 +798,7 @@ def __l3vpn_create_data(self, sliver: NetworkServiceSliver, service_name: str) -
interface = {}
if labs.local_name is None:
raise NetHandlerException(f'l3vpn - interface "{interface_name}" has no "local_name" label')
interface_type_id = re.findall(r'(\w+)(\d.+)', labs.local_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'l3vpn - interface "{interface_name}" has malformed "local_name" label')
interface['type'] = interface_type_id[0][0]
interface['id'] = interface_type_id[0][1]
interface = self.parse_interface_name(labs.local_name)
if labs.vlan is None:
interface['outervlan'] = 0
else:
Expand Down Expand Up @@ -934,11 +910,14 @@ def __portmirror_create_data(self, sliver: NetworkServiceSliver, service_name: s
return data

def parse_interface_name(self, interface_name: str) -> dict:
p = re.compile('^[/\d]+$')
if p.match(interface_name):
return {'type': "Generic", 'id': interface_name}
interface_type_id = re.findall(r'(\w+)(\d.+)', interface_name)
if not interface_type_id or len(interface_type_id[0]) != 2:
raise NetHandlerException(f'interface name "{interface_name}" is malformed')
interface = {'type': interface_type_id[0][0], 'id': interface_type_id[0][1]}
return interface
else:
return {'type': interface_type_id[0][0], 'id': interface_type_id[0][1]}

def poa(self, unit: ConfigToken, data: dict) -> Tuple[dict, ConfigToken]:
"""
Expand Down