openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Use swift bulk-delete when deleting a plan"

This commit is contained in:
Zuul 2018-09-06 12:40:01 +00:00 committed by Gerrit Code Review
parent 467bd49a58 f6891826c9
commit 7cb2f2491c
6 changed files with 35 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleo_common/actions/config.py
View File

@ -55,6 +55,7 @@ class GetOvercloudConfig(templates.ProcessTemplatesAction):
def run(self, context):
heat = self.get_orchestration_client(context)
swift = self.get_object_client(context)
swiftservice = self.get_object_service(context)
# Since the config-download directory is now a git repo, first download
# the existing config container if it exists so we can reuse the
@ -64,7 +65,7 @@ class GetOvercloudConfig(templates.ProcessTemplatesAction):
self.config_dir)
# Delete the existing container before we re-upload, otherwise
# files may not be fully overwritten.
swiftutils.delete_container(swift, self.container_config)
swiftutils.delete_container(swiftservice, self.container_config)
except swiftexceptions.ClientException as err:
if err.http_status != 404:
raise

8
tripleo_common/actions/plan.py
View File

@ -119,11 +119,11 @@ class DeletePlanAction(base.TripleOAction):
raise exception.StackInUseError(name=self.container)
try:
swift = self.get_object_client(context)
swiftutils.delete_container(swift, self.container)
swiftutils.delete_container(swift,
swift_service = self.get_object_service(context)
swiftutils.delete_container(swift_service, self.container)
swiftutils.delete_container(swift_service,
"%s-swift-rings" % self.container)
swiftutils.delete_container(swift,
swiftutils.delete_container(swift_service,
"%s-messages" % self.container)
except swiftexceptions.ClientException as ce:
LOG.exception("Swift error deleting plan.")

5
tripleo_common/tests/actions/test_config.py
View File

@ -57,13 +57,16 @@ class GetOvercloudConfigActionTest(base.TestCase):
self.ctx = mock.MagicMock()
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'get_object_service')
@mock.patch('tripleo_common.actions.base.TripleOAction.'
'get_orchestration_client')
@mock.patch('tripleo_common.utils.config.Config.download_config')
@mock.patch('tripleo_common.utils.tarball.create_tarball')
def test_run(self, mock_create_tarball,
mock_config,
mock_orchestration_client):
mock_orchestration_client,
mock_object_service):
heat = mock.MagicMock()
heat.stacks.get.return_value = mock.MagicMock(
stack_name='stack', id='stack_id')

20
tripleo_common/tests/actions/test_plan.py
View File

@ -264,10 +264,12 @@ class DeletePlanActionTest(base.TestCase):
self.assertRaises(exception.StackInUseError, action.run, self.ctx)
heat.stacks.get.assert_called_with(self.container_name)
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_service')
@mock.patch('tripleo_common.actions.base.TripleOAction.get_object_client')
@mock.patch(
'tripleo_common.actions.base.TripleOAction.get_orchestration_client')
def test_run(self, get_orchestration_client, get_obj_client_mock):
def test_run(self, get_orchestration_client, get_obj_client_mock,
get_obj_service_mock):
# setup swift
swift = mock.MagicMock()
@ -283,9 +285,14 @@ class DeletePlanActionTest(base.TestCase):
{'name': 'finally-another-name.yaml'}
]
)
get_obj_client_mock.return_value = swift
swift_service = mock.MagicMock()
swift_service.delete.return_value = ([
{'success': True},
])
get_obj_service_mock.return_value = swift_service
# setup heat
heat = mock.MagicMock()
heat.stacks.get = mock.Mock(
@ -296,16 +303,11 @@ class DeletePlanActionTest(base.TestCase):
action.run(self.ctx)
mock_calls = [
mock.call('overcloud', 'some-name.yaml'),
mock.call('overcloud', 'some-other-name.yaml'),
mock.call('overcloud', 'yet-some-other-name.yaml'),
mock.call('overcloud', 'finally-another-name.yaml')
mock.call(container='overcloud'),
]
swift.delete_object.assert_has_calls(
swift_service.delete.assert_has_calls(
mock_calls, any_order=True)
swift.delete_container.assert_called_with(self.container_name)
class ListRolesActionTest(base.TestCase):

26
tripleo_common/tests/utils/test_swift.py
View File

@ -37,29 +37,21 @@ class SwiftTest(base.TestCase):
]
)
self.swiftservice = mock.MagicMock()
self.swiftservice.delete.return_value = ([
{'success': True},
])
def test_delete_container_success(self):
swift_utils.empty_container(self.swiftclient, self.container_name)
swift_utils.delete_container(self.swiftservice,
self.container_name)
mock_calls = [
mock.call('overcloud', 'some-name.yaml'),
mock.call('overcloud', 'some-other-name.yaml'),
mock.call('overcloud', 'yet-some-other-name.yaml'),
mock.call('overcloud', 'finally-another-name.yaml')
mock.call(container=self.container_name),
]
self.swiftclient.delete_object.assert_has_calls(
self.swiftservice.delete.assert_has_calls(
mock_calls, any_order=True)
self.swiftclient.get_account.assert_called()
self.swiftclient.get_container.assert_called_with(self.container_name)
def test_delete_container_not_found(self):
self.assertRaises(ValueError,
swift_utils.empty_container,
self.swiftclient, 'idontexist')
self.swiftclient.get_account.assert_called()
self.swiftclient.get_container.assert_not_called()
self.swiftclient.delete_object.assert_not_called()
def test_create_container(self):
swift_utils.create_container(self.swiftclient, 'abc')
self.swiftclient.put_container.assert_called()

30
tripleo_common/utils/swift.py
View File

@ -19,7 +19,6 @@ import logging
import os
import tempfile
import six
from swiftclient.service import SwiftError
from swiftclient.service import SwiftUploadObject
@ -28,30 +27,11 @@ from tripleo_common.utils import tarball
LOG = logging.getLogger(__name__)
def empty_container(swiftclient, name):
container_names = [container["name"] for container
in swiftclient.get_account()[1]]
if name in container_names:
headers, objects = swiftclient.get_container(name)
# FIXME(rbrady): remove delete_object loop when
# LP#1615830 is fixed. See LP#1615825 for more info.
# delete files from plan
for o in objects:
swiftclient.delete_object(name, o['name'])
else:
error_text = "The {name} container does not exist.".format(name=name)
raise ValueError(error_text)
def delete_container(swiftclient, name):
try:
empty_container(swiftclient, name)
swiftclient.delete_container(name)
except ValueError as e:
# ValueError is raised when we can't find the container, which means
# that it's already deleted.
LOG.info(six.text_type(e))
def delete_container(swiftservice, name):
delres = swiftservice.delete(container=name)
if delres is None:
# A None return means the container didn't exist
LOG.info('Container %s not found', name)
def download_container(swiftclient, container, dest,