openstack
/
python-masakariclient
Code Issues Proposed changes

Delete segment and host shouldn't ignore not found error 

If you pass non-existing segment-id to segment delete command, then
it shows `NoneType' object has no attribute 'to_dict` error on the
command console.

This patch fixes the above issue by passing `ignore_missing=False`
parameter to the segment and host delete client API so that it will
raise ResourceNotFound exception. Added unit tests for the same.

Closes-Bug: #1801905
Change-Id: I9aa0d5818cc8669b2f54fdc69ace3db2ea36e96d
This commit is contained in:
jayashri bidwe 2018-11-15 10:22:22 +05:30
parent 71ce1fbb4a
commit e334d93583
2 changed files with 63 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
masakariclient/tests/unit/v1/test_shell.py
View File

@ -17,9 +17,16 @@ test_masakariclient
Tests for `masakariclient` module.
"""
import ddt
import mock
import six
import sys
from openstack import exceptions as sdk_exc
from openstack.instance_ha.v1 import _proxy
from masakariclient.common.i18n import _
from masakariclient.common import utils
from masakariclient import shell
from masakariclient.tests import base
@ -204,6 +211,31 @@ class TestV1Shell(base.TestCase):
mock_get_uuid_by_name.assert_called_once_with(service, args.id)
mock_print_dict.assert_called_once_with(self.segment_vals)
@mock.patch.object(utils, 'get_uuid_by_name')
@mock.patch.object(_proxy.Proxy, 'delete_segment')
def test_do_segment_delete_with_non_existing_uuid(
self, mock_get_uuid_by_name, mock_delete_segment):
mock_get_uuid_by_name.return_value = self.segment_vals.get('uuid')
expected_msg = _("No failover segment with "
"id (%s)") % mock_get_uuid_by_name
def fake_delete_segment(self, mock_get_uuid_by_name,
ignore_missing=False):
if not ignore_missing:
raise sdk_exc.ResourceNotFound(expected_msg)
mock_delete_segment.side_effect = fake_delete_segment
service = mock.Mock()
args = mock.Mock()
original = sys.stdout
sys.stdout = six.StringIO()
ms.do_segment_delete(service, args)
output = sys.stdout.getvalue()
sys.stdout = original
self.assertIn(expected_msg, output)
@mock.patch.object(utils, 'print_list')
@mock.patch.object(utils, 'get_uuid_by_name')
def test_do_host_list(self, mock_get_uuid_by_name, mock_print_list):
@ -309,3 +341,30 @@ class TestV1Shell(base.TestCase):
mock_get_uuid_by_name.assert_any_call(
service, args.id, segment=self.segment_vals.get('uuid'))
mock_print_dict.assert_called_once_with(self.hosts_vals)
@mock.patch.object(utils, 'get_uuid_by_name')
@mock.patch.object(_proxy.Proxy, 'delete_host')
def test_do_host_delete_with_non_existing_uuid(self,
mock_get_uuid_by_name,
mock_delete_host):
mock_get_uuid_by_name.return_value = self.segment_vals.get('uuid')
host_id = self.hosts_vals.get('uuid')
expected_msg = _("Host '%(host_id)s' under failover_segment " "'"
"%(seg_id)s' ""could not be found") % {
'host_id': host_id, 'seg_id': mock_get_uuid_by_name}
def fake_delete_host(
host_id, mock_get_uuid_by_name, ignore_missing=False):
if not ignore_missing:
raise sdk_exc.ResourceNotFound(expected_msg)
mock_delete_host.side_effect = fake_delete_host
service = mock.Mock()
args = mock.Mock()
original = sys.stdout
sys.stdout = six.StringIO()
ms.do_host_delete(service, args)
output = sys.stdout.getvalue()
sys.stdout = original
self.assertIn(expected_msg, output)

8
masakariclient/v1/shell.py
View File

@ -163,7 +163,7 @@ def do_segment_delete(service, args):
try:
segment_id = utils.get_uuid_by_name(
service, args.id)
segment = service.delete_segment(segment_id, ignore_missing=True)
segment = service.delete_segment(segment_id, ignore_missing=False)
utils.print_dict(segment.to_dict())
except Exception as e:
print(e)
@ -285,8 +285,8 @@ def do_host_delete(service, args):
service, args.segment_id)
host_id = utils.get_uuid_by_name(
service, args.id, segment=segment_id)
host = service.delete_host(host_id, segment_id=segment_id)
if host:
utils.print_dict(host.to_dict())
host = service.delete_host(host_id, segment_id=segment_id,
ignore_missing=False)
utils.print_dict(host.to_dict())
except Exception as e:
print(e)