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

[debug dump util] Changes for EVPN and VxLAN dump module #1892

Merged
merged 4 commits into from
Nov 22, 2021

Conversation

dgsudharsan
Copy link
Collaborator

Signed-off-by: Sudharsan Dhamal Gopalarathnam [email protected]

What I did

Added dump utility for EVPN and VxLAN related modules

How I did it

Added changes implementing dump for vxlan and evpn tables

How to verify it

Added UT to verify the changes.

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)

dump state vxlan_tunnel vtep_1336
{
    "vtep_1336": {
        "CONFIG_DB": {
            "keys": [
                {
                    "VXLAN_TUNNEL|vtep_1336": {
                        "src_ip": "10.1.0.32"
                    }
                }
            ],
            "tables_not_found": []
        },
        "APPL_DB": {
            "keys": [
                {
                    "VXLAN_TUNNEL_TABLE:vtep_1336": {
                        "src_ip": "10.1.0.32"
                    }
                }
            ],
            "tables_not_found": []
        },
        "ASIC_DB": {
            "keys": [
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:oid:0x2a00000000069f": {
                        "SAI_TUNNEL_ATTR_DECAP_MAPPERS": "2:oid:0x2900000000069b,oid:0x2900000000069d",
                        "SAI_TUNNEL_ATTR_ENCAP_MAPPERS": "2:oid:0x2900000000069c,oid:0x2900000000069e",
                        "SAI_TUNNEL_ATTR_ENCAP_SRC_IP": "10.1.0.32",
                        "SAI_TUNNEL_ATTR_PEER_MODE": "SAI_TUNNEL_PEER_MODE_P2MP",
                        "SAI_TUNNEL_ATTR_TYPE": "SAI_TUNNEL_TYPE_VXLAN",
                        "SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE": "oid:0x600000000056a"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x2900000000069c": {
                        "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VLAN_ID_TO_VNI"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x2900000000069e": {
                        "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VIRTUAL_ROUTER_ID_TO_VNI"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x2900000000069b": {
                        "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x2900000000069d": {
                        "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VIRTUAL_ROUTER_ID"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b0000000006a0": {
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID": "oid:0x2a00000000069f",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP": "10.1.0.32",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE": "SAI_TUNNEL_TYPE_VXLAN",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE": "SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2MP",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID": "oid:0x3000000000002"
                    }
                }
            ],
            "tables_not_found": [],
            "vidtorid": {
                "oid:0x2a00000000069f": "oid:0x2a",
                "oid:0x2900000000069c": "oid:0x100000029",
                "oid:0x2900000000069e": "oid:0x300000029",
                "oid:0x2900000000069b": "oid:0x29",
                "oid:0x2900000000069d": "oid:0x200000029",
                "oid:0x2b0000000006a0": "oid:0x420000002b"
            }
        },
        "STATE_DB": {
            "keys": [],
            "tables_not_found": [
                "VXLAN_TUNNEL_TABLE"
            ]
        }
    }
}
dump state vxlan_tunnel_map all
{
    "vtep_1336|map_1336_Vlan2345": {
        "CONFIG_DB": {
            "keys": [
                {
                    "VXLAN_TUNNEL_MAP|vtep_1336|map_1336_Vlan2345": {
                        "vlan": "Vlan2345",
                        "vni": "1336"
                    }
                }
            ],
            "tables_not_found": []
        },
        "APPL_DB": {
            "keys": [
                {
                    "VXLAN_TUNNEL_MAP_TABLE:vtep_1336:map_1336_Vlan2345": {
                        "vlan": "Vlan2345",
                        "vni": "1336"
                    }
                }
            ],
            "tables_not_found": []
        },
        "ASIC_DB": {
            "keys": [
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP_ENTRY:oid:0x3b0000000006a1": {
                        "SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP": "oid:0x2900000000069b",
                        "SAI_TUNNEL_MAP_ENTRY_ATTR_TUNNEL_MAP_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID",
                        "SAI_TUNNEL_MAP_ENTRY_ATTR_VLAN_ID_VALUE": "2345",
                        "SAI_TUNNEL_MAP_ENTRY_ATTR_VNI_ID_KEY": "1336"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x2900000000069b": {
                        "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID"
                    }
                }
            ],
            "tables_not_found": [],
            "vidtorid": {
                "oid:0x3b0000000006a1": "oid:0x10000003b",
                "oid:0x2900000000069b": "oid:0x29"
            }
        }
    }
}
dump state evpn 'Vlan2345:11.1.0.32'
{
    "Vlan2345:11.1.0.32": {
        "APPL_DB": {
            "keys": [
                {
                     "VXLAN_REMOTE_VNI_TABLE:Vlan2345:11.1.0.32": {
                         "vni": "1336"
                      }
                }
            ],
            "tables_not_found": []
        },
        "ASIC_DB": {
            "keys": [
                {
                        "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL:oid:0x2a0000000007e1": {
                             "SAI_TUNNEL_ATTR_UNDERLAY_INTERFACE": "oid:0x600000000056a",
                             "SAI_TUNNEL_ATTR_PEER_MODE": "SAI_TUNNEL_PEER_MODE_P2P",
                             "SAI_TUNNEL_ATTR_DECAP_MAPPERS": "2:oid:0x290000000007e9,oid:0x290000000007eb",
                             "SAI_TUNNEL_ATTR_ENCAP_SRC_IP": "10.1.0.32",
                             "SAI_TUNNEL_ATTR_ENCAP_DST_IP": "11.1.0.32",
                            "SAI_TUNNEL_ATTR_ENCAP_MAPPERS": "2:oid:0x290000000007ea,oid:0x290000000007ec",
                            "SAI_TUNNEL_ATTR_TYPE": "SAI_TUNNEL_TYPE_VXLAN"
                       },
                },
               {
                   "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_TERM_TABLE_ENTRY:oid:0x2b0000000007e1": {
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_ACTION_TUNNEL_ID": "oid:0x2a0000000007e1",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TUNNEL_TYPE": "SAI_TUNNEL_TYPE_VXLAN",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_VR_ID": "oid:0x3000000000010",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_DST_IP": "10.1.0.32",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_SRC_IP": "11.1.0.32",
                        "SAI_TUNNEL_TERM_TABLE_ENTRY_ATTR_TYPE": "SAI_TUNNEL_TERM_TABLE_ENTRY_TYPE_P2P"
                    }
                },
               {
                   "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x290000000007e9": {
                          "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VLAN_ID"
                    }
                },
               {
                   "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x290000000007ec": {
                          "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VIRTUAL_ROUTER_ID_TO_VNI"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x290000000007ea": {
                          "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VLAN_ID_TO_VNI"
                    }
                },
                {
                    "ASIC_STATE:SAI_OBJECT_TYPE_TUNNEL_MAP:oid:0x290000000007eb": {
                          "SAI_TUNNEL_MAP_ATTR_TYPE": "SAI_TUNNEL_MAP_TYPE_VNI_TO_VIRTUAL_ROUTER_ID"
                    }
                }
            ],
            "tables_not_found": [],
            "vidtorid": {
                "oid:0x2a0000000007e1": "oid:0x2a",
                "oid:0x290000000007ec": "oid:0x100000029",
                "oid:0x290000000007eb": "oid:0x300000029",
                "oid:0x290000000007ea": "oid:0x29",
                "oid:0x290000000007e9": "oid:0x200000029",
                "oid:0x2b0000000007e1": "oid:0x420000002b"
            }
        },
        "STATE_DB": {
            "keys": [],
            "tables_not_found": [
                "VXLAN_TUNNEL_TABLE"
            ]
        }
    }
}

