[orchagent] Add support for Path Tracing Midpoint #2903

cscarpitta · 2023-09-15T14:57:10Z

What I did
Extended PortsOrch to process the attributes required for Path Tracing.

Why I did it
This PR is required for the SRv6 Path Tracing Midpoint feature.
HLD: sonic-net/SONiC#1456

How I verified it
Added new unit tests to portmgr_ut.cpp, portsorch_ut.cpp and tests/test_port.py.

ahsalam · 2023-10-14T09:04:17Z

@prsunny @kperumalbfn could you please help and review the code of this PR?
This feature is tracked for 202311 release and documented by this HLD sonic-net/SONiC#1456
@zhangyanzhao

kperumalbfn · 2023-10-25T21:55:24Z

orchagent/portsorch.cpp

+    {
+        SWSS_LOG_INFO("Path Tracing is not supported");
+        fvVector.emplace_back(SWITCH_CAPABILITY_TABLE_PATH_TRACING_CAPABLE, "false");
+    }


are we using this capability check before pushing the path tracing feature to SAI? Could you check that?

@kperumalbfn The result of the Path Tracing capability check is saved to STATE DB. Then, the CLI checks if Path Tracing is supported or not before attempting to enable Path Tracing.

In addition, as requested, I added some checks to also verify if Path Tracing is supported or not before configuring it into the ASIC: 448d8a3

kperumalbfn · 2023-10-25T21:56:59Z

orchagent/portsorch.cpp

+         * Decrease TAM object ref count before removing the port, if the port
+         * has a TAM object assigned
+         */
+        if (m_portPtTam.find(p.m_alias) != m_portPtTam.end())


Can you also check if TAM module is supported in the switch using the capability check?

@kperumalbfn I added the TAM capability check, as requested: 5b57173

kperumalbfn · 2023-10-25T22:00:45Z

orchagent/portsorch.cpp

+                                    }
+                                }
+
+                                if (!setPortPtTam(p, m_ptTam))


We could move TAM create, setting TAM to port and refcount update to a different function.

@kperumalbfn I moved all the logic related to the TAM to separate functions: fc6b5ba

kperumalbfn · 2023-10-25T22:05:35Z

orchagent/port/portschema.h

@@ -80,3 +85,5 @@
 #define PORT_ROLE                "role"
 #define PORT_ADMIN_STATUS        "admin_status"
 #define PORT_DESCRIPTION         "description"
+#define PORT_PT_INTF_ID            "pt_interface_id"


can you update these new fields in doc/swss-schema.md

@kperumalbfn I added the two fields to the documentation: c9ff12e

cscarpitta · 2023-10-26T13:05:33Z

Hi @kperumalbfn, many thanks for the review. I addressed all comments.

kperumalbfn · 2023-10-30T22:20:46Z

orchagent/port/porthlpr.cpp

+        }
+        port.pt_intf_id.is_set = true;
+    }
+    catch (const std::exception &e)


should we reject this for port-channel?
Also check for the path-tracing interface id within the valid range. I believe it is between 1-4K as per HLD. Please add this case in swss tests.

@kperumalbfn I did the requested changes:

added a check to reject Path Tracing configuration on port channel

added a check to ensure Path Tracing interface ID is in the valid range [1, 4095]

added test cases to verify that OrchAgent behaves as expected when it receives an invalid Path Tracing configuration

cscarpitta · 2023-10-31T11:06:04Z

@kperumalbfn Many thanks for the review. All comments have been addressed.

kperumalbfn

LGTM

kperumalbfn · 2023-10-31T23:28:07Z

tests/mock_tests/mock_orchagent_main.h

@@ -86,3 +86,4 @@ extern sai_mpls_api_t* sai_mpls_api;
 extern sai_counter_api_t* sai_counter_api;
 extern sai_samplepacket_api_t *sai_samplepacket_api;
 extern sai_fdb_api_t* sai_fdb_api;
+extern sai_fdb_api_t* sai_tam_api;


typo sai_tam_api_t??

@kperumalbfn Fixed, thanks!

kperumalbfn · 2023-10-31T23:50:43Z

orchagent/saihelper.cpp

@@ -217,6 +218,7 @@ void initSaiApi()
    sai_api_query((sai_api_t)SAI_API_DASH_ENI,                  (void**)&sai_dash_eni_api);
    sai_api_query((sai_api_t)SAI_API_DASH_VIP,                  (void**)&sai_dash_vip_api);
    sai_api_query((sai_api_t)SAI_API_DASH_DIRECTION_LOOKUP,     (void**)&sai_dash_direction_lookup_api);
+    sai_api_query(SAI_API_TAM,                  (void **)&sai_tam_api);



