matthew/sonic-buildimage
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[swss]: Update the ipinip.j2 template to specify the IPv4 loopback address (#998)

Browse Source 
Use ipv4_loopback_addresses variable to store all IPv4 loopback addresses.
The source IP for encapsulation is chosen from one of the addresses.
The destination IPs for decapsulation is the list of the addresses.

Signed-off-by: Shu0T1an ChenG <shuche@microsoft.com>
This commit is contained in:
Shuotian Cheng 2017-09-30 11:03:32 -07:00 committed by lguohan
parent 002aabe8ba
commit 486dfef732
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
dockers/docker-orchagent/ipinip.json.j2
View File

@ -1,9 +1,16 @@
{# only IPv4 decapsulation is supported #}
{% set ipv4_loopback_addresses = [] %}
{% for (name, prefix) in LOOPBACK_INTERFACE %}
{%- if prefix | ipv4 %}
{%- set ipv4_loopback_addresses = ipv4_loopback_addresses.append(prefix) %}
{%- endif %}
{% endfor %}
[
{
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : {
"tunnel_type":"IPINIP",
"src_ip":"{{ LOOPBACK_INTERFACE.keys()[0][1] | ip }}",
"dst_ip":"{{ LOOPBACK_INTERFACE.keys()[0][1] | ip }}",
"src_ip":"{{ ipv4_loopback_addresses | first | ip }}",
"dst_ip":"{% for prefix in ipv4_loopback_addresses %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}",
{% if onie_switch_asic == "mlnx" %}
"dscp_mode":"uniform",
"ecn_mode":"standard",
@ -16,4 +23,3 @@
"OP": "SET"
}
]

1
src/sonic-config-engine/tests/sample_output/ipinip.json
View File

@ -11,4 +11,3 @@
"OP": "SET"
}
]