Skip to content

Commit

Permalink
T2-VOQ-VS: Modified exception handling due to new sonic_platform pack…
Browse files Browse the repository at this point in the history
…age support for VS (sonic-net#3250)

### What I did
For T2-Chassis VS support, we are adding new sonic_platform package for vs platforms. Please refer sonic-net/sonic-buildimage#18512 for more details.
Due to this new platform package, need to modify excpetion handling as now the Module would be found, but the metadata file will not be found for pizzabox vs platforms.

#### How I did it
Modified the exception handling logic.
MSFT ADO: 27414904

#### How to verify it
Bring up vms-kvm-t0 topology. ran show interface status. The output is proper.

PS: the Main PR(sonic-net/sonic-buildimage#18512) is dependent on this PR to be merged in first.
  • Loading branch information
deepak-singhal0408 authored Apr 3, 2024
1 parent bd86d33 commit c0b6632
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions utilities_common/platform_sfputil_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,10 +121,10 @@ def is_rj45_port(port_name):
if not platform_sfp_base:
import sonic_platform_base
platform_sfp_base = sonic_platform_base.sfp_base.SfpBase
except ModuleNotFoundError as e:
except (ModuleNotFoundError, FileNotFoundError) as e:
# This method is referenced by intfutil which is called on vs image
# However, there is no platform API supported on vs image
# So False is returned in such case
# sonic_platform API support is added for vs image(required for chassis), it expects a metadata file, which
# wont be available on vs pizzabox duts, So False is returned(if either ModuleNotFound or FileNotFound)
return False

if platform_chassis and platform_sfp_base:
Expand Down

0 comments on commit c0b6632

Please sign in to comment.