openstack/cinder
Code Issues Proposed changes

Merge "Huawei: Don't fail when port group does not exist"

Browse Source
This commit is contained in:
Jenkins 2016-02-26 18:19:54 +00:00 committed by Gerrit Code Review
commit 0018c92d96
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cinder/tests/unit/test_huawei_drivers.py
View File

@ -3034,6 +3034,12 @@ class HuaweiISCSIDriverTestCase(test.TestCase):
op.get_replica_info(replica_id)
op._is_status(None, {'key': 'volue'}, None)
@mock.patch.object(rest_client.RestClient, 'call',
return_value={"error": {"code": 0}})
def test_get_tgt_port_group_no_portg_exist(self, mock_call):
portg = self.driver.client.get_tgt_port_group('test_portg')
self.assertIsNone(portg)
class FCSanLookupService(object):

2
cinder/volume/drivers/huawei/rest_client.py
View File

@ -369,8 +369,6 @@ class RestClient(object):
msg = _('Find portgroup error.')
self._assert_rest_result(result, msg)
msg = _('Can not find the portgroup on the array.')
self._assert_data_in_result(result, msg)
return self._get_id_from_result(result, tgt_port_group, 'NAME')