openstack
/
nova
Code Issues Proposed changes

Merge "[placement] Fix getting placement request ID"

This commit is contained in:
Zuul 2017-12-23 16:52:58 +00:00 committed by Gerrit Code Review
parent ac8a3089e5 560ebe4a56
commit 8ec9ca371b
2 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nova/scheduler/client/report.py
View File

@ -20,6 +20,7 @@ import time
from keystoneauth1 import exceptions as ks_exc
from oslo_log import log as logging
from oslo_middleware import request_id
from six.moves.urllib import parse
from nova.compute import provider_tree
@ -250,9 +251,7 @@ def _extract_inventory_in_use(body):
def get_placement_request_id(response):
if response is not None:
return response.headers.get(
'openstack-request-id',
response.headers.get('x-openstack-request-id'))
return response.headers.get(request_id.HTTP_RESP_HEADER_REQUEST_ID)
class SchedulerReportClient(object):

20
nova/tests/unit/scheduler/client/test_report.py
View File

@ -1473,7 +1473,7 @@ class TestProviderOperations(SchedulerReportClientTestCase):
resp_mock = mock.Mock(status_code=503)
self.ks_adap_mock.get.return_value = resp_mock
self.ks_adap_mock.get.return_value.headers = {
'openstack-request-id': uuids.request_id}
'x-openstack-request-id': uuids.request_id}
uuid = uuids.compute_node
self.assertRaises(
@ -1671,7 +1671,7 @@ class TestProviderOperations(SchedulerReportClientTestCase):
name = 'computehost'
self.ks_adap_mock.post.return_value = mock.Mock(
status_code=409,
headers={'openstack-request-id': uuids.request_id},
headers={'x-openstack-request-id': uuids.request_id},
text='not a name conflict')
get_rp_mock.return_value = mock.sentinel.get_rp
@ -2012,7 +2012,7 @@ class TestInventory(SchedulerReportClientTestCase):
}
}
mock_delete.return_value.status_code = 204
mock_delete.return_value.headers = {'openstack-request-id':
mock_delete.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
result = self.client._delete_inventory(cn.uuid)
self.assertIsNone(result)
@ -2069,7 +2069,7 @@ class TestInventory(SchedulerReportClientTestCase):
'inventories': {
}
}
mock_put.return_value.headers = {'openstack-request-id':
mock_put.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
result = self.client._delete_inventory(cn.uuid)
self.assertIsNone(result)
@ -2141,7 +2141,7 @@ class TestInventory(SchedulerReportClientTestCase):
'inventories': {
}
}
mock_put.return_value.headers = {'openstack-request-id':
mock_put.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
self.client._delete_inventory(cn.uuid)
self.assertTrue(mock_debug.called)
@ -2175,7 +2175,7 @@ class TestInventory(SchedulerReportClientTestCase):
}
}
mock_delete.return_value.status_code = 409
mock_delete.return_value.headers = {'openstack-request-id':
mock_delete.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
rc_str = "VCPU, MEMORY_MB"
in_use_exc = exception.InventoryInUse(
@ -2227,7 +2227,7 @@ There was a conflict when trying to complete your request.
}
}
mock_delete.return_value.status_code = 404
mock_delete.return_value.headers = {'openstack-request-id':
mock_delete.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
result = self.client._delete_inventory(cn.uuid)
self.assertIsNone(result)
@ -2266,7 +2266,7 @@ There was a conflict when trying to complete your request.
'inventories': {
}
}
mock_delete.return_value.headers = {'openstack-request-id':
mock_delete.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
result = self.client._delete_inventory(cn.uuid)
self.assertIsNone(result)
@ -2582,7 +2582,7 @@ There was a conflict when trying to complete your request.
'inventories': {},
}
mock_put.return_value.status_code = 234
mock_put.return_value.headers = {'openstack-request-id':
mock_put.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
inv_data = report._compute_node_to_inventory_dict(compute_node)
@ -2622,7 +2622,7 @@ There was a conflict when trying to complete your request.
except AttributeError:
# Thanks py3
mock_put.return_value.__bool__.return_value = False
mock_put.return_value.headers = {'openstack-request-id':
mock_put.return_value.headers = {'x-openstack-request-id':
uuids.request_id}
inv_data = report._compute_node_to_inventory_dict(compute_node)