[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to `ipinip.json` #18752

lolyu · 2024-04-23T03:49:57Z

Why I did it

Enable ipinip.json.j2 to use the new DB schema to create decap tunnel and decap terms.

This depends on: sonic-net/sonic-swss#3117

Signed-off-by: Longxiang Lyu lolv@microsoft.com

Work item tracking

Microsoft ADO (number only): 27768450

How I did it

Use TUNNEL_DECAP_TERM_TABLE to create decap rules.

How to verify it

UT and verify on testbed together with sonic-net/sonic-swss#3117.

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

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

lguohan · 2024-05-13T05:49:06Z

please specify dependency so that we know when to merge.

bingwang-ms · 2024-05-16T18:13:43Z

dockers/docker-orchagent/ipinip.json.j2

@@ -56,15 +55,24 @@
            "ttl_mode":"pipe"
        },
        "OP": "SET"
-    }
+    }{% if ipv4_addresses %},


I don't see {% endif %} for this if condition.

I feel like if we don't have ipv4_addresses, and only have ipv6_loopback_addresses, the , is also required.

I don't see {% endif %} for this if condition.

Please check LINE#59, this check condition adds the , only if there are IPv4 decap terms.

I feel like if we don't have ipv4_addresses, and only have ipv6_loopback_addresses, the , is also required.

If we don't have ipv4_addresses, LINE#45 ~ LINE#69 will be skipped, and we will only have IPv6 tunnel && decap terms, there is no need to add the , as the IPv5 tunnel now comes to the begining.

Is the else at Line#59 to close the if at Line#45?

bingwang-ms · 2024-05-16T18:16:37Z

dockers/docker-orchagent/ipinip.json.j2

+{% endif %}
+{% endfor %}
+{% endif %}
+{% if ipv4_loopback_addresses and ipv6_loopback_addresses %},


Why ipv4_loopback_addresses needs to be checked here?

Let me list out all possible conditions:
if ipv4_loopback_addresses is empty, ipv6_loopback_addresses is empty: no tunnel && decap terms will be created, no need to add ,.
if ipv4_loopback_addresses is not empty, ipv6_loopback_addresses is empty: only IPv4 tunnel && decap terms will be created, no need to add ,.
if ipv4_loopback_addresses is empty, ipv6_loopback_addresses is not empty: only IPv6 tunnel && decap terms will be created, no need to add ,.
if ipv4_loopback_addresses is not empty, ipv6_loopback_addresses is not empty: both IPv4&&IPv6 tunnel && decap terms will be created, , will be added to inter-connect those two parts.

bingwang-ms · 2024-05-16T18:26:01Z

Are you going to include the script for warm-reboot scenario in this PR?

lolyu · 2024-05-17T01:21:28Z

please specify dependency so that we know when to merge.

Added dependency in PR description.

lolyu · 2024-05-17T01:22:43Z

Are you going to include the script for warm-reboot scenario in this PR?

No, let's do this incrementally PR by PR:

adapt to new schema - this PR
add the subnet decap tunnel to the ipinip.json.j2 template
add the warm-reboot support.

lolyu · 2024-05-28T14:29:17Z

Hi @bingwang-ms, added the subnet decap tunnel part to this PR, please help review.

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu · 2024-05-31T15:38:32Z

The PR test failure of test_add_rack is expected.
test_add_rack tries to diff the APPL_DB before and after removing a T0 neighbor configs. As the decap term is created with a separate table TUNNEL_DECAP_TERM_TABLE and the removal of a T0 neighbor and its port-channel interface/IP will delete the decap term of it.

lguohan · 2024-05-31T15:52:47Z

/azpw ms_conflic

lguohan · 2024-05-31T15:53:30Z

@lolyu , then we cannot merge. can you have a plan to make sure there is no test failure?

bingwang-ms · 2024-06-01T05:07:56Z

/azpw ms_conflic

bingwang-ms · 2024-06-01T05:13:30Z

@lolyu , then we cannot merge. can you have a plan to make sure there is no test failure?