pls check the alignments.

@kperumalbfn Fixed, thanks!

@cscarpitta could you fix the alignment for sai_api_query

@kperumalbfn Fixed, many thanks for the review.

prsunny · 2023-11-02T19:06:07Z

@kperumalbfn , please signoff

kperumalbfn

LGTM

ahsalam · 2023-11-13T16:09:50Z

@prsunny the PR has been approved by @kperumalbfn. It is ready for merge. can you merge the PR?

cscarpitta · 2023-11-16T20:44:46Z

@prsunny The PR has been reviewed and approved. It is ready for merge. Could you please merge the PR?

cscarpitta · 2023-11-28T15:22:46Z

@dgsudharsan Did you have a chance to review this PR? Can you please have a look?

@prsunny

prsunny · 2024-03-18T17:29:51Z

Can you please fix coverage and rebase the code?

liat-grozovik · 2024-05-15T16:47:08Z

@cscarpitta in order to merge the PR we need all checkers to pass and the coverage to be extended.
if you wish the feature to be included in 202405 you need to be fast on that :-)

zhangyanzhao · 2024-05-22T16:44:54Z

@prsunny can you please help to check and merge this PR? Thanks.

cscarpitta · 2024-05-22T17:29:08Z

@cscarpitta in order to merge the PR we need all checkers to pass and the coverage to be extended. if you wish the feature to be included in 202405 you need to be fast on that :-)

@liat-grozovik Many thanks for the review.

I added some test cases to extend the coverage as requested. The CI checks are failing for reasons unrelated to this PR.

Could you please take a look again?

prsunny · 2024-05-22T20:42:07Z

@prsunny can you please help to check and merge this PR? Thanks.

ack. will merge after rerunning the tests

prsunny · 2024-05-23T17:23:44Z

@cscarpitta , can you please resolve conflict and rebase?

Extend PortsOrch to support PT Midpoint. Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

During PortsOrch initialization, SwitchOrch->set_switch_capability() is called to set Path Tracing capability in STATE DB. Currently, SwitchOrch is not initialized in FdbOrch UT, which causes a Segmentation Fault. Let's initialize SwitchOrch during the test case setup. Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

During PortsOrch initialization, SwitchOrch->set_switch_capability() is called to set Path Tracing capability in STATE DB. Currently, PortshOrch is initialized before initializing SwitchOrch in MuxOrch UT, which causes a Segmentation Fault. Let's move SwitchOrch initialization before PortsOrch initialization. Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

During its initialization, PortsOrch queries switch capabilities to verify if Path Tracing is supported or not. Currently, PortsOrch UTs fail because the TAM object type required by Path Tracing tests is not in the list of object types supported by the switch. This commit mocks get_switch_attribute() SAI API in PortsOrch UT to return TAM object type as part of the object types supported by the switch. Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

prsunny · 2024-05-23T23:17:04Z

PR tests are passing now, can you please fix coverage?

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

cscarpitta · 2024-05-24T13:37:29Z

PR tests are passing now, can you please fix coverage?

@prsunny Done. I extended the coverage, tests are passing and coverage requirements are met now.

Can you please take a look again?

cscarpitta requested a review from prsunny as a code owner September 15, 2023 14:57

cscarpitta mentioned this pull request Sep 15, 2023

Path Tracing Midpoint HLD sonic-net/SONiC#1456

Merged

prsunny requested a review from kperumalbfn September 18, 2023 21:41

cscarpitta changed the title ~~[orchagent] Add support for SRv6 Path Tracing Midpoint~~ [orchagent] Add support for Path Tracing Midpoint Oct 12, 2023

kperumalbfn reviewed Oct 25, 2023

View reviewed changes

cscarpitta force-pushed the srv6_pt_midpoint branch 2 times, most recently from 06b7459 to b232132 Compare October 26, 2023 12:51

kperumalbfn reviewed Oct 30, 2023

View reviewed changes

kperumalbfn reviewed Nov 1, 2023

View reviewed changes

kperumalbfn approved these changes Nov 2, 2023

View reviewed changes

prsunny requested a review from dgsudharsan November 17, 2023 22:29

dgsudharsan removed their request for review November 28, 2023 15:55

cscarpitta requested review from abdosi and judyjoseph as code owners April 5, 2024 08:54

cscarpitta force-pushed the srv6_pt_midpoint branch 2 times, most recently from e057773 to f628fb7 Compare April 5, 2024 09:35

cscarpitta force-pushed the srv6_pt_midpoint branch 5 times, most recently from 92c7c33 to 0a61f3e Compare May 18, 2024 19:46

cscarpitta force-pushed the srv6_pt_midpoint branch 6 times, most recently from 61dc3db to 6cc0bae Compare May 20, 2024 20:37

