diff --git a/tripleoclient/tests/v1/overcloud_backup/test_backup.py b/tripleoclient/tests/v1/overcloud_backup/test_backup.py index d08b68992..701edcd8a 100644 --- a/tripleoclient/tests/v1/overcloud_backup/test_backup.py +++ b/tripleoclient/tests/v1/overcloud_backup/test_backup.py @@ -50,6 +50,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='cli-overcloud-backup.yaml', inventory=parsed_args.inventory, tags='bar_create_recover_image', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={} @@ -72,6 +73,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-overcloud-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_rear', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={} @@ -95,6 +97,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-nfs-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_nfs_server', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={} @@ -117,6 +120,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-nfs-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_nfs_server', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={} @@ -139,6 +143,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-overcloud-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_rear', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={} @@ -164,6 +169,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-nfs-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_nfs_server', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars={}), @@ -171,6 +177,7 @@ class TestOvercloudBackup(utils.TestCommand): workdir=constants.ANSIBLE_TRIPLEO_PLAYBOOKS, playbook='prepare-overcloud-backup.yaml', inventory=parsed_args.inventory, + output_callback='tripleo', tags='bar_setup_rear', skip_tags=None, verbosity=1, @@ -201,6 +208,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-overcloud-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_rear', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars=extra_vars_dict @@ -225,6 +233,7 @@ class TestOvercloudBackup(utils.TestCommand): playbook='prepare-overcloud-backup.yaml', inventory=parsed_args.inventory, tags='bar_setup_rear', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars='/tmp/test_vars.yaml' @@ -249,6 +258,7 @@ class TestOvercloudBackup(utils.TestCommand): inventory=parsed_args.inventory, tags='bar_create_recover_image', skip_tags=None, + output_callback='tripleo', verbosity=1, extra_vars={} ) diff --git a/tripleoclient/tests/v1/undercloud/test_backup.py b/tripleoclient/tests/v1/undercloud/test_backup.py index e6f556202..059b9bd44 100644 --- a/tripleoclient/tests/v1/undercloud/test_backup.py +++ b/tripleoclient/tests/v1/undercloud/test_backup.py @@ -130,6 +130,7 @@ class TestUndercloudBackup(utils.TestCommand): inventory=mock.ANY, tags='bar_create_recover_image', skip_tags=None, + output_callback='tripleo', verbosity=1, extra_vars=None ) @@ -152,6 +153,7 @@ class TestUndercloudBackup(utils.TestCommand): inventory=mock.ANY, tags='bar_setup_rear', skip_tags=None, + output_callback='tripleo', verbosity=1, extra_vars=None ) @@ -174,6 +176,7 @@ class TestUndercloudBackup(utils.TestCommand): playbook='prepare-nfs-backup.yaml', inventory=mock.ANY, tags='bar_setup_nfs_server', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars=None @@ -195,6 +198,7 @@ class TestUndercloudBackup(utils.TestCommand): workdir=constants.ANSIBLE_TRIPLEO_PLAYBOOKS, playbook='prepare-nfs-backup.yaml', inventory=mock.ANY, + output_callback='tripleo', tags='bar_setup_nfs_server', skip_tags=None, verbosity=1, @@ -218,6 +222,7 @@ class TestUndercloudBackup(utils.TestCommand): playbook='prepare-undercloud-backup.yaml', inventory=mock.ANY, tags='bar_setup_rear', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars=None @@ -248,6 +253,7 @@ class TestUndercloudBackup(utils.TestCommand): tags='bar_setup_rear', skip_tags=None, verbosity=1, + output_callback='tripleo', extra_vars=extra_vars_dict ) @@ -272,6 +278,7 @@ class TestUndercloudBackup(utils.TestCommand): inventory=mock.ANY, tags='bar_setup_nfs_server', skip_tags=None, + output_callback='tripleo', verbosity=1, extra_vars=None), call(logger=mock.ANY, @@ -280,6 +287,7 @@ class TestUndercloudBackup(utils.TestCommand): inventory=mock.ANY, tags='bar_setup_rear', skip_tags=None, + output_callback='tripleo', verbosity=1, extra_vars=None)] @@ -306,6 +314,7 @@ class TestUndercloudBackup(utils.TestCommand): tags='bar_setup_nfs_server', skip_tags=None, verbosity=1, + output_callback='tripleo', extra_vars='/tmp/test_vars.yaml' ) @@ -327,6 +336,7 @@ class TestUndercloudBackup(utils.TestCommand): playbook='cli-undercloud-backup.yaml', inventory=mock.ANY, tags='bar_create_recover_image', + output_callback='tripleo', skip_tags=None, verbosity=1, extra_vars=None diff --git a/tripleoclient/v1/overcloud_backup.py b/tripleoclient/v1/overcloud_backup.py index 2e5518cee..d3801308e 100644 --- a/tripleoclient/v1/overcloud_backup.py +++ b/tripleoclient/v1/overcloud_backup.py @@ -189,6 +189,7 @@ class BackupOvercloud(command.Command): tags=tags, skip_tags=skip_tags, verbosity=self.app_args.verbose_level, + output_callback='tripleo', extra_vars=extra_vars ) diff --git a/tripleoclient/v1/undercloud_backup.py b/tripleoclient/v1/undercloud_backup.py index c6f896270..4347f8c87 100644 --- a/tripleoclient/v1/undercloud_backup.py +++ b/tripleoclient/v1/undercloud_backup.py @@ -191,6 +191,7 @@ class BackupUndercloud(command.Command): tags=tags, skip_tags=skip_tags, verbosity=self.app_args.verbose_level, + output_callback='tripleo', extra_vars=extra_vars )