x/vmware-nsx
Code Issues Proposed changes

Merge "Add X-Tenant-ID to metadata request"

Browse Source
This commit is contained in:
Jenkins 2013-12-12 00:33:03 +00:00 committed by Gerrit Code Review
commit b247cfd00c
2 changed files with 43 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/agent/metadata/agent.py
View File

@ -97,9 +97,9 @@ class MetadataProxyHandler(object):
try: try:
LOG.debug(_("Request: %s"), req) LOG.debug(_("Request: %s"), req)
instance_id = self._get_instance_id(req) instance_id, tenant_id = self._get_instance_and_tenant_id(req)
if instance_id: if instance_id:
return self._proxy_request(instance_id, req) return self._proxy_request(instance_id, tenant_id, req)
else: else:
return webob.exc.HTTPNotFound() return webob.exc.HTTPNotFound()
@ -109,7 +109,7 @@ class MetadataProxyHandler(object):
'Please try your request again.') 'Please try your request again.')
return webob.exc.HTTPInternalServerError(explanation=unicode(msg)) return webob.exc.HTTPInternalServerError(explanation=unicode(msg))
def _get_instance_id(self, req): def _get_instance_and_tenant_id(self, req):
qclient = self._get_neutron_client() qclient = self._get_neutron_client()
remote_address = req.headers.get('X-Forwarded-For') remote_address = req.headers.get('X-Forwarded-For')
@ -130,14 +130,15 @@ class MetadataProxyHandler(object):
fixed_ips=['ip_address=%s' % remote_address])['ports'] fixed_ips=['ip_address=%s' % remote_address])['ports']
self.auth_info = qclient.get_auth_info() self.auth_info = qclient.get_auth_info()
if len(ports) == 1: if len(ports) == 1:
return ports[0]['device_id'] return ports[0]['device_id'], ports[0]['tenant_id']
return None, None
def _proxy_request(self, instance_id, req): def _proxy_request(self, instance_id, tenant_id, req):
headers = { headers = {
'X-Forwarded-For': req.headers.get('X-Forwarded-For'), 'X-Forwarded-For': req.headers.get('X-Forwarded-For'),
'X-Instance-ID': instance_id, 'X-Instance-ID': instance_id,
'X-Tenant-ID': tenant_id,
'X-Instance-ID-Signature': self._sign_instance_id(instance_id) 'X-Instance-ID-Signature': self._sign_instance_id(instance_id)
} }

62
neutron/tests/unit/test_metadata_agent.py
View File

