Fix arguments to oslo_context.RequestContext()

These tests are generating deprecation warnings since
they are using 'user' and 'tenant', update to use 'user_id'
and 'project_id'.

Trivialfix

Change-Id: I8a2b4b5acc020f175c463df1f049eda802ab8873
This commit is contained in:
Brian Haley 2018-02-13 13:43:54 -05:00
parent a6672065cb
commit 1a0dacb67b
1 changed files with 8 additions and 8 deletions

View File

@ -25,8 +25,8 @@ from neutron.tests import base
class AgentRPCPluginApi(base.BaseTestCase):
def _test_rpc_call(self, method):
agent = rpc.PluginApi('fake_topic')
ctxt = oslo_context.RequestContext(user='fake_user',
tenant='fake_project')
ctxt = oslo_context.RequestContext(user_id='fake_user',
project_id='fake_project')
expect_val = 'foo'
with mock.patch.object(agent.client, 'call') as mock_call,\
mock.patch.object(agent.client, 'prepare') as mock_prepare:
@ -62,8 +62,8 @@ class AgentPluginReportState(base.BaseTestCase):
mock.patch.object(reportStateAPI.client, 'prepare'
) as mock_prepare:
mock_prepare.return_value = reportStateAPI.client
ctxt = oslo_context.RequestContext(user='fake_user',
tenant='fake_project')
ctxt = oslo_context.RequestContext(user_id='fake_user',
project_id='fake_project')
reportStateAPI.report_state(ctxt, expected_agent_state,
use_call=True)
self.assertEqual(mock_call.call_args[0][0], ctxt)
@ -82,8 +82,8 @@ class AgentPluginReportState(base.BaseTestCase):
mock.patch.object(reportStateAPI.client, 'prepare'
) as mock_prepare:
mock_prepare.return_value = reportStateAPI.client
ctxt = oslo_context.RequestContext(user='fake_user',
tenant='fake_project')
ctxt = oslo_context.RequestContext(user_id='fake_user',
project_id='fake_project')
reportStateAPI.report_state(ctxt, expected_agent_state)
self.assertEqual(mock_cast.call_args[0][0], ctxt)
self.assertEqual(mock_cast.call_args[0][1], 'report_state')
@ -105,8 +105,8 @@ class AgentPluginReportState(base.BaseTestCase):
mock.patch.object(reportStateAPI.client, 'prepare'
) as mock_prepare:
mock_prepare.return_value = reportStateAPI.client
ctxt = oslo_context.RequestContext(user='fake_user',
tenant='fake_project')
ctxt = oslo_context.RequestContext(user_id='fake_user',
project_id='fake_project')
reportStateAPI.report_state(ctxt, expected_agent_state)
self.assertEqual(expected_time_str,
mock_cast.call_args[1]['time'])