-
Notifications
You must be signed in to change notification settings - Fork 1.5k
[ipinip config] Add v6 ip and peering ip besides currect v4 loopback #2145
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.
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
Merged
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,16 +1,68 @@ | ||
{# only IPv4 decapsulation is supported #} | ||
{% set ipv4_addresses = [] %} | ||
{% set ipv6_addresses = [] %} | ||
{% set ipv4_loopback_addresses = [] %} | ||
{% set ipv6_loopback_addresses = [] %} | ||
{% for (name, prefix) in LOOPBACK_INTERFACE %} | ||
{%- if prefix | ipv4 and name == 'Loopback0' %} | ||
{%- set ipv4_addresses = ipv4_addresses.append(prefix) %} | ||
{%- set ipv4_loopback_addresses = ipv4_loopback_addresses.append(prefix) %} | ||
{%- endif %} | ||
{%- if prefix | ipv6 and name == 'Loopback0' %} | ||
{%- set ipv6_addresses = ipv6_addresses.append(prefix) %} | ||
{%- set ipv6_loopback_addresses = ipv6_loopback_addresses.append(prefix) %} | ||
{%- endif %} | ||
{% endfor %} | ||
{% for (name, prefix) in INTERFACE %} | ||
{%- if prefix | ipv4 %} | ||
{%- set ipv4_addresses = ipv4_addresses.append(prefix) %} | ||
{%- endif %} | ||
{%- if prefix | ipv6 %} | ||
{%- set ipv6_addresses = ipv6_addresses.append(prefix) %} | ||
{%- endif %} | ||
{% endfor %} | ||
{% for (name, prefix) in PORTCHANNEL_INTERFACE %} | ||
{%- if prefix | ipv4 %} | ||
{%- set ipv4_addresses = ipv4_addresses.append(prefix) %} | ||
{%- endif %} | ||
{%- if prefix | ipv6 %} | ||
{%- set ipv6_addresses = ipv6_addresses.append(prefix) %} | ||
{%- endif %} | ||
{% endfor %} | ||
{% for (name, prefix) in VLAN_INTERFACE %} | ||
{%- if prefix | ipv4 %} | ||
{%- set ipv4_addresses = ipv4_addresses.append(prefix) %} | ||
{%- endif %} | ||
{%- if prefix | ipv6 %} | ||
{%- set ipv6_addresses = ipv6_addresses.append(prefix) %} | ||
{%- endif %} | ||
{% endfor %} | ||
[ | ||
{% if ipv6_loopback_addresses %} | ||
{ | ||
"TUNNEL_DECAP_TABLE:IPINIP_TUNNEL" : { | ||
"tunnel_type":"IPINIP", | ||
"src_ip":"{{ ipv4_loopback_addresses | first | ip }}", | ||
"dst_ip":"{% for prefix in ipv4_loopback_addresses %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}", | ||
"dst_ip":"{% for prefix in ipv4_addresses %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}", | ||
{% if "mlnx" in DEVICE_METADATA.localhost.platform %} | ||
"dscp_mode":"uniform", | ||
"ecn_mode":"standard", | ||
{% else %} | ||
"dscp_mode":"pipe", | ||
"ecn_mode":"copy_from_outer", | ||
{% endif %} | ||
"ttl_mode":"pipe" | ||
}, | ||
"OP": "SET" | ||
} | ||
{% endif %} | ||
{% if ipv4_loopback_addresses and ipv6_loopback_addresses %} , | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need this check? #Resolved There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Because the comma is only needed when both v4 and v6 tunnel needs to be constructed. #Closed |
||
{% endif %} | ||
{% if ipv6_loopback_addresses %} | ||
{ | ||
"TUNNEL_DECAP_TABLE:IPINIP_V6_TUNNEL" : { | ||
"tunnel_type":"IPINIP", | ||
"src_ip":"{{ ipv6_loopback_addresses | first | ip }}", | ||
"dst_ip":"{% for prefix in ipv6_addresses %}{{ prefix | ip }}{% if not loop.last %},{% endif %}{% endfor %}", | ||
{% if "mlnx" in DEVICE_METADATA.localhost.platform %} | ||
"dscp_mode":"uniform", | ||
"ecn_mode":"standard", | ||
|
@@ -22,4 +74,5 @@ | |
}, | ||
"OP": "SET" | ||
} | ||
{% endif %} | ||
] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if ipv4_loopback_addresses? #Resolved
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed. #Closed