@lguohan The test failure has been fixed, but the PR is blocked by ms_conflict checker.

bingwang-ms · 2024-06-01T05:13:41Z

/azpw ms_conflic

…_template

bingwang-ms · 2024-06-01T14:53:29Z

/azp rerun

azure-pipelines · 2024-06-01T14:53:35Z

Command 'rerun' is not supported by Azure Pipelines. Supported commands help: Get descriptions, examples and documentation about supported commands Example: help "command_name" list: List all pipelines for this repository using a comment. Example: "list" run: Run all pipelines or specific pipelines for this repository using a comment. Use this command by itself to trigger all related pipelines, or specify specific pipelines to run. Example: "run" or "run pipeline_name, pipeline_name, pipeline_name" where: Report back the Azure DevOps orgs that are related to this repository and org Example: "where" See additional documentation.

bingwang-ms · 2024-06-01T14:55:35Z

/azp run

azure-pipelines · 2024-06-01T14:55:49Z

Azure Pipelines successfully started running 1 pipeline(s).

bingwang-ms · 2024-06-02T21:20:33Z

/azp run

azure-pipelines · 2024-06-02T21:20:48Z

Azure Pipelines successfully started running 1 pipeline(s).

…_template

bingwang-ms · 2024-06-04T00:04:25Z

/azpw ms_conflict

lolyu · 2024-06-04T01:09:54Z

/azpw ms_conflict

lolyu · 2024-06-04T01:11:14Z

/azp run

azure-pipelines · 2024-06-04T01:11:21Z

Commenter does not have sufficient privileges for PR 18752 in repo sonic-net/sonic-buildimage

lolyu · 2024-06-04T03:31:45Z

/azpw ms_conflict

lolyu · 2024-06-04T04:36:18Z

/azpw ms_conflict

lolyu · 2024-06-04T07:21:58Z

/azpw ms_conflict

lolyu · 2024-06-04T10:22:29Z

/azpw ms_conflict

lolyu · 2024-06-04T11:58:20Z

/azpw ms_conflict

lolyu · 2024-06-04T11:59:01Z

/azpw ms_conflict

…ip_template

…cap tunnel to `ipinip.json` (sonic-net#18752) * [decap] Enhance `ipinip.json.j2` template to use new db schema Signed-off-by: Longxiang Lyu <lolv@microsoft.com> Co-authored-by: bingwang <bingwang@microsoft.com>

lolyu requested a review from lguohan as a code owner April 23, 2024 03:49

lolyu requested a review from bingwang-ms April 23, 2024 03:50

lolyu force-pushed the subnet_decap_ipinip_template branch from 2e22e18 to bc0b2c5 Compare April 23, 2024 09:02

bingwang-ms reviewed May 16, 2024

View reviewed changes

bingwang-ms approved these changes May 17, 2024

View reviewed changes

lolyu mentioned this pull request May 20, 2024

[SubnetDecap] Add subnet decap HLD sonic-net/SONiC#1657

Merged

bingwang-ms mentioned this pull request May 24, 2024

[test plan] Add test plan for subnet decap sonic-net/sonic-mgmt#12990

Open

8 tasks

lolyu changed the title ~~[decap] Enable ipinip.json.j2 template to use new db schema~~ [subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to ipinip.json May 28, 2024

bingwang-ms approved these changes May 28, 2024

View reviewed changes

lolyu added 2 commits May 31, 2024 01:03

[decap] Enhance ipinip.json.j2 template to use new db schema

d3cb0f2

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

Add subnet decap tunnels

bc80a53

Signed-off-by: Longxiang Lyu <lolv@microsoft.com>

lolyu force-pushed the subnet_decap_ipinip_template branch from 072983e to bc80a53 Compare May 31, 2024 01:03

lolyu mentioned this pull request May 31, 2024

ERR swss#orchagent: :- doDecapTunnelTask: unknown decap tunnel table attribute 'dst_ip'. #19145

Closed

bingwang-ms mentioned this pull request May 31, 2024

Skip keys in table TUNNEL_DECAP_TERM_TABLE for db_cmp sonic-net/sonic-mgmt#13084

Merged

8 tasks

Merge remote-tracking branch 'origin/master' into subnet_decap_ipinip…

a423693

…_template

Merge remote-tracking branch 'origin/master' into subnet_decap_ipinip…

df3be49

…_template

Merge remote-tracking branch 'upstream/master' into subnet_decap_ipin…

431ca3e

…ip_template

bingwang-ms approved these changes Jun 4, 2024

View reviewed changes

yxieca merged commit ca5e3b2 into sonic-net:master Jun 4, 2024
20 checks passed

abdosi mentioned this pull request Jun 11, 2024

test_dcap fails on master branch: doDecapTunnelTask: unknown decap tunnel table attribute 'dst_ip' #19204

Closed

lolyu added Request for 202405 Branch and removed Request for 202405 Branch labels Sep 18, 2024

mssonicbld added the Cherry Pick Conflict_202405 label Sep 18, 2024

lolyu removed the Cherry Pick Conflict_202405 label Sep 18, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to `ipinip.json` #18752

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to `ipinip.json` #18752

lolyu commented Apr 23, 2024 •

edited

Loading

lguohan commented May 13, 2024

bingwang-ms May 16, 2024

bingwang-ms May 16, 2024

lolyu May 17, 2024 •

edited

Loading

lolyu May 17, 2024 •

edited

Loading

bingwang-ms May 17, 2024

bingwang-ms May 16, 2024

lolyu May 17, 2024 •

edited

Loading

bingwang-ms commented May 16, 2024

lolyu commented May 17, 2024

lolyu commented May 17, 2024

lolyu commented May 28, 2024

lolyu commented May 31, 2024

lguohan commented May 31, 2024

lguohan commented May 31, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

azure-pipelines bot commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

azure-pipelines bot commented Jun 1, 2024

bingwang-ms commented Jun 2, 2024

azure-pipelines bot commented Jun 2, 2024

bingwang-ms commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

azure-pipelines bot commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to ipinip.json #18752

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to ipinip.json #18752

Conversation

lolyu commented Apr 23, 2024 • edited Loading

Why I did it

Work item tracking

How I did it

How to verify it

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

Tested branch (Please provide the tested image version)

Description for the changelog

Link to config_db schema for YANG module changes

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

lguohan commented May 13, 2024

bingwang-ms May 16, 2024

Choose a reason for hiding this comment

bingwang-ms May 16, 2024

Choose a reason for hiding this comment

lolyu May 17, 2024 • edited Loading

Choose a reason for hiding this comment

lolyu May 17, 2024 • edited Loading

Choose a reason for hiding this comment

bingwang-ms May 17, 2024

Choose a reason for hiding this comment

bingwang-ms May 16, 2024

Choose a reason for hiding this comment

lolyu May 17, 2024 • edited Loading

Choose a reason for hiding this comment

bingwang-ms commented May 16, 2024

lolyu commented May 17, 2024

lolyu commented May 17, 2024

lolyu commented May 28, 2024

lolyu commented May 31, 2024

lguohan commented May 31, 2024

lguohan commented May 31, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

azure-pipelines bot commented Jun 1, 2024

bingwang-ms commented Jun 1, 2024

azure-pipelines bot commented Jun 1, 2024

bingwang-ms commented Jun 2, 2024

azure-pipelines bot commented Jun 2, 2024

bingwang-ms commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

azure-pipelines bot commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

lolyu commented Jun 4, 2024

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to `ipinip.json` #18752

[subnet_decap] Use new tunnel&&decap term db schema and add subnet decap tunnel to `ipinip.json` #18752

lolyu commented Apr 23, 2024 •

edited

Loading

lolyu May 17, 2024 •

edited

Loading

lolyu May 17, 2024 •

edited

Loading

lolyu May 17, 2024 •

edited

Loading