From bd327bea540ce45baec0c9ea53c205659364cf6d Mon Sep 17 00:00:00 2001 From: Madhav Date: Thu, 27 Jun 2019 13:12:52 +0530 Subject: [PATCH 1/2] adding scope URI query parameter to getAll Signed-off-by: Madhav --- hpOneView/resources/servers/server_hardware.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hpOneView/resources/servers/server_hardware.py b/hpOneView/resources/servers/server_hardware.py index f9cea27d..4e8057f7 100644 --- a/hpOneView/resources/servers/server_hardware.py +++ b/hpOneView/resources/servers/server_hardware.py @@ -131,7 +131,7 @@ def get_utilization(self, id_or_uri, fields=None, filter=None, refresh=False, vi return self._client.get_utilization(id_or_uri, fields=fields, filter=filter, refresh=refresh, view=view) - def get_all(self, start=0, count=-1, filter='', sort=''): + def get_all(self, start=0, count=-1, filter='', sort='', scope_uris=''): """ Gets a list of server hardware resources. Returns a list of resources based on optional sorting and filtering, and constrained by start and count parameters. @@ -154,7 +154,7 @@ def get_all(self, start=0, count=-1, filter='', sort=''): Returns: list: A list of server hardware resources. """ - return self._client.get_all(start, count, filter=filter, sort=sort) + return self._client.get_all(start, count, filter=filter, sort=sort, scope_uris=scope_uris) def add(self, information, timeout=-1): """ From ee3e6608fd958c633928eddc04b9508e31e97b69 Mon Sep 17 00:00:00 2001 From: Madhav Date: Thu, 27 Jun 2019 13:45:57 +0530 Subject: [PATCH 2/2] updating tests Signed-off-by: Madhav --- tests/unit/resources/servers/test_server_hardware.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tests/unit/resources/servers/test_server_hardware.py b/tests/unit/resources/servers/test_server_hardware.py index f9cd2c96..7fcb700e 100644 --- a/tests/unit/resources/servers/test_server_hardware.py +++ b/tests/unit/resources/servers/test_server_hardware.py @@ -57,16 +57,17 @@ def test_get_utilization_with_defaults(self, mock_get): def test_get_all_called_once(self, mock_get_all): filter = 'name=TestName' sort = 'name:ascending' + scope_uris = '/rest/test/scopes' - self._server_hardware.get_all(2, 500, filter, sort) + self._server_hardware.get_all(2, 500, filter, sort, scope_uris) - mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort) + mock_get_all.assert_called_once_with(2, 500, filter=filter, sort=sort, scope_uris=scope_uris) @mock.patch.object(ResourceClient, 'get_all') def test_get_all_called_once_with_default_values(self, mock_get_all): self._server_hardware.get_all() - mock_get_all.assert_called_once_with(0, -1, filter='', sort='') + mock_get_all.assert_called_once_with(0, -1, filter='', sort='', scope_uris='') @mock.patch.object(ResourceClient, 'get_by') def test_get_by_called_once(self, mock_get_by):