Upgrades: Add finish stage to 'overcloud upgrade'
The overcloud upgrade will have cleanup to perform (like unpinning Nova). This enables this to be run via the finish stage. Change-Id: I4952b5d624b4d737a3b7485fff72d81502ea7695 Depends-On: I1b8fdf6bf817f2c2368607eff16f0e4e555fa0a8
This commit is contained in:
parent
1b44a458b1
commit
c0626c0fc9
|
@ -28,8 +28,9 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
self.cmd = overcloud_upgrade.UpgradeOvercloud(self.app, None)
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
|
||||
def test_upgrade_out(self, upgrade_manager):
|
||||
upgrade_manager.return_value.get_status.return_value = (
|
||||
def test_upgrade_out(self, mock_upgrade_manager):
|
||||
upgrade_manager = mock_upgrade_manager.return_value
|
||||
upgrade_manager.get_status.return_value = (
|
||||
'UPDATE_COMPLETE', {})
|
||||
argslist = ['start', '--stack', 'overcloud', '--templates']
|
||||
verifylist = [
|
||||
|
@ -39,11 +40,12 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
]
|
||||
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
upgrade_manager.get_status.called_once()
|
||||
upgrade_manager.upgrade.called_once()
|
||||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_not_called()
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
|
||||
def test_upgrade_answerfile(self, upgrade_manager):
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager', autospec=True)
|
||||
def test_upgrade_answerfile(self, mock_upgrade_manager):
|
||||
answers = ("templates: {templates}\n"
|
||||
"environments:\n"
|
||||
" - {environment}\n")
|
||||
|
@ -51,8 +53,10 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
mock_open = mock.mock_open(read_data=answers.format(
|
||||
templates='/tmp/tht', environment='/tmp/env'))
|
||||
|
||||
upgrade_manager = mock_upgrade_manager.return_value
|
||||
|
||||
with mock.patch('six.moves.builtins.open', mock_open):
|
||||
upgrade_manager.return_value.get_status.return_value = (
|
||||
upgrade_manager.get_status.return_value = (
|
||||
'UPDATE_COMPLETE', {})
|
||||
arglist = [
|
||||
'start',
|
||||
|
@ -67,19 +71,22 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
upgrade_manager.get_status.called_once()
|
||||
upgrade_manager.upgrade.called_once()
|
||||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_not_called()
|
||||
|
||||
called_args = upgrade_manager.call_args[1]
|
||||
called_args = mock_upgrade_manager.call_args[1]
|
||||
self.assertEqual('/tmp/tht', called_args['tht_dir'])
|
||||
self.assertEqual(['/tmp/env'], called_args['environment_files'])
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
|
||||
def test_upgrade_answerfile_just_environments(self, upgrade_manager):
|
||||
def test_upgrade_answerfile_just_environments(self, mock_upgrade_manager):
|
||||
mock_open = mock.mock_open(read_data="environments:\n - /tmp/env\n")
|
||||
|
||||
upgrade_manager = mock_upgrade_manager.return_value
|
||||
|
||||
with mock.patch('six.moves.builtins.open', mock_open):
|
||||
upgrade_manager.return_value.get_status.return_value = (
|
||||
upgrade_manager.get_status.return_value = (
|
||||
'UPDATE_COMPLETE', {})
|
||||
arglist = [
|
||||
'start',
|
||||
|
@ -94,10 +101,31 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
upgrade_manager.get_status.called_once()
|
||||
upgrade_manager.upgrade.called_once()
|
||||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_called_once_with()
|
||||
|
||||
called_args = upgrade_manager.call_args[1]
|
||||
called_args = mock_upgrade_manager.call_args[1]
|
||||
self.assertEqual('/usr/share/openstack-tripleo-heat-templates/',
|
||||
called_args['tht_dir'])
|
||||
self.assertEqual(['/tmp/env'], called_args['environment_files'])
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
|
||||
def test_upgrade_perform_post(self, mock_upgrade_manager):
|
||||
upgrade_manager = mock_upgrade_manager.return_value
|
||||
upgrade_manager.get_status.return_value = (
|
||||
'UPDATE_COMPLETE', {})
|
||||
argslist = [
|
||||
'finish',
|
||||
'--stack', 'overcloud',
|
||||
'--templates',
|
||||
]
|
||||
verifylist = [
|
||||
('stage', 'finish'),
|
||||
('stack', 'overcloud'),
|
||||
('templates', '/usr/share/openstack-tripleo-heat-templates/'),
|
||||
]
|
||||
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
||||
self.cmd.take_action(parsed_args)
|
||||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_not_called()
|
||||
|
|
|
@ -33,8 +33,8 @@ class UpgradeOvercloud(command.Command):
|
|||
parser = super(UpgradeOvercloud, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
'stage',
|
||||
metavar="<start>",
|
||||
choices=['start'],
|
||||
metavar="<start|finish>",
|
||||
choices=['start', 'finish'],
|
||||
help=_('Stage of upgrade to perform.')
|
||||
)
|
||||
parser.add_argument(
|
||||
|
@ -61,7 +61,6 @@ class UpgradeOvercloud(command.Command):
|
|||
help=_('Path to a YAML file with arguments and parameters. Cannot '
|
||||
'be used with --templates.')
|
||||
)
|
||||
parser.add_argument
|
||||
return parser
|
||||
|
||||
def take_action(self, parsed_args):
|
||||
|
@ -92,7 +91,8 @@ class UpgradeOvercloud(command.Command):
|
|||
print("Starting stack upgrade on stack {0}".format(
|
||||
parsed_args.stack))
|
||||
stage_func = {
|
||||
"start": upgrade_manager.upgrade
|
||||
"start": upgrade_manager.upgrade,
|
||||
"finish": upgrade_manager.upgrade_post,
|
||||
}
|
||||
stage_func[parsed_args.stage]()
|
||||
else:
|
||||
|
|
Loading…
Reference in New Issue