Skip to content

[BMC] Align get_presence for the new infra #685

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

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

[BMC] Align get_presence for the new infra #685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions sonic_platform_base/bmc_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,8 +268,7 @@ def get_presence(self):
A boolean indicating whether the BMC device is present
"""
from sonic_py_common import device_info
bmc_data = device_info.get_bmc_data()
if bmc_data and bmc_data.get('bmc_addr'):
if device_info.is_switch_host() and device_info.get_bmc_data():
return True
return False

Expand Down
31 changes: 21 additions & 10 deletions tests/bmc_base_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,17 +53,28 @@ def test_get_name(self):
bmc = BMCBase('169.254.0.1')
assert bmc.get_name() == BMCBase.BMC_NAME

def test_get_presence_true(self):
"""Test get_presence returns True when BMC data is present"""
with mock.patch('sonic_py_common.device_info.get_bmc_data', create=True, return_value={'bmc_addr': '169.254.0.1'}):
bmc = BMCBase('169.254.0.1')
assert bmc.get_presence() == True
@mock.patch('sonic_py_common.device_info.is_switch_host', create=True, return_value=True)
@mock.patch('sonic_py_common.device_info.get_bmc_data', create=True,
return_value={'bmc_addr': '169.254.0.1'})
def test_get_presence_true(self, _mock_get_bmc_data, _mock_is_switch_host):
"""Test get_presence returns True on Switch-Host when bmc.json data exists"""
bmc = BMCBase('169.254.0.1')
assert bmc.get_presence() is True

def test_get_presence_false(self):
"""Test get_presence returns False when BMC data is not present"""
with mock.patch('sonic_py_common.device_info.get_bmc_data', create=True, return_value=None):
bmc = BMCBase('169.254.0.1')
assert bmc.get_presence() == False
@mock.patch('sonic_py_common.device_info.is_switch_host', create=True, return_value=True)
@mock.patch('sonic_py_common.device_info.get_bmc_data', create=True, return_value=None)
def test_get_presence_false_no_bmc_data(self, _mock_get_bmc_data, _mock_is_switch_host):
"""Test get_presence returns False when /etc/sonic/bmc.json is unavailable"""
bmc = BMCBase('169.254.0.1')
assert bmc.get_presence() is False

@mock.patch('sonic_py_common.device_info.is_switch_host', create=True, return_value=False)
@mock.patch('sonic_py_common.device_info.get_bmc_data', create=True,
return_value={'bmc_addr': '169.254.0.1'})
def test_get_presence_false_not_switch_host(self, _mock_get_bmc_data, _mock_is_switch_host):
"""Test get_presence returns False on Switch-BMC even if bmc.json data exists"""
bmc = BMCBase('169.254.0.1')
assert bmc.get_presence() is False

def test_is_replaceable(self):
"""Test is_replaceable returns False"""
Expand Down
Loading