From e66ddd60926df8d5432f7ba2b215eeb1239bf9f9 Mon Sep 17 00:00:00 2001 From: Steve Martinelli Date: Fri, 30 Sep 2016 01:30:39 -0400 Subject: Add support for P and Q release names The P and Q releases have been named [1], add them to versionutils. [1] http://lists.openstack.org/pipermail/openstack-dev/2016-August/101891.html Change-Id: I0f386048cdd63fd757c6833d5fb4c1d1441c9d7a --- oslo_log/tests/unit/test_versionutils.py | 17 ++++++++++++++++- oslo_log/versionutils.py | 4 ++++ 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/oslo_log/tests/unit/test_versionutils.py b/oslo_log/tests/unit/test_versionutils.py index f3a65f9..3084914 100644 --- a/oslo_log/tests/unit/test_versionutils.py +++ b/oslo_log/tests/unit/test_versionutils.py @@ -354,7 +354,22 @@ class DeprecatedTestCase(test_base.BaseTestCase): self.assert_deprecated(mock_reporter, what='OutdatedClass()', as_of='Newton', - remove_in='P') + remove_in='Pike') + + @mock.patch('oslo_log.versionutils.report_deprecated_feature') + def test_deprecated_ocata_plus_two(self, mock_reporter): + + @versionutils.deprecated(as_of=versionutils.deprecated.OCATA, + remove_in=+2) + class OutdatedClass(object): + pass + obj = OutdatedClass() + + self.assertIsInstance(obj, OutdatedClass) + self.assert_deprecated(mock_reporter, + what='OutdatedClass()', + as_of='Ocata', + remove_in='Queens') @mock.patch('oslo_log.versionutils.report_deprecated_feature') def test_deprecated_message(self, mock_reporter): diff --git a/oslo_log/versionutils.py b/oslo_log/versionutils.py index 2e366b4..b77e1bb 100644 --- a/oslo_log/versionutils.py +++ b/oslo_log/versionutils.py @@ -68,6 +68,8 @@ _RELEASES = { 'M': 'Mitaka', 'N': 'Newton', 'O': 'Ocata', + 'P': 'Pike', + 'Q': 'Queens', } @@ -140,6 +142,8 @@ class deprecated(object): MITAKA = 'M' NEWTON = 'N' OCATA = 'O' + PIKE = 'P' + QUEENS = 'Q' def __init__(self, as_of, in_favor_of=None, remove_in=2, what=None): """Initialize decorator -- cgit v1.2.1