diff --git a/manila/cmd/all.py b/manila/cmd/all.py index 1893874b64..fcc759b7cf 100755 --- a/manila/cmd/all.py +++ b/manila/cmd/all.py @@ -33,11 +33,13 @@ import sys from oslo_config import cfg from oslo_log import log +from oslo_log import versionutils from manila import i18n i18n.enable_lazy() from manila.common import config # Need to register global_opts +from manila.i18n import _ from manila.i18n import _LE from manila import service from manila import utils @@ -54,6 +56,10 @@ def main(): log.setup(CONF, "manila") LOG = log.getLogger('manila.all') + msg = _('manila-all is deprecated in Newton and ' + 'will be removed in Ocata.') + versionutils.report_deprecated_feature(LOG, msg) + utils.monkey_patch() launcher = service.process_launcher() # manila-api diff --git a/manila/tests/cmd/test_all.py b/manila/tests/cmd/test_all.py index e8cebd22a3..3196f6ad07 100644 --- a/manila/tests/cmd/test_all.py +++ b/manila/tests/cmd/test_all.py @@ -18,6 +18,7 @@ import sys import ddt import mock from oslo_log import log +from oslo_log import versionutils from manila.cmd import all as manila_all from manila import service @@ -41,6 +42,7 @@ class ManilaCmdAllTestCase(test.TestCase): self.mock_object(service, 'process_launcher') self.mock_object(service, 'WSGIService') self.mock_object(service.Service, 'create') + self.mock_object(versionutils, 'report_deprecated_feature') self.wsgi_service = service.WSGIService.return_value self.service = service.Service.create.return_value self.fake_log = log.getLogger.return_value @@ -51,6 +53,7 @@ class ManilaCmdAllTestCase(test.TestCase): log.setup.assert_called_once_with(CONF, "manila") log.register_options.assert_called_once_with(CONF) log.getLogger.assert_called_once_with('manila.all') + self.assertEqual(versionutils.report_deprecated_feature.call_count, 1) utils.monkey_patch.assert_called_once_with() service.process_launcher.assert_called_once_with() service.WSGIService.assert_called_once_with('osapi_share')