From 38c1eaede52e800b2289afc38146b1120be82ddf Mon Sep 17 00:00:00 2001
From: Arne Wiebalck <Arne.Wiebalck@cern.ch>
Date: Wed, 26 Oct 2016 10:29:40 +0200
Subject: [PATCH] Remove warnings for dropped context arguments
This patch removes the warning messages for dropped arguments upon
context setup. They are of limited use and dropping them should
increase the readability of the logs.
Change-Id: I8003dd576a575be4d87e69ef5459009eeb15fabe
Closes-Bug: #1607444
---
manila/context.py | 9 +-----
manila/tests/test_context.py | 55 ------------------------------------
2 files changed, 1 insertion(+), 63 deletions(-)
diff --git a/manila/context.py b/manila/context.py
index 9b1e63b972..ab046c5ba9 100644
--- a/manila/context.py
+++ b/manila/context.py
@@ -20,15 +20,12 @@
import copy
from oslo_context import context
-from oslo_log import log
from oslo_utils import timeutils
import six
-from manila.i18n import _, _LW
+from manila.i18n import _
from manila import policy
-LOG = log.getLogger(__name__)
-
class RequestContext(context.RequestContext):
"""Security context and request information.
@@ -71,10 +68,6 @@ class RequestContext(context.RequestContext):
overwrite=overwrite,
roles=roles)
- kwargs.pop('user_identity', None)
- if kwargs:
- LOG.warning(_LW('Arguments dropped when creating context: %s.'),
- str(kwargs))
self.user_id = self.user
self.project_id = self.tenant
diff --git a/manila/tests/test_context.py b/manila/tests/test_context.py
index c7e8272e38..eff92ce1ad 100644
--- a/manila/tests/test_context.py
+++ b/manila/tests/test_context.py
@@ -12,8 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
-import mock
-
from manila import context
from manila import test
@@ -66,59 +64,6 @@ class ContextTestCase(test.TestCase):
'read_deleted',
True)
- def test_extra_args_to_context_get_logged(self):
- info = {}
-
- def fake_warn(log_msg, other_args):
- info['log_msg'] = log_msg % other_args
-
- self.mock_object(context.LOG, 'warning', fake_warn)
-
- c = context.RequestContext('user',
- 'project',
- extra_arg1='meow',
- extra_arg2='wuff',
- user='user',
- tenant='project')
- self.assertTrue(c)
- self.assertIn("'extra_arg1': 'meow'", info['log_msg'])
- self.assertIn("'extra_arg2': 'wuff'", info['log_msg'])
- # user and tenant kwargs get popped off before we log anything
- self.assertNotIn("'user': 'user'", info['log_msg'])
- self.assertNotIn("'tenant': 'project'", info['log_msg'])
-
- def test_normal_kwargs_are_used_so_not_logged(self):
-
- mock_log = self.mock_object(context.LOG, 'warning', mock.Mock())
-
- # Supply the kwargs normally supplied to RequestContext
- # for scheduler and share service.
- context.RequestContext('user',
- 'project',
- is_admin=None,
- read_deleted="no",
- roles=None,
- remote_address=None,
- timestamp=None,
- request_id=None,
- auth_token=None,
- overwrite=True,
- quota_class=None,
- service_catalog=None,
- read_only=False,
- domain=None,
- show_deleted=False,
- user_identity='- - - - -',
- project_domain=None,
- resource_uuid=None,
- user_domain=None,
- user='user',
- tenant='project')
-
- # Assert that there is no log warning that there were
- # extra kwargs that were dropped.
- self.assertEqual(0, mock_log.call_count)
-
def test_to_dict_works_w_missing_manila_context_attributes(self):
manila_context_attributes = ['user_id', 'project_id', 'read_deleted',
'remote_address', 'timestamp',