[debug dump util] Route Module added by vivekrnv · Pull Request #1913 · sonic-net/sonic-utilities

vivekrnv · 2021-11-06T08:32:27Z

Signed-off-by: Vivek Reddy Karri [email protected]

What I did

HLD for Dump Utility: HLD.

Added the Route Module to the Debug Dump Utility
Added the Corresponding UT's

How I did it

How to verify it

tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_all_args PASSED                                                                                                                                                    [ 11%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_caching_redis_keys PASSED                                                                                                                                          [ 22%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_directly_connected_route PASSED                                                                                                                                    [ 33%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_ip2me_route PASSED                                                                                                                                                 [ 44%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_no_next_hop_id PASSED                                                                                                                                              [ 55%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_no_route_entry PASSED                                                                                                                                              [ 66%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_route_with_next_hop PASSED                                                                                                                                         [ 77%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_route_with_next_hop_group PASSED                                                                                                                                   [ 88%]
tests/dump_tests/module_tests/route_test.py::TestRouteModule::test_static_route PASSED

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

admin@r-tigon-11:~$ dump state route 200.0.1.0/26
{
    "200.0.1.0/26": {
        "APPL_DB": {
            "keys": [
                {
                    "ROUTE_TABLE:200.0.1.0/26": {
                        "ifname": "PortChannel0004,PortChannel0007",
                        "nexthop": "10.0.0.37,10.0.0.41"
                    }
                }
            ],
            "tables_not_found": []
        },
        "ASIC_DB": {
            "keys": [
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_ROUTE_ENTRY:{\"dest\":\"200.0.1.0/26\",\"switch_id\":\"oid:0x21000000000000\",\"vr\":\"oid:0x3000000000002\"}": {
                        "SAI_ROUTE_ENTRY_ATTR_NEXT_HOP_ID": "oid:0x5000000000c92"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_VIRTUAL_ROUTER:oid:0x3000000000002": {
                        "NULL": "NULL"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000c92": {
                        "SAI_NEXT_HOP_GROUP_ATTR_TYPE": "SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000c72": {
                        "SAI_NEXT_HOP_GROUP_ATTR_TYPE": "SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000c4f": {
                        "SAI_NEXT_HOP_GROUP_ATTR_TYPE": "SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP:oid:0x5000000000c57": {
                        "SAI_NEXT_HOP_GROUP_ATTR_TYPE": "SAI_NEXT_HOP_GROUP_TYPE_DYNAMIC_UNORDERED_ECMP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000c94": {
                        "SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID": "oid:0x5000000000c92",
                        "SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID": "oid:0x4000000000c49"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP_GROUP_MEMBER:oid:0x2d000000000c93": {
                        "SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_GROUP_ID": "oid:0x5000000000c92",
                        "SAI_NEXT_HOP_GROUP_MEMBER_ATTR_NEXT_HOP_ID": "oid:0x4000000000c1c"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP:oid:0x4000000000c49": {
                        "SAI_NEXT_HOP_ATTR_IP": "10.0.0.41",
                        "SAI_NEXT_HOP_ATTR_ROUTER_INTERFACE_ID": "oid:0x6000000000b47",
                        "SAI_NEXT_HOP_ATTR_TYPE": "SAI_NEXT_HOP_TYPE_IP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_NEXT_HOP:oid:0x4000000000c1c": {
                        "SAI_NEXT_HOP_ATTR_IP": "10.0.0.37",
                        "SAI_NEXT_HOP_ATTR_ROUTER_INTERFACE_ID": "oid:0x6000000000b44",
                        "SAI_NEXT_HOP_ATTR_TYPE": "SAI_NEXT_HOP_TYPE_IP"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b47": {
                        "SAI_ROUTER_INTERFACE_ATTR_MTU": "9100",
                        "SAI_ROUTER_INTERFACE_ATTR_PORT_ID": "oid:0x2000000000b1f",
                        "SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS": "1C:34:DA:1D:EA:00",
                        "SAI_ROUTER_INTERFACE_ATTR_TYPE": "SAI_ROUTER_INTERFACE_TYPE_PORT",
                        "SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID": "oid:0x3000000000002"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_ROUTER_INTERFACE:oid:0x6000000000b44": {
                        "SAI_ROUTER_INTERFACE_ATTR_MTU": "9100",
                        "SAI_ROUTER_INTERFACE_ATTR_PORT_ID": "oid:0x2000000000b1c",
                        "SAI_ROUTER_INTERFACE_ATTR_SRC_MAC_ADDRESS": "1C:34:DA:1D:EA:00",
                        "SAI_ROUTER_INTERFACE_ATTR_TYPE": "SAI_ROUTER_INTERFACE_TYPE_PORT",
                        "SAI_ROUTER_INTERFACE_ATTR_VIRTUAL_ROUTER_ID": "oid:0x3000000000002"
                    }
                }
            ],
            "tables_not_found": [],
            "vidtorid": {
                "oid:0x3000000000002": "oid:0x3",
                "oid:0x5000000000c92": "oid:0x3900000005",
                "oid:0x5000000000c72": "oid:0x3800000005",
                "oid:0x5000000000c4f": "oid:0x3300000005",
                "oid:0x5000000000c57": "oid:0x3500000005",
                "oid:0x2d000000000c94": "oid:0x3000390000002d",
                "oid:0x2d000000000c93": "oid:0x500390000002d",
                "oid:0x4000000000c49": "oid:0x3000000004",
                "oid:0x4000000000c1c": "oid:0x500000004",
                "oid:0x6000000000b47": "oid:0x1c100000006",
                "oid:0x6000000000b44": "oid:0x10100000006"
            }
        }
    }
}

Signed-off-by: Vivek Reddy Karri <[email protected]>

…o dump_module_route

Signed-off-by: Vivek Reddy Karri <[email protected]>

…o dump_module_route

Signed-off-by: Vivek Reddy Karri <[email protected]>

lgtm-com · 2021-11-06T08:43:57Z

This pull request introduces 1 alert when merging 8b9228b into 563c416 - view on LGTM.com

new alerts:

1 for Unused import

vivekrnv · 2021-11-10T05:33:45Z

/azpw run

mssonicbld · 2021-11-10T05:33:48Z

/AzurePipelines run

azure-pipelines · 2021-11-10T05:33:59Z

Azure Pipelines successfully started running 1 pipeline(s).

dgsudharsan · 2021-11-11T01:15:33Z

@prsunny @SuvarnaMeenakshi Can you please review?

rlhui · 2021-11-18T07:14:58Z

@TACappleman - would you please review? Thanks.

TACappleman · 2021-11-18T11:13:20Z

dump/plugins/route.py

+        self.init_asic_nh()
+        return self.ret_temp
+
+    def add_to_ret_template(self, table, db, keys, err, add_to_tables_not_found=True):


Could this be made a method on the Executor class, to avoid needing to redefine each time?

There's another such refactoring request here: #1853 (comment),

I'll also do this after once the Route and VxLan modules are merged. It'll be cleaner that way

dump/plugins/route.py

TACappleman · 2021-11-18T11:34:18Z

dump/plugins/route.py

+    return key_dict.get("vr", "")
+
+
+class NextHopGroupMatchOptimizer():


All of this is generic code that may be useful for other plugins in future (you're already also using it for VRF IDs) so put in a common place

TACappleman · 2021-11-18T11:36:40Z

dump/plugins/route.py

+    return "*\"dest\":\"" + dest + "\"*"
+
+
+def get_vr_oid(asic_route_entry):


Comment to document expectations of route entry format

…o dump_module_route

Signed-off-by: Vivek Reddy Karri <[email protected]>

…onic-utilities into dump_module_route

lgtm-com · 2021-11-20T03:45:49Z

This pull request introduces 1 alert when merging ac92cdd into ac8382f - view on LGTM.com

new alerts:

1 for Unused import

vivekrnv · 2021-11-21T06:52:03Z

/azpw run

mssonicbld · 2021-11-21T06:52:07Z

/AzurePipelines run

azure-pipelines · 2021-11-21T06:52:19Z

Azure Pipelines successfully started running 1 pipeline(s).

vivekrnv · 2021-11-22T04:27:03Z

@TACappleman, I've addressed the comments. Please review them

vivekrnv added 7 commits August 4, 2021 21:44

Route Module files added

e68cef4

Signed-off-by: Vivek Reddy Karri <[email protected]>

Changed the UT to use default mock

62528c2

Signed-off-by: Vivek Reddy Karri <[email protected]>

Ran Code beautifier

2b7dd3d

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'master' of https://github.com/Azure/sonic-utilities int…

3d36d61

…o dump_module_route

comments addressed

8219002

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'master' of https://github.com/Azure/sonic-utilities int…

7335c30

…o dump_module_route

Minor Comments Handled

8b9228b

Signed-off-by: Vivek Reddy Karri <[email protected]>

vivekrnv added 2 commits November 8, 2021 09:09

Unused import removed

2fb24be

Merge branch 'Azure:master' into dump_module_route

ade0c03

dgsudharsan previously approved these changes Nov 10, 2021

View reviewed changes

vivekrnv mentioned this pull request Nov 10, 2021

Debug dump utility HLD sonic-net/SONiC#789

Merged

Merge branch 'Azure:master' into dump_module_route

77f4056

TACappleman reviewed Nov 18, 2021

View reviewed changes

vivekrnv added 3 commits November 19, 2021 20:10

Merge branch 'master' of https://github.com/Azure/sonic-utilities int…

22bff80

…o dump_module_route

Added cbf, nh_grp appl_db keys

7f14bb6

Signed-off-by: Vivek Reddy Karri <[email protected]>

Merge branch 'dump_module_route' of https://github.com/vivekreddynv/s…

ac92cdd

…onic-utilities into dump_module_route

vivekrnv dismissed dgsudharsan’s stale review via ac92cdd November 20, 2021 03:36

Removed unused import

2a2b6c9

TACappleman approved these changes Nov 22, 2021

View reviewed changes

dgsudharsan approved these changes Nov 22, 2021

View reviewed changes

prsunny approved these changes Nov 22, 2021

View reviewed changes

prsunny merged commit 02a98ef into sonic-net:master Nov 22, 2021

		return key_dict.get("vr", "")


		class NextHopGroupMatchOptimizer():

		return "\"dest\":\"" + dest + "\""


		def get_vr_oid(asic_route_entry):

Conversation

vivekrnv commented Nov 6, 2021

What I did

How I did it

How to verify it

Previous command output (if the output of a command-line utility has changed)

New command output (if the output of a command-line utility has changed)

Uh oh!

lgtm-com bot commented Nov 6, 2021

Uh oh!

vivekrnv commented Nov 10, 2021

Uh oh!

mssonicbld commented Nov 10, 2021

Uh oh!

azure-pipelines bot commented Nov 10, 2021

Uh oh!

dgsudharsan commented Nov 11, 2021

Uh oh!

rlhui commented Nov 18, 2021

Uh oh!

TACappleman Nov 18, 2021

Choose a reason for hiding this comment

Uh oh!

vivekrnv Nov 18, 2021

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

TACappleman Nov 18, 2021

Choose a reason for hiding this comment

Uh oh!

TACappleman Nov 18, 2021

Choose a reason for hiding this comment

Uh oh!

lgtm-com bot commented Nov 20, 2021

Uh oh!

vivekrnv commented Nov 21, 2021

Uh oh!

mssonicbld commented Nov 21, 2021

Uh oh!

azure-pipelines bot commented Nov 21, 2021

Uh oh!

vivekrnv commented Nov 22, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants