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

[l2-preset]: Add all dual ToR required fields #7318

Merged
merged 4 commits into from
Apr 15, 2021
Merged

[l2-preset]: Add all dual ToR required fields #7318

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d361e24
[l2-preset]: Update dual ToR tests
theasianpianist Apr 14, 2021
9aafca3
[l2-preset]: Add all required dualtor fields
theasianpianist Apr 14, 2021
f9196cc
[l2-preset]: Remove unused import
theasianpianist Apr 14, 2021
ac7e483
[l2-preset]: Read uplinks/downlinks from CLI
theasianpianist Apr 14, 2021
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
117 changes: 87 additions & 30 deletions src/sonic-config-engine/config_samples.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import sys

from collections import defaultdict
from ipaddress import ip_interface
from natsort import natsorted

Expand Down Expand Up @@ -37,7 +38,7 @@ def generate_t1_sample_config(data):
'keepalive': '60'
}
port_count += 1
return data;
return data

def generate_empty_config(data):
new_data = {'DEVICE_METADATA': data['DEVICE_METADATA']}
Expand All @@ -47,49 +48,105 @@ def generate_empty_config(data):
new_data['DEVICE_METADATA']['localhost']['type'] = 'LeafRouter'
return new_data

def port_is_uplink(port_info):
return len(port_info['lanes'].split(',')) == 4

def port_is_downlink(port_info):
return len(port_info['lanes'].split(',')) == 2

def get_uplinks_downlinks(port_table):
# sort the ports based on the first lane number
sorted_ports = sorted(port_table.items(), key=lambda x: int(x[1]['lanes'].split(',')[0]))
uplinks = []
downlinks = []
ports_iter = iter(sorted_ports)
for port_tuple in ports_iter:
# Iterate over ports two at a time so we can get
# used ports and the corresponding unused ports
port_a_name, port_a_info = port_tuple
port_b_name, port_b_info = next(ports_iter)
if port_is_uplink(port_a_info) and port_is_uplink(port_b_info) :
uplinks.append(port_a_name)
uplinks.append(port_b_name)
elif port_is_downlink(port_a_info) and port_is_downlink(port_b_info):
downlinks.append(port_a_name)
# don't use port_b in this case
# this shouldn't happen
else:
raise ValueError("Error parsing port_config.ini for dual ToR")

return uplinks, downlinks

def generate_global_dualtor_tables():
data = defaultdict(lambda: defaultdict(dict))
data['LOOPBACK_INTERFACE'] = {
'Loopback2': {},
'Loopback2|3.3.3.3': {}
}
data['MUX_CABLE'] = {}
data['PEER_SWITCH'] = {
"peer_switch_hostname": {
"address_ipv4": "1.1.1.1"
}
}
data['TUNNEL'] = {
"MuxTunnel0": {
"dscp_mode": "uniform",
"dst_ip": "2.2.2.2",
"ecn_mode": "copy_from_outer",
"encap_ecn_mode": "standard",
"ttl_mode": "pipe",
"tunnel_type": "IPINIP"
}
}
return data

def generate_l2_config(data):
# Check if dual ToR configs are needed
if 'is_dualtor' in data and data['is_dualtor']:
is_dualtor = True
data.pop('is_dualtor')
else:
is_dualtor = False

# VLAN initial data
data['VLAN'] = {'Vlan1000': {'vlanid': '1000'}}
data['VLAN_MEMBER'] = {}

if is_dualtor:
data['DEVICE_METADATA']['localhost']['subtype'] = 'DualToR'
data['LOOPBACK_INTERFACE'] = {
'Loopback2': {},
'Loopback2|3.3.3.3': {}
}
data['MUX_CABLE'] = {}
data['PEER_SWITCH'] = {
"peer_switch_hostname": {
"address_ipv4": "1.1.1.1"
}
}
data['TUNNEL'] = {
"MuxTunnel0": {
"dscp_mode": "uniform",
"dst_ip": "2.2.2.2",
"ecn_mode": "copy_from_outer",
"encap_ecn_mode": "standard",
"ttl_mode": "pipe",
"tunnel_type": "IPINIP"
}
}
data['DEVICE_METADATA']['localhost']['peer_switch'] = 'peer_switch_hostname'
data.update(generate_global_dualtor_tables())

uplinks, downlinks = get_uplinks_downlinks(data['PORT'])
server_ipv4_base = ip_interface(UNICODE_TYPE('192.168.0.1/32'))
server_ipv6_base = ip_interface(UNICODE_TYPE('fc02:1000::1/128'))
for i, port in enumerate(natsorted(data['PORT'])):
data['PORT'][port].setdefault('admin_status', 'up')
data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
server_offset = 0
for port in natsorted(data['PORT']):
if is_dualtor:
mux_cable_entry = {
'server_ipv4': str(server_ipv4_base + i),
'server_ipv6': str(server_ipv6_base + i),
'state': 'auto'
}
data['MUX_CABLE'][port] = mux_cable_entry
# Ports in use should be admin up, unused ports default to admin down
if port in downlinks or port in uplinks:
data['PORT'][port].setdefault('admin_status', 'up')
data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}

# 100G Uplinks (all 4 lanes assigned to one logical port) need FEC value set
if port in uplinks:
data['PORT'][port]['fec'] = 'rs'

# Downlinks (connected to mux cable) need a MUX_CABLE entry
# as well as the `mux_cable` field in the PORT table
if port in downlinks:
mux_cable_entry = {
'server_ipv4': str(server_ipv4_base + server_offset),
'server_ipv6': str(server_ipv6_base + server_offset),
'state': 'auto'
}
server_offset += 1
data['MUX_CABLE'][port] = mux_cable_entry
data['PORT'][port]['mux_cable'] = 'true'
else:
data['PORT'][port].setdefault('admin_status', 'up')
data['VLAN_MEMBER']['Vlan1000|{}'.format(port)] = {'tagging_mode': 'untagged'}
return data

_sample_generators = {
Expand Down
Loading