x/rsd-lib
Code Issues Proposed changes

Enable RSD 2.3 interface

Browse Source 
Change-Id: Ia3607ab528e2fc6c6341391259e92b858b0370fd
This commit is contained in:
Lin Yang 2018-04-09 14:23:17 -07:00
parent e2ff3b548e
commit f6d0776dc2
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rsd_lib/main.py
View File

@ -20,6 +20,7 @@ from sushy.resources import base
from rsd_lib.resources import v2_1
from rsd_lib.resources import v2_2
from rsd_lib.resources import v2_3
class RSDLib(base.ResourceBase):
@ -71,6 +72,11 @@ class RSDLib(base.ResourceBase):
# Specific interface for RSD 2.2 version
return v2_2.RSDLibV2_2(self._conn, self._root_prefix,
redfish_version=self._redfish_version)
elif version.StrictVersion("2.3.0") <= rsd_version \
and rsd_version < version.StrictVersion("2.4.0"):
# Specific interface for RSD 2.2 version
return v2_3.RSDLibV2_3(self._conn, self._root_prefix,
redfish_version=self._redfish_version)
else:
raise NotImplementedError(
"The rsd-lib library doesn't support RSD API "

13
rsd_lib/tests/unit/test_main.py
View File

@ -22,6 +22,7 @@ import testtools
from rsd_lib import main
from rsd_lib.resources import v2_1
from rsd_lib.resources import v2_2
from rsd_lib.resources import v2_3
class RSDLibTestCase(testtools.TestCase):
@ -41,9 +42,10 @@ class RSDLibTestCase(testtools.TestCase):
self.assertEqual("2.1.0", self.rsd._rsd_api_version)
self.assertEqual("1.0.2", self.rsd._redfish_version)
@mock.patch.object(v2_3, 'RSDLibV2_3', autospec=True)
@mock.patch.object(v2_2, 'RSDLibV2_2', autospec=True)
@mock.patch.object(v2_1, 'RSDLibV2_1', autospec=True)
def test_factory(self, mock_rsdlibv2_1, mock_rsdlibv2_2):
def test_factory(self, mock_rsdlibv2_1, mock_rsdlibv2_2, mock_rsdlibv2_3):
self.rsd.factory()
mock_rsdlibv2_1.assert_called_once_with(
self.rsd._conn,
@ -52,7 +54,14 @@ class RSDLibTestCase(testtools.TestCase):
self.rsd._rsd_api_version = "2.2.0"
self.rsd.factory()
mock_rsdlibv2_1.assert_called_once_with(
mock_rsdlibv2_2.assert_called_once_with(
self.rsd._conn,
self.rsd._root_prefix,
redfish_version=self.rsd._redfish_version)
self.rsd._rsd_api_version = "2.3.0"
self.rsd.factory()
mock_rsdlibv2_3.assert_called_once_with(
self.rsd._conn,
self.rsd._root_prefix,
redfish_version=self.rsd._redfish_version)