Merge "Throw an error/exception when interactive overcloud update fails"
This commit is contained in:
commit
fe796eeb31
@ -16,6 +16,7 @@
|
|||||||
import mock
|
import mock
|
||||||
import tempfile
|
import tempfile
|
||||||
|
|
||||||
|
from tripleoclient import exceptions
|
||||||
from tripleoclient.tests.v1.overcloud_update import fakes
|
from tripleoclient.tests.v1.overcloud_update import fakes
|
||||||
from tripleoclient.v1 import overcloud_update
|
from tripleoclient.v1 import overcloud_update
|
||||||
|
|
||||||
@ -31,7 +32,7 @@ class TestOvercloudUpdate(fakes.TestOvercloudUpdate):
|
|||||||
@mock.patch('tripleo_common.update.PackageUpdateManager')
|
@mock.patch('tripleo_common.update.PackageUpdateManager')
|
||||||
def test_update_out(self, update_manager):
|
def test_update_out(self, update_manager):
|
||||||
update_manager.return_value.get_status.return_value = (
|
update_manager.return_value.get_status.return_value = (
|
||||||
'UPDATE_COMPLETE', {})
|
'COMPLETE', {})
|
||||||
argslist = ['overcloud', '-i', '--templates']
|
argslist = ['overcloud', '-i', '--templates']
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('stack', 'overcloud'),
|
('stack', 'overcloud'),
|
||||||
@ -57,7 +58,7 @@ class TestOvercloudUpdate(fakes.TestOvercloudUpdate):
|
|||||||
answerfile.flush()
|
answerfile.flush()
|
||||||
|
|
||||||
update_manager.return_value.get_status.return_value = (
|
update_manager.return_value.get_status.return_value = (
|
||||||
'UPDATE_COMPLETE', {})
|
'COMPLETE', {})
|
||||||
argslist = ['overcloud', '-i', '--answers-file', answerfile.name]
|
argslist = ['overcloud', '-i', '--answers-file', answerfile.name]
|
||||||
verifylist = [
|
verifylist = [
|
||||||
('stack', 'overcloud'),
|
('stack', 'overcloud'),
|
||||||
@ -74,3 +75,17 @@ class TestOvercloudUpdate(fakes.TestOvercloudUpdate):
|
|||||||
called_args = update_manager.call_args[1]
|
called_args = update_manager.call_args[1]
|
||||||
self.assertEqual(called_args['tht_dir'], '/dev/null')
|
self.assertEqual(called_args['tht_dir'], '/dev/null')
|
||||||
self.assertEqual(called_args['environment_files'], ['/dev/null'])
|
self.assertEqual(called_args['environment_files'], ['/dev/null'])
|
||||||
|
|
||||||
|
@mock.patch('tripleo_common.update.PackageUpdateManager')
|
||||||
|
def test_update_failed(self, update_manager):
|
||||||
|
update_manager.return_value.get_status.return_value = (
|
||||||
|
'FAILED', {})
|
||||||
|
argslist = ['overcloud', '-i', '--templates']
|
||||||
|
verifylist = [
|
||||||
|
('stack', 'overcloud'),
|
||||||
|
('interactive', True),
|
||||||
|
('templates', '/usr/share/openstack-tripleo-heat-templates/')
|
||||||
|
]
|
||||||
|
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
||||||
|
self.assertRaises(exceptions.DeploymentError,
|
||||||
|
self.cmd.take_action, parsed_args)
|
||||||
|
@ -23,6 +23,7 @@ from openstackclient.i18n import _
|
|||||||
from tripleo_common import update
|
from tripleo_common import update
|
||||||
|
|
||||||
from tripleoclient import constants
|
from tripleoclient import constants
|
||||||
|
from tripleoclient import exceptions
|
||||||
|
|
||||||
|
|
||||||
class UpdateOvercloud(command.Command):
|
class UpdateOvercloud(command.Command):
|
||||||
@ -97,5 +98,8 @@ class UpdateOvercloud(command.Command):
|
|||||||
|
|
||||||
if parsed_args.interactive:
|
if parsed_args.interactive:
|
||||||
update_manager.do_interactive_update()
|
update_manager.do_interactive_update()
|
||||||
|
status, _ = update_manager.get_status()
|
||||||
|
if status not in ['COMPLETE']:
|
||||||
|
raise exceptions.DeploymentError("Stack update failed.")
|
||||||
else:
|
else:
|
||||||
print("stack {0} status: {1}".format(parsed_args.stack, status))
|
print("stack {0} status: {1}".format(parsed_args.stack, status))
|
||||||
|
Loading…
Reference in New Issue
Block a user