Skip to content

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#307

Merged
mssonicbld merged 2 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge
Mar 20, 2024
Merged

[code sync] Merge code from sonic-net/sonic-buildimage:202305 to 202305#307
mssonicbld merged 2 commits intoAzure:202305from
mssonicbld:sonicbld/202305-merge

Conversation

@mssonicbld
Copy link
Copy Markdown
Collaborator

* 5bc2aa3c6 - (head/202305) [E1031] Bugfix for Python syntax error in sonic_platform/common.py (#18386) (2024-03-20) [Zhijian Li]<br>```

lizhijianrd and others added 2 commits March 20, 2024 01:01
…18386)

Why I did it
Bugfix for Python syntax error in sonic_platform/common.py.
A method of class need to have self as parameter.

Fixing below issue:

e1031:~$ show int st
Traceback (most recent call last):
  File "/usr/local/bin/intfutil", line 836, in <module>
    main()
  File "/usr/local/bin/intfutil", line 819, in main
    interface_stat.display_intf_status()
  File "/usr/local/bin/intfutil", line 448, in display_intf_status
    self.get_intf_status()
  File "/usr/local/lib/python3.9/dist-packages/utilities_common/multi_asic.py", line 157, in wrapped_run_on_all_asics
    func(self,  *args, **kwargs)
  File "/usr/local/bin/intfutil", line 529, in get_intf_status
    self.portchannel_speed_dict = po_speed_dict(self.po_int_dict, self.db)
  File "/usr/local/bin/intfutil", line 334, in po_speed_dict
    optics_type = port_optics_get(appl_db, value[0], PORT_OPTICS_TYPE)
  File "/usr/local/bin/intfutil", line 224, in port_optics_get
    if is_rj45_port(intf_name):
  File "/usr/local/lib/python3.9/dist-packages/utilities_common/platform_sfputil_helper.py", line 120, in is_rj45_port
    platform_chassis = sonic_platform.platform.Platform().get_chassis()
  File "/usr/local/lib/python3.9/dist-packages/sonic_platform/platform.py", line 21, in __init__
    self._chassis = Chassis()
  File "/usr/local/lib/python3.9/dist-packages/sonic_platform/chassis.py", line 37, in __init__
    self._is_host = self._api_common.is_host()
TypeError: is_host() takes 0 positional arguments but 1 was given
Work item tracking
Microsoft ADO (number only): 27208152
How I did it
Add self parameter to function Common::is_host().

How to verify it
Verified on E1031 DUT with this patch.
@mssonicbld mssonicbld merged commit 4f78fce into Azure:202305 Mar 20, 2024
Pterosaur added a commit to Pterosaur/sonic-buildimage-msft that referenced this pull request Sep 16, 2025
```
7341ba6 (HEAD, origin/202411) [202411] Backport: [reboot-cause] Use UTC to ensure consistent sorting (Azure#306)
bccad08 Pin PyGObject to 3.42.2 (Azure#307)
1d59da1 make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT ACL service (Azure#302)
5ca4d5d [202411] cast of kdump init fix
ec3a269 Fix ProcessStatsST column name issue and add test case to cover check (Azure#281)
d231ed2 [202411] Fix 202411 pipeline (Azure#290)
1044ca2 Pin PyGObject to 3.50.0 (Azure#233)
```

Signed-off-by: Ze Gan <[email protected]>
Pterosaur added a commit that referenced this pull request Sep 16, 2025
…t HEAD (#1623)

```
7341ba6 (HEAD, origin/202411) [202411] Backport: [reboot-cause] Use UTC to ensure consistent sorting (#306)
bccad08 Pin PyGObject to 3.42.2 (#307)
1d59da1 make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT ACL service (#302)
5ca4d5d [202411] cast of kdump init fix
ec3a269 Fix ProcessStatsST column name issue and add test case to cover check (#281)
d231ed2 [202411] Fix 202411 pipeline (#290)
1044ca2 Pin PyGObject to 3.50.0 (#233)
```

Signed-off-by: Ze Gan <[email protected]>
r12f pushed a commit to r12f/sonic-buildimage-msft that referenced this pull request Oct 22, 2025
…utomatically (#22178)

#### Why I did it
src/sonic-host-services
```
* bccad08 - (HEAD -> 202411, origin/202411) Pin PyGObject to 3.42.2 (Azure#307) (3 days ago) [Liu Shilong]
* 1d59da1 - make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT ACL service (Azure#302) (3 weeks ago) [mssonicbld]
* 5ca4d5d - [202411] cast of kdump init fix (4 weeks ago) [arista-nwolfe]
* ec3a269 - Fix ProcessStatsST column name issue and add test case to cover check (Azure#281) (8 weeks ago) [mssonicbld]
* d231ed2 - [202411] Fix 202411 pipeline (Azure#290) (8 weeks ago) [Zain Budhwani]
* 1044ca2 - Pin PyGObject to 3.50.0 (Azure#233) (5 months ago) [mssonicbld]
```
#### How I did it
#### How to verify it
#### Description for the changelog
r12f pushed a commit that referenced this pull request Oct 26, 2025
…t HEAD (#1623)

```
7341ba6 (HEAD, origin/202411) [202411] Backport: [reboot-cause] Use UTC to ensure consistent sorting (#306)
bccad08 Pin PyGObject to 3.42.2 (#307)
1d59da1 make multi_asic_ns_to_host_fwd False for EXTERNAL_CLIENT ACL service (#302)
5ca4d5d [202411] cast of kdump init fix
ec3a269 Fix ProcessStatsST column name issue and add test case to cover check (#281)
d231ed2 [202411] Fix 202411 pipeline (#290)
1044ca2 Pin PyGObject to 3.50.0 (#233)
```

Signed-off-by: Ze Gan <[email protected]>
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.

2 participants