x
/
proliantutils
Code Issues Proposed changes

Merge "Allow local_gb to be 0"

This commit is contained in:
Jenkins 2017-08-10 04:37:57 +00:00 committed by Gerrit Code Review
parent 5b89730e31 640560fdbc
commit c2ce73795d
2 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
proliantutils/ilo/client.py
View File

@ -514,14 +514,15 @@ class IloClient(operations.IloOperations):
if disksize:
data['properties']['local_gb'] = disksize
else:
msg = self._('Snmp inspection failed to '
'get the disk size')
msg = self._('SNMP inspection failed to '
'get the disk size. Returning '
'local_gb as 0.')
LOG.debug(msg)
raise exception.IloError(msg)
else:
msg = self._("Inspection failed to get the disk size")
msg = self._("SNMP credentials were not set and "
"RIBCL/Redfish failed to get the disk size. "
"Returning local_gb as 0.")
LOG.debug(msg)
raise exception.IloError(msg)
return data
def get_server_capabilities(self):

25
proliantutils/tests/ilo/test_client.py
View File

@ -908,15 +908,14 @@ class IloClientTestCase(testtools.TestCase):
@mock.patch.object(client.IloClient, '_call_method')
@mock.patch.object(snmp_cpqdisk_sizes, 'get_local_gb')
def test_get_essential_prop_no_snmp_raises(self,
snmp_mock,
call_mock):
def test_get_essential_prop_no_snmp_local_gb_0(self,
snmp_mock,
call_mock):
self.client.model = 'Gen9'
properties = {'local_gb': 0}
data = {'properties': properties}
call_mock.return_value = data
self.assertRaises(exception.IloError,
self.client.get_essential_properties)
self.client.get_essential_properties()
call_mock.assert_called_once_with('get_essential_properties')
self.assertFalse(snmp_mock.called)
@ -944,9 +943,9 @@ class IloClientTestCase(testtools.TestCase):
@mock.patch.object(client.IloClient, '_call_method')
@mock.patch.object(snmp_cpqdisk_sizes, 'get_local_gb')
def test_get_essential_prop_snmp_true_raises(self,
snmp_mock,
call_mock):
def test_get_essential_prop_snmp_true_local_gb_0(self,
snmp_mock,
call_mock):
self.client.model = 'Gen9'
snmp_credentials = {'auth_user': 'user',
'auth_prot_pp': '1234',
@ -959,16 +958,15 @@ class IloClientTestCase(testtools.TestCase):
data = {'properties': properties}
call_mock.return_value = data
snmp_mock.return_value = 0
self.assertRaises(exception.IloError,
self.client.get_essential_properties)
self.client.get_essential_properties()
call_mock.assert_called_once_with('get_essential_properties')
snmp_mock.assert_called_once_with(self.client.info['address'],
snmp_credentials)
@mock.patch.object(snmp_cpqdisk_sizes, 'get_local_gb')
@mock.patch.object(client.IloClient, '_call_method')
def test_get_essential_prop_snmp_false_raises(self, call_mock,
snmp_mock):
def test_get_essential_prop_snmp_false_local_gb_0(self, call_mock,
snmp_mock):
self.client.model = 'Gen9'
snmp_credentials = {'auth_user': 'user',
@ -982,8 +980,7 @@ class IloClientTestCase(testtools.TestCase):
properties = {'local_gb': 0}
data = {'properties': properties}
call_mock.return_value = data
self.assertRaises(exception.IloError,
self.client.get_essential_properties)
self.client.get_essential_properties()
call_mock.assert_called_once_with('get_essential_properties')
self.assertFalse(snmp_mock.called)