@ -55,8 +55,9 @@ class TestMetadataProxyHandler(base.BaseTestCase):
def test_call(self): def test_call(self):
req = mock.Mock() req = mock.Mock()
with mock.patch.object(self.handler, '_get_instance_id') as get_id: with mock.patch.object(self.handler,
get_id.return_value = 'id' '_get_instance_and_tenant_id') as get_ids:
get_ids.return_value = ('instance_id', 'tenant_id')
with mock.patch.object(self.handler, '_proxy_request') as proxy: with mock.patch.object(self.handler, '_proxy_request') as proxy:
proxy.return_value = 'value' proxy.return_value = 'value'
@ -65,21 +66,23 @@ class TestMetadataProxyHandler(base.BaseTestCase):
def test_call_no_instance_match(self): def test_call_no_instance_match(self):
req = mock.Mock() req = mock.Mock()
with mock.patch.object(self.handler, '_get_instance_id') as get_id: with mock.patch.object(self.handler,
get_id.return_value = None '_get_instance_and_tenant_id') as get_ids:
get_ids.return_value = None, None
retval = self.handler(req) retval = self.handler(req)
self.assertIsInstance(retval, webob.exc.HTTPNotFound) self.assertIsInstance(retval, webob.exc.HTTPNotFound)
def test_call_internal_server_error(self): def test_call_internal_server_error(self):
req = mock.Mock() req = mock.Mock()
with mock.patch.object(self.handler, '_get_instance_id') as get_id: with mock.patch.object(self.handler,
get_id.side_effect = Exception '_get_instance_and_tenant_id') as get_ids:
get_ids.side_effect = Exception
retval = self.handler(req) retval = self.handler(req)
self.assertIsInstance(retval, webob.exc.HTTPInternalServerError) self.assertIsInstance(retval, webob.exc.HTTPInternalServerError)
self.assertEqual(len(self.log.mock_calls), 2) self.assertEqual(len(self.log.mock_calls), 2)
def _get_instance_id_helper(self, headers, list_ports_retval, def _get_instance_and_tenant_id_helper(self, headers, list_ports_retval,
networks=None, router_id=None): networks=None, router_id=None):
headers['X-Forwarded-For'] = '192.168.1.1' headers['X-Forwarded-For'] = '192.168.1.1'
req = mock.Mock(headers=headers) req = mock.Mock(headers=headers)
@ -87,8 +90,7 @@ class TestMetadataProxyHandler(base.BaseTestCase):
return {'ports': list_ports_retval.pop(0)} return {'ports': list_ports_retval.pop(0)}
self.qclient.return_value.list_ports.side_effect = mock_list_ports self.qclient.return_value.list_ports.side_effect = mock_list_ports
retval = self.handler._get_instance_id(req) instance_id, tenant_id = self.handler._get_instance_and_tenant_id(req)
expected = [ expected = [
mock.call( mock.call(
username=FakeConf.admin_user, username=FakeConf.admin_user,
@ -118,7 +120,7 @@ class TestMetadataProxyHandler(base.BaseTestCase):
self.qclient.assert_has_calls(expected) self.qclient.assert_has_calls(expected)
return retval return (instance_id, tenant_id)
def test_get_instance_id_router_id(self): def test_get_instance_id_router_id(self):
router_id = 'the_id' router_id = 'the_id'
@ -129,13 +131,14 @@ class TestMetadataProxyHandler(base.BaseTestCase):
networks = ['net1', 'net2'] networks = ['net1', 'net2']
ports = [ ports = [
[{'network_id': 'net1'}, {'network_id': 'net2'}], [{'network_id': 'net1'}, {'network_id': 'net2'}],
[{'device_id': 'device_id'}] [{'device_id': 'device_id', 'tenant_id': 'tenant_id'}]
] ]
self.assertEqual( self.assertEqual(
self._get_instance_id_helper(headers, ports, networks=networks, self._get_instance_and_tenant_id_helper(headers, ports,
router_id=router_id), networks=networks,
'device_id' router_id=router_id),
('device_id', 'tenant_id')
) )
def test_get_instance_id_router_id_no_match(self): def test_get_instance_id_router_id_no_match(self):
@ -149,10 +152,11 @@ class TestMetadataProxyHandler(base.BaseTestCase):
[{'network_id': 'net1'}, {'network_id': 'net2'}], [{'network_id': 'net1'}, {'network_id': 'net2'}],
[] []
] ]
self.assertEqual(
self.assertIsNone( self._get_instance_and_tenant_id_helper(headers, ports,
self._get_instance_id_helper(headers, ports, networks=networks, networks=networks,
router_id=router_id), router_id=router_id),
(None, None)
) )
def test_get_instance_id_network_id(self): def test_get_instance_id_network_id(self):
@ -162,12 +166,14 @@ class TestMetadataProxyHandler(base.BaseTestCase):
} }
ports = [ ports = [
[{'device_id': 'device_id'}] [{'device_id': 'device_id',
'tenant_id': 'tenant_id'}]
] ]
self.assertEqual( self.assertEqual(
self._get_instance_id_helper(headers, ports, networks=['the_id']), self._get_instance_and_tenant_id_helper(headers, ports,
'device_id' networks=['the_id']),
('device_id', 'tenant_id')
) )
def test_get_instance_id_network_id_no_match(self): def test_get_instance_id_network_id_no_match(self):
@ -178,8 +184,10 @@ class TestMetadataProxyHandler(base.BaseTestCase):
ports = [[]] ports = [[]]
self.assertIsNone( self.assertEqual(
self._get_instance_id_helper(headers, ports, networks=['the_id']) self._get_instance_and_tenant_id_helper(headers, ports,
networks=['the_id']),
(None, None)
) )
def _proxy_request_test_helper(self, response_code=200, method='GET'): def _proxy_request_test_helper(self, response_code=200, method='GET'):
@ -194,7 +202,8 @@ class TestMetadataProxyHandler(base.BaseTestCase):
with mock.patch('httplib2.Http') as mock_http: with mock.patch('httplib2.Http') as mock_http:
mock_http.return_value.request.return_value = (resp, 'content') mock_http.return_value.request.return_value = (resp, 'content')
retval = self.handler._proxy_request('the_id', req) retval = self.handler._proxy_request('the_id', 'tenant_id',
req)
mock_http.assert_has_calls([ mock_http.assert_has_calls([
mock.call().request( mock.call().request(
'http://9.9.9.9:8775/the_path', 'http://9.9.9.9:8775/the_path',
@ -202,7 +211,8 @@ class TestMetadataProxyHandler(base.BaseTestCase):
headers={ headers={
'X-Forwarded-For': '8.8.8.8', 'X-Forwarded-For': '8.8.8.8',
'X-Instance-ID-Signature': 'signed', 'X-Instance-ID-Signature': 'signed',
'X-Instance-ID': 'the_id' 'X-Instance-ID': 'the_id',
'X-Tenant-ID': 'tenant_id'
}, },
body=body body=body
)] )]