diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-02-10 19:16:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-02-10 19:16:02 +0000 |
| commit | 6f8743790534a8fcd22e958d16ef30c631ca153e (patch) | |
| tree | 4bcfad14e15e923776c1fdc2acf7a6da70bec81c | |
| parent | 0e786b49147ee2395d2ca806d5396765b87a03d2 (diff) | |
| parent | a568c12219db0390d90843274b07a97af6a6743b (diff) | |
| download | pycadf-6f8743790534a8fcd22e958d16ef30c631ca153e.tar.gz | |
Merge "Do not depend on endpoint id existing in the service catalog"
| -rw-r--r-- | pycadf/audit/api.py | 6 | ||||
| -rw-r--r-- | pycadf/tests/audit/test_api.py | 34 |
2 files changed, 39 insertions, 1 deletions
diff --git a/pycadf/audit/api.py b/pycadf/audit/api.py index 42c2911..6d70ed2 100644 --- a/pycadf/audit/api.py +++ b/pycadf/audit/api.py @@ -180,12 +180,16 @@ class OpenStackAuditApi(object): return action def _get_service_info(self, endp): + # NOTE(stevemar): The catalog returned by X-Service-Catalog + # does not include IDs for endpoints, use the service name + # as a backup. + endpoint_id = endp['endpoints'][0].get('id', endp['name']) service = self.Service( type=self._MAP.service_endpoints.get( endp['type'], taxonomy.UNKNOWN), name=endp['name'], - id=identifier.norm_ns(endp['endpoints'][0]['id']), + id=identifier.norm_ns(endpoint_id), admin_endp=endpoint.Endpoint( name='admin', url=endp['endpoints'][0]['adminURL']), diff --git a/pycadf/tests/audit/test_api.py b/pycadf/tests/audit/test_api.py index 1b9e30f..96dcb0b 100644 --- a/pycadf/tests/audit/test_api.py +++ b/pycadf/tests/audit/test_api.py @@ -40,6 +40,23 @@ class TestAuditApi(base.TestCase): 'HTTP_X_PROJECT_ID': 'tenant_id', 'HTTP_X_IDENTITY_STATUS': 'Confirmed'} + ENV_HEADERS_NO_ID = {'HTTP_X_SERVICE_CATALOG': + '''[{"endpoints_links": [], + "endpoints": [{"adminURL": + "http://admin_host:8774", + "region": "RegionOne", + "publicURL": + "http://public_host:8775", + "internalURL": + "http://internal_host:8776"}], + "type": "compute", + "name": "nova"}]''', + 'HTTP_X_USER_ID': 'user_id', + 'HTTP_X_USER_NAME': 'user_name', + 'HTTP_X_AUTH_TOKEN': 'token', + 'HTTP_X_PROJECT_ID': 'tenant_id', + 'HTTP_X_IDENTITY_STATUS': 'Confirmed'} + def setUp(self): super(TestAuditApi, self).setUp() self.audit_api = api.OpenStackAuditApi( @@ -53,6 +70,14 @@ class TestAuditApi(base.TestCase): self.assertIn('CADF_EVENT_CORRELATION_ID', req.environ) return req + def api_request_missing_id(self, method, url): + self.ENV_HEADERS_NO_ID['REQUEST_METHOD'] = method + req = webob.Request.blank(url, environ=self.ENV_HEADERS_NO_ID, + remote_addr='192.168.0.1') + self.audit_api.append_audit_event(req) + self.assertIn('CADF_EVENT_CORRELATION_ID', req.environ) + return req + def test_get_list_with_cfg(self): cfg.CONF.set_override( 'api_audit_map', @@ -121,6 +146,15 @@ class TestAuditApi(base.TestCase): self.assertEqual(payload['target']['id'], 'unknown') self.assertEqual(payload['target']['typeURI'], 'unknown') + def test_templated_catalog(self): + url = 'http://admin_host:8774/v2/' + str(uuid.uuid4()) + '/servers' + req = self.api_request_missing_id('GET', url) + payload = req.environ['CADF_EVENT'] + self.assertEqual(payload['target']['id'], 'openstack:nova') + self.assertEqual(payload['target']['name'], 'nova') + self.assertEqual(payload['target']['typeURI'], + 'service/compute/servers') + def test_get_unknown_endpoint_default_set(self): tmpfile = self.temp_config_file_path() with open(tmpfile, "w") as f: |