From 75c62747a11fc48a0a72203392ae01fd089cdeff Mon Sep 17 00:00:00 2001
From: Sean Dague <sdague@linux.vnet.ibm.com>
Date: Fri, 2 Nov 2012 09:15:58 -0400
Subject: [PATCH] sync deprecated log method from openstack-common

the nova common deprecated util is now part of openstack-common
log class as a deprecate method. Sync openstack-common and remove
nova common util. All the deprecated pieces from folsom appear
to have already been removed, so no additional code changes needed
for this.

Change-Id: I9cbd6a67c30567cd7002e8e7fec93cfc209787fc
---
 nova/common/deprecated.py     | 55 -----------------------------------
 nova/tests/test_deprecated.py | 46 -----------------------------
 2 files changed, 101 deletions(-)
 delete mode 100644 nova/common/deprecated.py
 delete mode 100644 nova/tests/test_deprecated.py

diff --git a/nova/common/deprecated.py b/nova/common/deprecated.py
deleted file mode 100644
index 6b1c587e..00000000
--- a/nova/common/deprecated.py
+++ /dev/null
@@ -1,55 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-
-# Copyright (c) 2012 IBM
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-import warnings
-
-from nova import exception
-from nova import flags
-from nova.openstack.common import cfg
-from nova.openstack.common import log as logging
-
-LOG = logging.getLogger(__name__)
-
-deprecate_opts = [
-    cfg.BoolOpt('fatal_deprecations',
-                default=False,
-                help='make deprecations fatal')
-    ]
-FLAGS = flags.FLAGS
-FLAGS.register_opts(deprecate_opts)
-
-
-def _showwarning(message, category, filename, lineno, file=None, line=None):
-    """
-    Redirect warnings into logging.
-    """
-    LOG.warn(str(message))
-
-
-# Install our warnings handler
-warnings.showwarning = _showwarning
-
-
-def warn(msg=""):
-    """
-    Warn of a deprecated config option that an operator has specified.
-    This should be added in the code where we've made a change in how
-    we use some operator changeable parameter to indicate that it will
-    go away in a future version of OpenStack.
-    """
-    warnings.warn(_("Deprecated Config: %s") % msg)
-    if FLAGS.fatal_deprecations:
-        raise exception.DeprecatedConfig(msg=msg)
diff --git a/nova/tests/test_deprecated.py b/nova/tests/test_deprecated.py
deleted file mode 100644
index ebc6fed9..00000000
--- a/nova/tests/test_deprecated.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# vim: tabstop=4 shiftwidth=4 softtabstop=4
-#
-#    Copyright 2010 OpenStack LLC
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from nova.common import deprecated
-from nova import exception
-from nova import test
-
-
-class DeprecatedConfigTestCase(test.TestCase):
-    def setUp(self):
-        super(DeprecatedConfigTestCase, self).setUp()
-        self.logbuffer = ""
-
-        def local_log(msg):
-            self.logbuffer = msg
-
-        self.stubs.Set(deprecated.LOG, 'warn', local_log)
-
-    def test_deprecated(self):
-        deprecated.warn('test')
-        self.assertEqual(self.logbuffer, 'Deprecated Config: test')
-
-    def test_deprecated_fatal(self):
-        self.flags(fatal_deprecations=True)
-        self.assertRaises(exception.DeprecatedConfig,
-                          deprecated.warn, "test2")
-        self.assertEqual(self.logbuffer, 'Deprecated Config: test2')
-
-    def test_deprecated_logs_only_once(self):
-        deprecated.warn('only once!')
-        deprecated.warn('only once!')
-        deprecated.warn('only once!')
-        self.assertEqual(self.logbuffer, 'Deprecated Config: only once!')