Signed-off-by: Sudharsan Dhamal Gopalarathnam <[email protected]>
@dgsudharsan dgsudharsan changed the title Changes for EVPN and VxLAN dump module [Debug dump util] Changes for EVPN and VxLAN dump module Oct 22, 2021
@dgsudharsan
Copy link
Collaborator Author

@SuvarnaMeenakshi @srj102 Please review

@lgtm-com
Copy link

lgtm-com bot commented Oct 22, 2021

This pull request introduces 4 alerts when merging 16575c4 into 9017d99 - view on LGTM.com

new alerts:

  • 3 for Unused import
  • 1 for Unused local variable

@dgsudharsan
Copy link
Collaborator Author

/azpw run

@mssonicbld
Copy link
Collaborator

/AzurePipelines run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@liat-grozovik liat-grozovik changed the title [Debug dump util] Changes for EVPN and VxLAN dump module [debug dump util] Changes for EVPN and VxLAN dump module Nov 8, 2021
@liat-grozovik liat-grozovik requested a review from prsunny November 8, 2021 13:18
@dprital
Copy link
Collaborator

dprital commented Nov 18, 2021

@prsunny - Can you please review ?

prsunny
prsunny previously approved these changes Nov 19, 2021
Copy link
Contributor

@SuvarnaMeenakshi SuvarnaMeenakshi left a comment

Choose a reason for hiding this comment

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

@SuvarnaMeenakshi SuvarnaMeenakshi self-requested a review November 19, 2021 19:18
@dgsudharsan dgsudharsan dismissed stale reviews from SuvarnaMeenakshi and prsunny via 619cfbf November 22, 2021 06:21
@dgsudharsan
Copy link
Collaborator Author

Minor comment:

https://github.com/Azure/sonic-utilities/blob/3641d350d19a2317bbe6a507da117e1ee24cc092/dump/plugins/evpn.py#L70

  • line is too long , can be modified for readability.

Done

@dgsudharsan dgsudharsan requested a review from prsunny November 22, 2021 06:21
@prsunny prsunny merged commit a395e28 into sonic-net:master Nov 22, 2021
@dgsudharsan dgsudharsan deleted the evpn_vxlan_debug_dump branch March 9, 2023 02:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants