Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: sonic-net/sonic-utilities
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: bcc12063a54abdad9ba1ad2d6c15139bf34d4c77
Choose a base ref
...
head repository: sonic-net/sonic-utilities
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 7d7e15ee0e1699c095ebc802f1f95d506d37f11b
Choose a head ref
  • 7 commits
  • 16 files changed
  • 10 contributors

Commits on Jul 28, 2022

  1. [sfpshow/sfputil] Enhance sfpshow and sfputil to behavior correctly o… 

    …n RJ45 ports (#2111)

* enhance show interface transceiver eeprom logic with RJ45 port support

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* enhance sfputil to support RJ45 port, exclude error status

* fix sfputil issue on RJ45 port

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* [RJ45] change the way to judge port type and add more UT test case

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* [sfputil] simplity the logic for RJ45 support

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* Support sfputil show present

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Support rj45 in sfpshow

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Add test case for sfputil with RJ45 supported

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Add mock data for RJ45 ports into STATE_DB

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Add test for sfputil show for RJ45 ports

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* remove debug code in sfputil test case

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* remove unnecessary argument for format()

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* Revert the logic to fetch presence status from error status for RJ45 port (#17)

* Revert the logic to fetch presence status from error status

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Unit test

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Fix error

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* Add test cases to cover lpmode and error status

Signed-off-by: Stephen Sun <stephens@nvidia.com>

* add comments to describe the usage of functions to judge the port type

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* add more testcase for sfputil

Signed-off-by: Kebo Liu <kebol@nvidia.com>

* fix typo in testcase name

Signed-off-by: Kebo Liu <kebol@nvidia.com>

Co-authored-by: Stephen Sun <stephens@nvidia.com>
Co-authored-by: Stephen Sun <5379172+stephenxs@users.noreply.github.com>
    @keboliu @stephenxs @yxieca
    3 people authored and yxieca committed Jul 28, 2022

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    79b4439 View commit details

  2. fix for non-coherent cmis modules (#2163) 

    * fix for non-coherent cmis modules

* addressing comments

* add back application_advertisement

* fixing test failure

Co-authored-by: Chuan Qin (QINCHUAN) <QINCHUAN@ame.gbl>
    @qinchuanares @yxieca
    2 people authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    d7fbdd6 View commit details

  3. Update db_migrator to support PORT_QOS_MAP|global (#2205) 

    Signed-off-by: bingwang <wang.bing@microsoft.com>

What I did
This PR is to update the db_migrator to support generation of PORT_QOS_MAP|global.

After PR sonic-net/sonic-buildimage#10565, there will be two DSCP_TO_TC_MAP

DSCP_TO_TC_MAP|AZURE is the default map, which is used at port level and switch level
DSCP_TO_TC_MAP|AZURE_TUNNEL is used to remap the priority of tunnel traffic in dualtor deployment
To address the issue, an entry PORT_QOS_MAP|global will be added into config_db

"PORT_QOS_MAP": {
        "global": {
            "dscp_to_tc_map": "AZURE"
        }
}
To handle the upgrade from older image, db_migrator is updated to generate the entry.
There is no way to check if PORT_QOS_MAP|global is supported, so the migration is ran on all platforms. There is check in sonic-swss to check the switch capability code, so it will not cause issue.

How I did it
Update db_migrator to add a common migration step.

How to verify it
Verified by vstest
    @bingwang-ms @yxieca
    bingwang-ms authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    46443c6 View commit details

  4. Gives cisco-8000 more flexibility to easily add subcommnads under sho… 

    …w platform (#2213)

What I did
Gave cisco-8000 the ability to add sub-commands under show platform <> in our downstream repo. Currently every time we want to add/remove/update a cli, we must raise a PR upstream.

How I did it
I have the cisco-8000.py module import a list of click commands that are written in a module that is located in our platform code.

How to verify it
Run show platform -h to see all commands. We will be able to see show platform inventory. This is only available on cisco devices.
    @nathcohe @yxieca
    nathcohe authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    4079e4a View commit details

  5. Add 'traffic_shift_away' option to config load_minigraph (#2240)

    @tjchadaga @yxieca
    tjchadaga authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    504ebe6 View commit details

  6. [MultiAsic] sudo reboot command doesn't gracefully stop Asic syncd# o… 

    …n multiasic platform (#2258)

What I did
Function stop_sonic_service() in /usr/local/bin/reboot script doesn't handle stopping the Asic syncd# on multiasic platform. Instead, it only stops the syncd on non-multiasic platform. When issue command "sudo reboot", the below message will be shown.

admin@sonic:~$ sudo reboot
Error: No such container: syncd
Fixes sonic-net/sonic-buildimage#11377

How I did it
Add code the stop_sonic_services() to check and get NUM_ASIC. If it is multiasic, looping all asics and call the syncd_request_shutdown for each asic.

How to verify it
Issue the "sudo reboot" on the multiasic platform, the error message "Error: No such container: syncd" should not be shown.
    @mlok-nokia @yxieca
    mlok-nokia authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    b3d5d18 View commit details

  7. [vnet_route_check] Align DB data parse logic with format used by swss… 

    …common API (#2268)

* swsscommon API was changed in order to return data from DB as a tuple instead of dictionary.
* In some places vnet_route_check still was expecting data from DB in old format - as a dictionary.
* But now it is a tuple, so as a result vnet_route_check was failing with "KeyError" exeption.
* These changes fixed all the places in vnet_route_check script that used invalid data format.

Signed-off-by: Volodymyr Samotiy <volodymyrs@nvidia.com>
    @volodymyrsamotiy @yxieca
    volodymyrsamotiy authored and yxieca committed Jul 28, 2022
    Copy the full SHA
    7d7e15e View commit details
Loading