cscarpitta force-pushed the srv6_pt_midpoint branch from f5c6fd2 to 3e5bb9e Compare May 22, 2024 17:18

cscarpitta added 8 commits May 23, 2024 12:48

[orchagent]: Add support for SRv6 Path Tracing Midpoint

4abd69c

Extend PortsOrch to support PT Midpoint. Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

[doc] Add Path Tracing attributes to SWSS doc

ba33dce

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

[tests]: Add SRv6 PT Midpoint test to portmgr UT

50031d8

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

[tests]: Add SRv6 PT Midpoint test to portsorch UT

b02696a

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

[tests]: Add SRv6 PT Midpoint test to test_port.py

985f376

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

cscarpitta force-pushed the srv6_pt_midpoint branch from 3e5bb9e to 985f376 Compare May 23, 2024 17:56

cscarpitta and others added 2 commits May 23, 2024 22:30

Merge branch 'master' into srv6_pt_midpoint

5d9bb69

Merge branch 'master' into srv6_pt_midpoint

14e1bd7

cscarpitta added 2 commits May 24, 2024 11:46

Merge branch 'master' into srv6_pt_midpoint

267fcd3

Fix test coverage

3b8ad3e

Signed-off-by: Carmine Scarpitta <cscarpit@cisco.com>

prsunny approved these changes May 24, 2024

View reviewed changes

prsunny merged commit 3ee7361 into sonic-net:master May 24, 2024
17 checks passed

cscarpitta mentioned this pull request May 24, 2024

[config, show] Add CLI commands for Path Tracing Midpoint sonic-net/sonic-utilities#2983

Open

ahsalam mentioned this pull request Aug 8, 2024

[sonic-yang-models] Add Path Tracing attributes to SONiC Port YANG model sonic-net/sonic-buildimage#16758

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[orchagent] Add support for Path Tracing Midpoint #2903

[orchagent] Add support for Path Tracing Midpoint #2903

cscarpitta commented Sep 15, 2023 •

edited

Loading

ahsalam commented Oct 14, 2023

kperumalbfn Oct 25, 2023

cscarpitta Oct 26, 2023

kperumalbfn Oct 25, 2023

cscarpitta Oct 26, 2023

kperumalbfn Oct 25, 2023

cscarpitta Oct 26, 2023

kperumalbfn Oct 25, 2023

cscarpitta Oct 26, 2023

cscarpitta commented Oct 26, 2023

kperumalbfn Oct 30, 2023

cscarpitta Oct 31, 2023 •

edited

Loading

cscarpitta commented Oct 31, 2023

kperumalbfn left a comment

kperumalbfn Oct 31, 2023

cscarpitta Nov 1, 2023

kperumalbfn Oct 31, 2023

cscarpitta Nov 1, 2023

kperumalbfn Nov 2, 2023 •

edited

Loading

cscarpitta Nov 3, 2023

prsunny commented Nov 2, 2023

kperumalbfn left a comment

ahsalam commented Nov 13, 2023

cscarpitta commented Nov 16, 2023

cscarpitta commented Nov 28, 2023

prsunny commented Mar 18, 2024

liat-grozovik commented May 15, 2024

zhangyanzhao commented May 22, 2024

cscarpitta commented May 22, 2024

prsunny commented May 22, 2024

prsunny commented May 23, 2024

prsunny commented May 23, 2024

cscarpitta commented May 24, 2024

[orchagent] Add support for Path Tracing Midpoint #2903

[orchagent] Add support for Path Tracing Midpoint #2903

Conversation

cscarpitta commented Sep 15, 2023 • edited Loading

ahsalam commented Oct 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

cscarpitta commented Oct 26, 2023

Choose a reason for hiding this comment

cscarpitta Oct 31, 2023 • edited Loading

Choose a reason for hiding this comment

cscarpitta commented Oct 31, 2023

kperumalbfn left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

kperumalbfn Nov 2, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

prsunny commented Nov 2, 2023

kperumalbfn left a comment

Choose a reason for hiding this comment

ahsalam commented Nov 13, 2023

cscarpitta commented Nov 16, 2023

cscarpitta commented Nov 28, 2023

prsunny commented Mar 18, 2024

liat-grozovik commented May 15, 2024

zhangyanzhao commented May 22, 2024

cscarpitta commented May 22, 2024

prsunny commented May 22, 2024

prsunny commented May 23, 2024

prsunny commented May 23, 2024

cscarpitta commented May 24, 2024

cscarpitta commented Sep 15, 2023 •

edited

Loading

cscarpitta Oct 31, 2023 •

edited

Loading

kperumalbfn Nov 2, 2023 •

edited

Loading