x/rsd-lib
Code Issues Proposed changes

Merge "Fix bug of manager test"

Browse Source
This commit is contained in:
Zuul 2019-01-16 02:42:14 +00:00 committed by Gerrit Code Review
commit 83a8bd3223
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rsd_lib/resources/v2_1/manager/manager.py
View File

@ -96,7 +96,7 @@ class Manager(base.ResourceBase):
firmware_version = base.Field('FirmwareVersion')
"""The manager firmware version"""
network_protocol = base.Field('NewworkProtocol',
network_protocol = base.Field('NetworkProtocol',
adapter=rsd_lib_utils.get_resource_identity)
"""Link to network protocol of this manager"""

0
rsd_lib/tests/unit/resources/v2_1/manager/__init__.py Normal file
View File

16
rsd_lib/tests/unit/resources/v2_1/manager/test_manager.py
View File

@ -44,7 +44,7 @@ class TestManager(base.TestCase):
self.assertEqual('00000000-0000-0000-0000-000000000000',
self.manager_inst.uuid)
self.assertEqual('Joo Janta 200', self.manager_inst.model)
self.assertEqual('Enables', self.manager_inst.status.state)
self.assertEqual('Enabled', self.manager_inst.status.state)
self.assertEqual('OK', self.manager_inst.status.health)
self.assertEqual('OK', self.manager_inst.status.health_rollup)
self.assertEqual(True,
@ -75,10 +75,10 @@ class TestManager(base.TestCase):
self.manager_inst.command_shell.connect_types_supported)
self.assertEqual('1.00', self.manager_inst.firmware_version)
self.assertEqual(
('/redfish/v1/Managers/PSME/NetworkProtocol',),
'/redfish/v1/Managers/PSME/NetworkProtocol',
self.manager_inst.network_protocol)
self.assertEqual(
('/redfish/v1/Managers/PSME/EthernetInterfaces',),
'/redfish/v1/Managers/PSME/EthernetInterfaces',
self.manager_inst.ethernet_interfaces)
self.assertEqual((), self.manager_inst.links.manager_for_servers)
self.assertEqual(
@ -105,10 +105,10 @@ class TestManagerCollection(base.TestCase):
self.manager_col._parse_attributes()
self.assertEqual('1.0.2', self.manager_col.redfish_version)
self.assertEqual('Manager Collection', self.manager_col.name)
self.assertIn(('/redfish/v1/Manaagers/RMC',
'/redfish/v1/Managers/MBPC1',
'/redfish/v1/Managers/MBPC2',),
self.manager_col.members_identities)
self.assertEqual(('/redfish/v1/Managers/RMC',
'/redfish/v1/Managers/MBPC1',
'/redfish/v1/Managers/MBPC2',),
self.manager_col.members_identities)
@mock.patch.object(manager, 'Manager', autospec=True)
def test_get_member(self, mock_manager):
@ -124,5 +124,5 @@ class TestManagerCollection(base.TestCase):
def test_get_members(self, mock_manager):
members = self.manager_col.get_members()
self.assertEqual(mock_manager.call_count, 3)
self.assertInstance(members, list)
self.assertIsInstance(members, list)
self.assertEqual(3, len(members))