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.

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

[Multi-ASIC]:Update the template to add ipinip entry for Loopback4096 #5235

Merged
merged 2 commits into from
Sep 1, 2020

Conversation

arlakshm
Copy link
Contributor

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan [email protected]

- Why I did it
Multi asic platform have 2 Loopback interfaces, Loopback0 and Loopback4096. IPinIP decap entries need to be added for both of them.

- How I did it
Update the ipinip.json.j2 template to add decap entries for Loopback4096.
Add corressponding unit test

- How to verify it
Verify the ipinip.json is generated properly.

- Which release branch to backport (provide reason below if selected)

  • 201811
  • [ x] 201911
  • 202006

- Description for the changelog

- A picture of a cute animal (not mandatory but encouraged)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
@arlakshm arlakshm requested a review from prsunny August 21, 2020 14:01
@@ -2,12 +2,13 @@
{% set ipv6_addresses = [] %}
{% set ipv4_loopback_addresses = [] %}
{% set ipv6_loopback_addresses = [] %}
{% set loopback_intf_names = ['Loopback0', 'Loopback4096'] %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this interface should be in if multi_asic() case right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

add check to to add Loopback4096 is the device is either Frontend or Backend asic.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a minor suggestion.. we can have it as below in case if we plan to add more loopbacks in future

set loopback_intf_names = ['Loopback0']
if FrontEnd or BackEnd
set loopback_intf_names = loopback_intf_names.append('Loopback4096')

{%- set ipv4_addresses = ipv4_addresses.append(prefix) %}
{%- set ipv4_loopback_addresses = ipv4_loopback_addresses.append(prefix) %}
{%- endif %}
{%- if prefix | ipv6 and name == 'Loopback0' %}
{%- if prefix | ipv6 and name in loopback_intf_names %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like an extra space before name

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed in latest commit

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
@arlakshm arlakshm requested a review from prsunny August 26, 2020 13:29
@arlakshm
Copy link
Contributor Author

restest vsimage please

2 similar comments
@arlakshm
Copy link
Contributor Author

restest vsimage please

@arlakshm
Copy link
Contributor Author

restest vsimage please

@arlakshm
Copy link
Contributor Author

restest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

6 similar comments
@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm
Copy link
Contributor Author

retest vsimage please

@arlakshm arlakshm merged commit 17e7871 into sonic-net:master Sep 1, 2020
@arlakshm arlakshm deleted the masic_ipinip branch September 1, 2020 00:36
abdosi pushed a commit that referenced this pull request Sep 3, 2020
…#5235)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
The following changes are done. 
- Multi asic platform have 2 Loopback interfaces, Loopback0 and Loopback4096. IPinIP decap entries need to be added for both of them. Update the ipinip.json.j2 template to add decap entries for Loopback4096.
- Add corressponding unit test
santhosh-kt pushed a commit to santhosh-kt/sonic-buildimage that referenced this pull request Feb 25, 2021
…sonic-net#5235)

Signed-off-by: Arvindsrinivasan Lakshmi Narasimhan <[email protected]>
The following changes are done. 
- Multi asic platform have 2 Loopback interfaces, Loopback0 and Loopback4096. IPinIP decap entries need to be added for both of them. Update the ipinip.json.j2 template to add decap entries for Loopback4096.
- Add corressponding unit test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants