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.

Sign up for GitHub

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

[202205] Update xcvrd to use new STATE_DB FAST_REBOOT entry #343

Merged
merged 7 commits into from
Mar 16, 2023
Merged

[202205] Update xcvrd to use new STATE_DB FAST_REBOOT entry #343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
7e6680f
Update xcvrd to use new STATE_DB FAST_REBOOT entry
arfeigin Mar 6, 2023
52c8f68
update xcvrd init-dinit UT
arfeigin Mar 16, 2023
444df8f
update xcvrd UT
arfeigin Mar 16, 2023
cd18281
update xcvrd UT
arfeigin Mar 16, 2023
7223076
Revert "update xcvrd UT"
arfeigin Mar 16, 2023
0b2c921
Modify xcvrd init-deinit UT
arfeigin Mar 16, 2023
4753542
Merge branch '202205' into fast-reboot-finalizer_202205-internal-new
vaibhavhd Mar 16, 2023
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
13 changes: 8 additions & 5 deletions sonic-xcvrd/tests/test_xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1423,12 +1423,15 @@ def test_get_media_val_str(self):
@patch('sonic_py_common.device_info.get_paths_to_platform_and_hwsku_dirs', MagicMock(return_value=('/tmp', None)))
@patch('swsscommon.swsscommon.WarmStart', MagicMock())
@patch('xcvrd.xcvrd.DaemonXcvrd.wait_for_port_config_done', MagicMock())
def test_DaemonXcvrd_init_deinit(self):
def test_DaemonXcvrd_init_deinit_fastboot_enabled(self):
xcvrd = DaemonXcvrd(SYSLOG_IDENTIFIER)
xcvrd.init()
xcvrd.deinit()
# TODO: fow now we only simply call xcvrd.init/deinit without any further check, it only makes sure that
# xcvrd.init/deinit will not raise unexpected exception. In future, probably more check will be added
with patch("subprocess.check_output") as mock_run:
mock_run.return_value = "true"

xcvrd.init()
xcvrd.deinit()
# TODO: fow now we only simply call xcvrd.init/deinit without any further check, it only makes sure that
# xcvrd.init/deinit will not raise unexpected exception. In future, probably more check will be added


def wait_until(total_wait_time, interval, call_back, *args, **kwargs):
Expand Down
12 changes: 2 additions & 10 deletions sonic-xcvrd/xcvrd/xcvrd.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -921,17 +921,9 @@ def init_port_sfp_status_tbl(port_mapping, xcvr_table_helper, stop_event=threadi
update_port_transceiver_status_table_sw(logical_port_name, xcvr_table_helper.get_status_tbl(asic_index), sfp_status_helper.SFP_STATUS_INSERTED)

def is_fast_reboot_enabled():
fastboot_enabled = False
state_db_host = daemon_base.db_connect("STATE_DB")
fastboot_tbl = swsscommon.Table(state_db_host, 'FAST_REBOOT')
keys = fastboot_tbl.getKeys()
fastboot_enabled = subprocess.check_output('sonic-db-cli STATE_DB hget "FAST_RESTART_ENABLE_TABLE|system" enable', shell=True, universal_newlines=True)
return "true" in fastboot_enabled

if "system" in keys:
output = subprocess.check_output('sonic-db-cli STATE_DB get "FAST_REBOOT|system"', shell=True, universal_newlines=True)
if "1" in output:
fastboot_enabled = True

return fastboot_enabled

#
# Helper classes ===============================================================
Expand Down