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

[sonic-device-data] Exclude non-hwsku directories #14667

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

bluecmd
Copy link
Contributor

@bluecmd bluecmd commented Apr 14, 2023

Why I did it

When using sonic-vs I discovered the directory /usr/share/sonic/device/x86_64-kvm_x86_64-r0/sonic_platform was full of files from various platforms mixed into a big mess.

How I did it

I played with different ways of figuring out which directories are HWSKUs, like looking for port_config.ini and/or hwsku.json but that ended up excluding platforms like Arista-7800R3A-36D2-C36/0 since it has an additional level of directories.

In the end I chose to extend the existing rejection list.

How to verify it

The following directories are removed from being treated as HWSKUs:

../../../device/accton/x86_64-accton_as4630_54pe-r0/pddf
../../../device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform
../../../device/accton/x86_64-accton_as4630_54te-r0/sonic_platform
../../../device/accton/x86_64-accton_as5835_54x-r0/sonic_platform
../../../device/accton/x86_64-accton_as7116_54x-r0/sonic_platform
../../../device/accton/x86_64-accton_as7312_54x-r0/sonic_platform
../../../device/accton/x86_64-accton_as7326_56x-r0/pddf
../../../device/accton/x86_64-accton_as7326_56x-r0/sonic_platform
../../../device/accton/x86_64-accton_as7712_32x-r0/pddf
../../../device/accton/x86_64-accton_as7726_32x-r0/pddf
../../../device/accton/x86_64-accton_as7816_64x-r0/pddf
../../../device/accton/x86_64-accton_as7816_64x-r0/sonic_platform
../../../device/accton/x86_64-accton_as9716_32d-r0/pddf
../../../device/accton/x86_64-accton_as9726_32d-r0/sonic_platform
../../../device/alphanetworks/x86_64-alphanetworks_bes2348t-r0/pddf
../../../device/celestica/x86_64-cel_belgite-r0/led-source-code
../../../device/celestica/x86_64-cel_belgite-r0/pddf
../../../device/celestica/x86_64-cel_e1031-r0/sonic_platform
../../../device/celestica/x86_64-cel_seastone_2-r0/sonic_platform_config
../../../device/celestica/x86_64-cel_seastone-r0/sonic_platform
../../../device/celestica/x86_64-cel_silverstone-r0/sonic_platform
../../../device/ragile/x86_64-ragile_ra-b6510-32c-r0/pddf
../../../device/ragile/x86_64-ragile_ra-b6510-48v8c-r0/pddf
../../../device/ragile/x86_64-ragile_ra-b6510-48v8c-r0/sonic_platform_config
../../../device/ragile/x86_64-ragile_ra-b6910-64c-r0/pddf
../../../device/ragile/x86_64-ragile_ra-b6910-64c-r0/sonic_platform_config
../../../device/ragile/x86_64-ragile_ra-b6920-4s-r0/pddf
../../../device/ruijie/x86_64-ruijie_b6510-48vs8cq-r0/sonic_platform_config
../../../device/wistron/x86_64-wistron_6512_32r-r0/sonic_platform

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

  • 201811
  • 201911
  • 202006
  • 202012
  • 202106
  • 202111
  • 202205
  • 202211

Tested branch (Please provide the tested image version)

  • master

Description for the changelog

N/A

Signed-off-by: Christian Svensson <blue@cmd.nu>
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.

None yet

1 participant