openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Revert "Upgrades: Add finish stage to 'overcloud upgrade'""

This commit is contained in:
Jenkins 2016-09-21 09:34:04 +00:00 committed by Gerrit Code Review
parent 291a55d093 d280c1950a
commit 8aa5a60ef7
2 changed files with 19 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
tripleoclient/tests/v1/overcloud_upgrade/test_overcloud_upgrade.py
View File

@ -28,9 +28,8 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
self.cmd = overcloud_upgrade.UpgradeOvercloud(self.app, None)
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
def test_upgrade_out(self, mock_upgrade_manager):
upgrade_manager = mock_upgrade_manager.return_value
upgrade_manager.get_status.return_value = (
def test_upgrade_out(self, upgrade_manager):
upgrade_manager.return_value.get_status.return_value = (
'UPDATE_COMPLETE', {})
argslist = ['start', '--stack', 'overcloud', '--templates']
verifylist = [
@ -40,12 +39,11 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
]
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.assert_called_once_with()
upgrade_manager.upgrade_post.assert_not_called()
upgrade_manager.get_status.called_once()
upgrade_manager.upgrade.called_once()
@mock.patch('tripleo_common.upgrade.StackUpgradeManager', autospec=True)
def test_upgrade_answerfile(self, mock_upgrade_manager):
@mock.patch('tripleo_common.upgrade.StackUpgradeManager')
def test_upgrade_answerfile(self, upgrade_manager):
answers = ("templates: {templates}\n"
"environments:\n"
" - {environment}\n")
@ -53,10 +51,8 @@ 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.get_status.return_value = (
upgrade_manager.return_value.get_status.return_value = (
'UPDATE_COMPLETE', {})
arglist = [
'start',
@ -71,22 +67,19 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args)
upgrade_manager.get_status.assert_called_once_with()
upgrade_manager.upgrade.assert_called_once_with()
upgrade_manager.upgrade_post.assert_not_called()
upgrade_manager.get_status.called_once()
upgrade_manager.upgrade.called_once()
called_args = mock_upgrade_manager.call_args[1]
called_args = 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, mock_upgrade_manager):
def test_upgrade_answerfile_just_environments(self, 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.get_status.return_value = (
upgrade_manager.return_value.get_status.return_value = (
'UPDATE_COMPLETE', {})
arglist = [
'start',
@ -101,31 +94,10 @@ class TestOvercloudUpgrade(fakes.TestOvercloudUpgrade):
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
self.cmd.take_action(parsed_args)
upgrade_manager.get_status.assert_called_once_with()
upgrade_manager.upgrade.assert_called_once_with()
upgrade_manager.get_status.called_once()
upgrade_manager.upgrade.called_once()
called_args = mock_upgrade_manager.call_args[1]
called_args = 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()

8
tripleoclient/v1/overcloud_upgrade.py
View File

@ -33,8 +33,8 @@ class UpgradeOvercloud(command.Command):
parser = super(UpgradeOvercloud, self).get_parser(prog_name)
parser.add_argument(
'stage',
metavar="<start|finish>",
choices=['start', 'finish'],
metavar="<start>",
choices=['start'],
help=_('Stage of upgrade to perform.')
)
parser.add_argument(
@ -61,6 +61,7 @@ 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):
@ -90,8 +91,7 @@ class UpgradeOvercloud(command.Command):
print("Starting stack upgrade on stack {0}".format(
parsed_args.stack))
stage_func = {
"start": upgrade_manager.upgrade,
"finish": upgrade_manager.upgrade_post,
"start": upgrade_manager.upgrade
}
stage_func[parsed_args.stage]()
else: