Merge "BnR added error msg in case there is no inventory" into stable/train
This commit is contained in:
commit
efc62d39ea
|
@ -34,12 +34,21 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
self.cmd = overcloud_backup.BackupOvercloud(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_noargs(self, mock_playbook):
|
||||
def test_overcloud_backup_noargs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -56,13 +65,20 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
extra_vars={}
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_init(self, mock_playbook):
|
||||
def test_overcloud_backup_init(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--init'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -79,14 +95,21 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
extra_vars={}
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_init_nfs(self, mock_playbook):
|
||||
def test_overcloud_backup_init_nfs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--init',
|
||||
'nfs'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -103,13 +126,20 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
extra_vars={}
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_setup_nfs(self, mock_playbook):
|
||||
def test_overcloud_backup_setup_nfs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-nfs'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -126,13 +156,20 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
extra_vars={}
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_setup_rear(self, mock_playbook):
|
||||
def test_overcloud_backup_setup_rear(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-rear',
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -156,14 +193,13 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
'--setup-nfs',
|
||||
'--setup-rear',
|
||||
'--inventory',
|
||||
'/tmp/test_inventory.yaml'
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
||||
calls = [call(logger=mock.ANY,
|
||||
workdir=constants.ANSIBLE_TRIPLEO_PLAYBOOKS,
|
||||
playbook='prepare-nfs-backup.yaml',
|
||||
|
@ -185,16 +221,22 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
|
||||
mock_playbook.assert_has_calls(calls)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_setup_rear_extra_vars_inline(self,
|
||||
mock_playbook):
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-rear',
|
||||
'--extra-vars',
|
||||
'{"tripleo_backup_and_restore_nfs_server": "192.168.24.1"}'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
extra_vars_dict = {
|
||||
|
@ -214,15 +256,22 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
extra_vars=extra_vars_dict
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_setup_rear_with_extra_vars(self, mock_playbook):
|
||||
def test_overcloud_backup_setup_rear_with_extra_vars(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-rear',
|
||||
'--extra-vars',
|
||||
'/tmp/test_vars.yaml'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -244,10 +293,9 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
def test_overcloud_backup_inventory(self, mock_playbook):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
'/tmp/test_inventory.yaml'
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
@ -262,3 +310,39 @@ class TestOvercloudBackup(utils.TestCommand):
|
|||
verbosity=1,
|
||||
extra_vars={}
|
||||
)
|
||||
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_no_inventory(self, mock_playbook):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
'/tmp/no_inventory.yaml'
|
||||
]
|
||||
verifylist = []
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.assertRaisesRegexp(
|
||||
RuntimeError,
|
||||
'The inventory file',
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_overcloud_backup_no_readable_inventory(self,
|
||||
mock_playbook,
|
||||
mock_access):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
mock_access.return_value = False
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
RuntimeError,
|
||||
'The inventory file',
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
|
|
@ -33,6 +33,8 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
self.cmd = undercloud_backup.BackupUndercloud(self.app, app_args)
|
||||
self.app.client_manager.workflow_engine = mock.Mock()
|
||||
self.workflow = self.app.client_manager.workflow_engine
|
||||
self.inventory = '/tmp/test_inventory.yaml'
|
||||
self.file = open(self.inventory, 'w').close()
|
||||
|
||||
@mock.patch('tripleoclient.workflows.undercloud_backup.backup',
|
||||
autospec=True)
|
||||
|
@ -114,11 +116,18 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
mock.ANY,
|
||||
{'sources_path': '/home/stack/,/tmp/foo.yaml'})
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_noargs(self, mock_playbook):
|
||||
def test_undercloud_backup_noargs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = []
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -135,13 +144,20 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
extra_vars=None
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_init(self, mock_playbook):
|
||||
def test_undercloud_backup_init(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--init'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -158,14 +174,21 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
extra_vars=None
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_init_nfs(self, mock_playbook):
|
||||
def test_undercloud_backup_init_nfs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--init',
|
||||
'nfs'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -182,13 +205,20 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
extra_vars=None
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_setup_nfs(self, mock_playbook):
|
||||
def test_undercloud_backup_setup_nfs(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-nfs'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -205,13 +235,20 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
extra_vars=None
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_setup_rear(self, mock_playbook):
|
||||
def test_undercloud_backup_setup_rear(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-rear'
|
||||
]
|
||||
verifylist = []
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
|
@ -226,24 +263,28 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
skip_tags=None,
|
||||
verbosity=1,
|
||||
extra_vars=None
|
||||
)
|
||||
)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_setup_rear_extra_vars_inline(self,
|
||||
mock_playbook):
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-rear',
|
||||
'--extra-vars',
|
||||
'{"tripleo_backup_and_restore_nfs_server": "192.168.24.1"}'
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
extra_vars_dict = {
|
||||
'tripleo_backup_and_restore_nfs_server': '192.168.24.1'
|
||||
}
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
mock_playbook.assert_called_once_with(
|
||||
logger=mock.ANY,
|
||||
|
@ -255,7 +296,7 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
verbosity=1,
|
||||
output_callback='tripleo',
|
||||
extra_vars=extra_vars_dict
|
||||
)
|
||||
)
|
||||
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook', autospec=True)
|
||||
def test_undercloud_backup_setup_nfs_rear_with_inventory(self,
|
||||
|
@ -264,10 +305,9 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
'--setup-nfs',
|
||||
'--setup-rear',
|
||||
'--inventory',
|
||||
'/tmp/test_inventory.yaml'
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
@ -293,16 +333,22 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
|
||||
mock_playbook.assert_has_calls(calls)
|
||||
|
||||
@mock.patch('os.path.isfile')
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_setup_nfs_with_extra_vars(self, mock_playbook):
|
||||
def test_undercloud_backup_setup_nfs_with_extra_vars(self,
|
||||
mock_playbook,
|
||||
mock_access,
|
||||
mock_isfile):
|
||||
arglist = [
|
||||
'--setup-nfs',
|
||||
'--extra-vars',
|
||||
'/tmp/test_vars.yaml'
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
mock_isfile.return_value = True
|
||||
mock_access.return_value = True
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
@ -323,10 +369,9 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
def test_undercloud_backup_inventory(self, mock_playbook):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
'/tmp/test_inventory.yaml'
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.cmd.take_action(parsed_args)
|
||||
|
@ -341,3 +386,39 @@ class TestUndercloudBackup(utils.TestCommand):
|
|||
verbosity=1,
|
||||
extra_vars=None
|
||||
)
|
||||
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_no_inventory(self, mock_playbook):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
'/tmp/no_inventory.yaml'
|
||||
]
|
||||
verifylist = []
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
self.assertRaisesRegexp(
|
||||
RuntimeError,
|
||||
'The inventory file',
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
||||
@mock.patch('os.access')
|
||||
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
||||
autospec=True)
|
||||
def test_undercloud_backup_no_readable_inventory(self,
|
||||
mock_playbook,
|
||||
mock_access):
|
||||
arglist = [
|
||||
'--inventory',
|
||||
self.inventory
|
||||
]
|
||||
verifylist = []
|
||||
mock_access.return_value = False
|
||||
|
||||
parsed_args = self.check_parser(self.cmd, arglist, verifylist)
|
||||
|
||||
self.assertRaisesRegexp(
|
||||
RuntimeError,
|
||||
'The inventory file',
|
||||
self.cmd.take_action,
|
||||
parsed_args)
|
||||
|
|
|
@ -137,6 +137,12 @@ class BackupOvercloud(command.Command):
|
|||
'tripleo_backup_and_restore_nfs_server'
|
||||
] = storage_ip
|
||||
|
||||
if not (os.path.isfile(parsed_args.inventory) and
|
||||
os.access(parsed_args.inventory, os.R_OK)):
|
||||
raise RuntimeError(
|
||||
_('The inventory file %s does not exist or is not '
|
||||
'readable') % (parsed_args.inventory,))
|
||||
|
||||
if parsed_args.setup_nfs is True or parsed_args.init == 'nfs':
|
||||
|
||||
LOG.debug(_('Setting up NFS Backup node'))
|
||||
|
|
|
@ -144,6 +144,12 @@ class BackupUndercloud(command.Command):
|
|||
|
||||
extra_vars = self._parse_extra_vars(parsed_args.extra_vars)
|
||||
|
||||
if not (os.path.isfile(parsed_args.inventory) and
|
||||
os.access(parsed_args.inventory, os.R_OK)):
|
||||
raise RuntimeError(
|
||||
_('The inventory file %s does not exist or is not '
|
||||
'readable') % (parsed_args.inventory,))
|
||||
|
||||
if parsed_args.setup_nfs is True or parsed_args.init == 'nfs':
|
||||
|
||||
self._run_ansible_playbook(
|
||||
|
|
Loading…
Reference in New Issue