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

Align API get_device_runtime_metadata() for python version < 3.9 #11900

Merged
merged 28 commits into from
Aug 31, 2022
Merged
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
4766fcf
[submodule update] sonic-db-syncd
abdosi Apr 3, 2021
9746bb3
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 5, 2021
061821d
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 6, 2021
9e61e53
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 21, 2021
5c3a87f
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 28, 2021
5775c20
Merge remote-tracking branch 'upsteam/master'
abdosi May 14, 2021
3c20361
Merge remote-tracking branch 'upsteam/master'
abdosi May 29, 2021
cc1210d
Merge remote-tracking branch 'upsteam/master'
abdosi Aug 17, 2021
7bae398
Merge remote-tracking branch 'upsteam/master'
abdosi Sep 29, 2021
7126f88
Merge remote-tracking branch 'upsteam/master'
abdosi Oct 13, 2021
63c037c
Merge remote-tracking branch 'upsteam/master'
abdosi Nov 17, 2021
2eb13c6
Merge remote-tracking branch 'upsteam/master'
abdosi Dec 28, 2021
6f09dea
Merge remote-tracking branch 'upsteam/master'
abdosi Jan 13, 2022
cec65fc
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 1, 2022
54f0ea3
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 19, 2022
d1eeb39
Merge remote-tracking branch 'upsteam/master'
abdosi Apr 21, 2022
9a3598e
Merge remote-tracking branch 'upsteam/master'
abdosi May 2, 2022
ea7a084
Merge remote-tracking branch 'upsteam/master'
abdosi May 9, 2022
a92b47d
Merge remote-tracking branch 'upstream/master'
abdosi Jul 15, 2022
3baf0b8
Merge remote-tracking branch 'upstream/master'
abdosi Aug 11, 2022
d49e1f0
Merge remote-tracking branch 'upstream/master'
abdosi Aug 16, 2022
8cdc104
Added Support to update gbsyncd in Feature Table of Global Config DB
abdosi Aug 17, 2022
fec9531
Merge remote-tracking branch 'upstream/master' into gbsyncd
abdosi Aug 26, 2022
86f13c9
As part of PR#11754 change was added to variable SONIC_DB_NS_CLI for
abdosi Aug 26, 2022
f3e821c
Fixed the DB_CLI not working when it getting applied for namespace
abdosi Aug 27, 2022
5209637
Merge remote-tracking branch 'upstream/master' into gbsyncd
abdosi Aug 30, 2022
d020002
Align code for python < 3.9
abdosi Aug 30, 2022
38783eb
Fix
abdosi Aug 30, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/sonic-py-common/sonic_py_common/device_info.py
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,10 @@ def get_device_runtime_metadata():
'chassis_type': 'voq' if is_voq_chassis() else 'packet'}}

port_metadata = {'ETHERNET_PORTS_PRESENT': True if get_path_to_port_config_file(hwsku=None, asic="0" if is_multi_npu() else None) else False}
return {'DEVICE_RUNTIME_METADATA': chassis_metadata | port_metadata }
runtime_metadata = {}
runtime_metadata.update(chassis_metadata)
runtime_metadata.update(port_metadata)
return {'DEVICE_RUNTIME_METADATA': runtime_metadata }

def get_npu_id_from_name(npu_name):
if npu_name.startswith(NPU_NAME_PREFIX):
Expand Down