From 1b664be5c71cf101b441713db569e4449b4ee6f2 Mon Sep 17 00:00:00 2001
From: Brian Haley <bhaley@redhat.com>
Date: Tue, 13 Feb 2018 15:02:49 -0500
Subject: [PATCH] Fix context deprecation warnings

DeprecationWarning: Property 'tenant' has moved to 'project_id'

Trivialfix

Change-Id: Ia34e62b1646441c88be1c98cdf1c333236f824ba
---
 neutron/tests/unit/db/test_db_base_plugin_v2.py | 2 +-
 neutron/tests/unit/plugins/ml2/test_plugin.py   | 2 +-
 neutron/tests/unit/test_auth.py                 | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/neutron/tests/unit/db/test_db_base_plugin_v2.py b/neutron/tests/unit/db/test_db_base_plugin_v2.py
index dc5eeb28e5f..f6240cb5efb 100644
--- a/neutron/tests/unit/db/test_db_base_plugin_v2.py
+++ b/neutron/tests/unit/db/test_db_base_plugin_v2.py
@@ -6676,7 +6676,7 @@ class DbOperationBoundMixin(object):
 
     def get_api_kwargs(self):
         context_ = self._get_context()
-        return {'set_context': True, 'tenant_id': context_.tenant}
+        return {'set_context': True, 'tenant_id': context_.project_id}
 
     def _list_and_record_queries(self, resource, query_params=None):
         kwargs = {'neutron_context': self._get_context()}
diff --git a/neutron/tests/unit/plugins/ml2/test_plugin.py b/neutron/tests/unit/plugins/ml2/test_plugin.py
index 3b856e9973d..2f2d4b48a9c 100644
--- a/neutron/tests/unit/plugins/ml2/test_plugin.py
+++ b/neutron/tests/unit/plugins/ml2/test_plugin.py
@@ -677,7 +677,7 @@ class TestMl2DbOperationBoundsTenantRbac(TestMl2DbOperationBoundsTenant):
         net = self.driver.create_network(
             context.get_admin_context(),
             {'network': {'name': 'net1',
-                         'tenant_id': context_.tenant,
+                         'tenant_id': context_.project_id,
                          'admin_state_up': True,
                          'shared': True}})
         # create port that belongs to another tenant
diff --git a/neutron/tests/unit/test_auth.py b/neutron/tests/unit/test_auth.py
index 404763a6aa1..ef30a0a226f 100644
--- a/neutron/tests/unit/test_auth.py
+++ b/neutron/tests/unit/test_auth.py
@@ -53,7 +53,7 @@ class NeutronKeystoneContextTestCase(base.BaseTestCase):
         response = self.request.get_response(self.middleware)
         self.assertEqual('200 OK', response.status)
         self.assertEqual('testtenantid', self.context.tenant_id)
-        self.assertEqual('testtenantid', self.context.tenant)
+        self.assertEqual('testtenantid', self.context.project_id)
 
     def test_roles_no_admin(self):
         self.request.headers['X_PROJECT_ID'] = 'testtenantid'