openstack
/
nova
Code Issues Proposed changes

Merge "Send context.global_id on neutron calls"

This commit is contained in:
Zuul 2019-01-17 13:59:51 +00:00 committed by Gerrit Code Review
parent e3b517b6fd a31157c527
commit 968033d9da
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/network/neutronv2/api.py
View File

@ -178,7 +178,7 @@ def get_client(context, admin=False):
session = _get_session()
client_args = dict(session=session,
auth=auth_plugin,
global_request_id=context.global_request_id)
global_request_id=context.global_id)
if CONF.neutron.url:
# TODO(efried): Remove in Rocky

3
nova/tests/unit/network/test_neutronv2.py
View File

@ -139,6 +139,9 @@ class TestNeutronClient(test.NoDBTestCase):
self.assertEqual(['internal', 'public'], cl.httpclient.interface)
self.assertIsNone(cl.httpclient.region_name)
self.assertIsNone(cl.httpclient.endpoint_override)
self.assertIsNotNone(cl.httpclient.global_request_id)
self.assertEqual(my_context.global_id,
cl.httpclient.global_request_id)
def test_ksa_adapter_loading(self):
"""Test ksa loading path with specified values."""