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

Parse backend switches to vlan sub port interface #3413

Merged
merged 7 commits into from
Oct 17, 2019
Merged

Parse backend switches to vlan sub port interface #3413

Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
181413c
Parse backend switches to vlan sub port interface
wendani Sep 4, 2019
9426c10
Do not change the current content of pc_intfs or phyport_intfs
wendani Sep 4, 2019
6708be8
Merge remote-tracking branch 'public/master' into sub_intf_master
wendani Sep 13, 2019
5bc2582
Add sonic-cfggen unit test for sub port interface
wendani Sep 14, 2019
51aab33
Check VLAN_SUB_INTERFACE table content
wendani Sep 14, 2019
2661c4a
Merge remote-tracking branch 'public/master' into sub_intf_master
wendani Oct 16, 2019
5e445d1
Address comment: consolidate sub interface transformation
wendani Oct 16, 2019
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
23 changes: 22 additions & 1 deletion src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,10 @@
spine_chassis_frontend_role = 'SpineChassisFrontendRouter'
chassis_backend_role = 'ChassisBackendRouter'

backend_device_types = ['BackEndToRRouter', 'BackEndLeafRouter']
VLAN_SUB_INTERFACE_SEPARATOR = '.'
VLAN_SUB_INTERFACE_VLAN_ID = '10'

# Default Virtual Network Index (VNI)
vni_default = 8000

Expand Down Expand Up @@ -598,6 +602,7 @@ def parse_xml(filename, platform=None, port_config_file=None):
vlan_intfs = {}
pc_intfs = {}
vlan_invert_mapping = { v['alias']:k for k,v in vlans.items() if v.has_key('alias') }
vlan_sub_intfs = {}

for intf in intfs:
if intf[0][0:4] == 'Vlan':
Expand All @@ -609,11 +614,27 @@ def parse_xml(filename, platform=None, port_config_file=None):
elif intf[0][0:11] == 'PortChannel':
pc_intfs[intf] = {}
pc_intfs[intf[0]] = {}
if current_device['type'] in backend_device_types:
intf_info = list(intf)
intf_info[0] = intf_info[0] + VLAN_SUB_INTERFACE_SEPARATOR + VLAN_SUB_INTERFACE_VLAN_ID
sub_intf = tuple(intf_info)
vlan_sub_intfs[sub_intf[0]] = {"admin_status" : "up"}
vlan_sub_intfs[sub_intf] = {}
else:
phyport_intfs[intf] = {}
phyport_intfs[intf[0]] = {}
if current_device['type'] in backend_device_types:
intf_info = list(intf)
intf_info[0] = intf_info[0] + VLAN_SUB_INTERFACE_SEPARATOR + VLAN_SUB_INTERFACE_VLAN_ID
sub_intf = tuple(intf_info)
vlan_sub_intfs[sub_intf[0]] = {"admin_status" : "up"}
vlan_sub_intfs[sub_intf] = {}

if current_device['type'] not in backend_device_types:
results['INTERFACE'] = phyport_intfs
else:
results['VLAN_SUB_INTERFACE'] = vlan_sub_intfs

results['INTERFACE'] = phyport_intfs
results['VLAN_INTERFACE'] = vlan_intfs

for port_name in port_speeds_default:
Expand Down