Skip to content

[202012] Automatically generate extra attributes for tunnel qos remapping #11045

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

Merged
bingwang-ms merged 5 commits into from
Jun 7, 2022
Merged

[202012] Automatically generate extra attributes for tunnel qos remapping #11045

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a1e49d8
Automatically generate extra attributes for tunnel qos remapping
bingwang-ms Jun 6, 2022
4a1adce
Fix buffer
bingwang-ms Jun 6, 2022
7978157
Merge remote-tracking branch 'origin/202012' into auto_generate_mux_q…
bingwang-ms Jun 6, 2022
eb73a4e
Fix buffer
bingwang-ms Jun 6, 2022
71d161a
Update buffer-arista7260-t1.json
bingwang-ms Jun 6, 2022
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
14 changes: 14 additions & 0 deletions src/sonic-config-engine/minigraph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1652,13 +1652,27 @@ def get_tunnel_entries(tunnel_intfs, tunnel_intfs_qos_remap_config, lo_intfs, tu
break

tunnels = {}

default_qos_map_for_mux_tunnel = {
"decap_dscp_to_tc_map": "[DSCP_TO_TC_MAP|AZURE_TUNNEL]",
"decap_tc_to_pg_map": "[TC_TO_PRIORITY_GROUP_MAP|AZURE_TUNNEL]",
"encap_tc_to_dscp_map": "[TC_TO_DSCP_MAP|AZURE_TUNNEL]",
"encap_tc_to_queue_map": "[TC_TO_QUEUE_MAP|AZURE_TUNNEL]"
}

for type, tunnel_dict in tunnel_intfs.items():
for tunnel_key, tunnel_attr in tunnel_dict.items():
tunnel_attr['dst_ip'] = lo_addr
if (tunnel_qos_remap.get('status') == 'enabled') and (mux_tunnel_name == tunnel_key) and (peer_switch_ip is not None):
tunnel_attr['src_ip'] = peer_switch_ip
# The DSCP mode must be pipe if remap is enabled
tunnel_attr['dscp_mode'] = "pipe"
if tunnel_key in tunnel_intfs_qos_remap_config[type]:
tunnel_attr.update(tunnel_intfs_qos_remap_config[type][tunnel_key].items())
# Use default value if qos remap attribute is missing
for k, v in default_qos_map_for_mux_tunnel.items():
if k not in tunnel_attr:
tunnel_attr[k] = v

tunnels[tunnel_key] = tunnel_attr
return tunnels
Expand Down
Loading