Merge "Revert "Upgrades: Add initialization stage to 'overcloud upgrade'""
This commit is contained in:
commit
291a55d093
|
@ -43,7 +43,6 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_not_called()
|
||||
upgrade_manager.upgrade_pre.assert_not_called()
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager', autospec=True)
|
||||
def test_upgrade_answerfile(self, mock_upgrade_manager):
|
||||
|
@ -75,7 +74,6 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_not_called()
|
||||
upgrade_manager.upgrade_pre.assert_not_called()
|
||||
|
||||
called_args = mock_upgrade_manager.call_args[1]
|
||||
self.assertEqual('/tmp/tht', called_args['tht_dir'])
|
||||
|
@ -131,26 +129,3 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
|
|||
upgrade_manager.get_status.assert_called_once_with()
|
||||
upgrade_manager.upgrade_post.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_not_called()
|
||||
upgrade_manager.upgrade_pre.assert_not_called()
|
||||
|
||||
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
|
||||
def test_upgrade_perform_pre(self, mock_upgrade_manager):
|
||||
upgrade_manager = mock_upgrade_manager.return_value
|
||||
upgrade_manager.get_status.return_value = (
|
||||
'UPDATE_COMPLETE', {})
|
||||
argslist = [
|
||||
'prepare',
|
||||
'--stack', 'overcloud',
|
||||
'--templates',
|
||||
]
|
||||
verifylist = [
|
||||
('stage', 'prepare'),
|
||||
('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_pre.assert_called_once_with()
|
||||
upgrade_manager.upgrade.assert_not_called()
|
||||
upgrade_manager.upgrade_post.assert_not_called()
|
||||
|
|
|
@ -33,8 +33,8 @@ class UpgradeOvercloud(command.Command):
|
|||
parser = super(UpgradeOvercloud, self).get_parser(prog_name)
|
||||
parser.add_argument(
|
||||
'stage',
|
||||
metavar="<prepare|start|finish>",
|
||||
choices=['prepare', 'start', 'finish'],
|
||||
metavar="<start|finish>",
|
||||
choices=['start', 'finish'],
|
||||
help=_('Stage of upgrade to perform.')
|
||||
)
|
||||
parser.add_argument(
|
||||
|
@ -90,7 +90,6 @@ class UpgradeOvercloud(command.Command):
|
|||
print("Starting stack upgrade on stack {0}".format(
|
||||
parsed_args.stack))
|
||||
stage_func = {
|
||||
"prepare": upgrade_manager.upgrade_pre,
|
||||
"start": upgrade_manager.upgrade,
|
||||
"finish": upgrade_manager.upgrade_post,
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue