Fixed the heat endpoint for the Openstack Controller

openstack_controller/changelog.d/17996.fixed

@@ -0,0 +1 @@
+Fixed the heat endpoint for the Openstack Controller

openstack_controller/datadog_checks/openstack_controller/api/api_rest.py

@@ -30,15 +30,20 @@ def has_admin_role(self):
     def component_in_catalog(self, component_types):
         return self._catalog.has_component(component_types)
 
-    def get_response_time(self, endpoint_types, remove_project_id=True):
+    def get_response_time(self, endpoint_types, remove_project_id=True, is_heat=False):
         endpoint = (
-            self._catalog.get_endpoint_by_type(endpoint_types).replace(self._current_project_id, "")
-            if self._current_project_id and remove_project_id
-            else self._catalog.get_endpoint_by_type(endpoint_types)
+            self._catalog.get_endpoint_by_type(endpoint_types).replace("/v1/" + self._current_project_id, "")
+            if is_heat
+            else (
+                self._catalog.get_endpoint_by_type(endpoint_types).replace(self._current_project_id, "")
+                if self._current_project_id and remove_project_id
+                else self._catalog.get_endpoint_by_type(endpoint_types)
+            )
         )
         self.log.debug("getting response time for `%s`", endpoint)
         response = self.http.get(endpoint)
         response.raise_for_status()
+        self.log.debug(response.json())
         return response.elapsed.total_seconds() * 1000
 
     def get_auth_projects(self):
@@ -604,7 +609,7 @@ def get_glance_members(self, image_id):
 
     def get_heat_stacks(self, project_id):
         return self.make_paginated_request(
-            '{}/v1/{}/stacks'.format(self._catalog.get_endpoint_by_type(Component.Types.HEAT.value), project_id),
+            '{}/stacks'.format(self._catalog.get_endpoint_by_type(Component.Types.HEAT.value)),
             'stacks',
             'id',
             next_signifier='links',

openstack_controller/datadog_checks/openstack_controller/api/api_sdk.py

@@ -115,10 +115,16 @@ def authorize_project(self, project_id):
         self.connection.authorize()
         self.http.options['headers']['X-Auth-Token'] = self.connection.session.auth.get_token(self.connection.session)
 
-    def get_response_time(self, endpoint_types, remove_project_id=True):
+    def get_response_time(self, endpoint_types, remove_project_id=True, is_heat=False):
         endpoint = self._catalog.get_endpoint_by_type(endpoint_types)
         endpoint = (
-            endpoint.replace(self._access.project_id, "") if self._access.project_id and remove_project_id else endpoint
+            self._catalog.get_endpoint_by_type(endpoint_types).replace(f"/v1/{self._access.project_id}", "")
+            if is_heat
+            else (
+                endpoint.replace(self._access.project_id, "")
+                if self._access.project_id and remove_project_id
+                else endpoint
+            )
         )
         response = self.http.get(endpoint)
         response.raise_for_status()

openstack_controller/datadog_checks/openstack_controller/components/heat.py

@@ -26,7 +26,7 @@ def __init__(self, check):
     @Component.http_error(report_service_check=True)
     def _report_response_time(self, global_components_config, tags):
         self.check.log.debug("reporting `%s` response time", Heat.ID.value)
-        response_time = self.check.api.get_response_time(Heat.TYPES.value)
+        response_time = self.check.api.get_response_time(Heat.TYPES.value, is_heat=True)
         self.check.log.debug("`%s` response time: %s", Heat.ID.value, response_time)
         self.check.gauge(HEAT_RESPONSE_TIME, response_time, tags=tags)
 

openstack_controller/tests/fixtures/POST/identity/v3/auth/tokens/1e6e233e637d4d55a50a62b63398ad15.json

@@ -187,7 +187,7 @@
             "id": "168f02a638de42f6b66b60b01f905830",
             "interface": "public",
             "region_id": "RegionOne",
-            "url": "http://127.0.0.1:8004/heat-api",
+            "url": "http://127.0.0.1:8004/heat-api/v1/1e6e233e637d4d55a50a62b63398ad15",
             "region": "RegionOne"
           }
         ],

openstack_controller/tests/fixtures/POST/identity/v3/auth/tokens/6e39099cccde4f809b003d9e0dd09304.json

@@ -195,7 +195,7 @@
             "id": "168f02a638de42f6b66b60b01f905830",
             "interface": "public",
             "region_id": "RegionOne",
-            "url": "http://127.0.0.1:8004/heat-api",
+            "url": "http://127.0.0.1:8004/heat-api/v1/6e39099cccde4f809b003d9e0dd09304",
             "region": "RegionOne"
           }
         ],

openstack_controller/tests/fixtures/POST/identity/v3/auth/tokens/system.json

@@ -103,6 +103,20 @@
           "type": "volumev3",
           "name": "cinderv3"
         },
+        {
+          "endpoints": [
+            {
+              "id": "168f02a638de42f6b66b60b01f905830",
+              "interface": "public",
+              "region_id": "RegionOne",
+              "url": "http://127.0.0.1:8004/heat-api",
+              "region": "RegionOne"
+            }
+          ],
+          "id": "36f45c02edba4500adc2bc5974d22bf0",
+          "type": "orchestration",
+          "name": "heat"
+        },
         {
           "endpoints": [
             {

openstack_controller/tests/test_unit_heat.py

@@ -101,23 +101,25 @@ def test_not_in_catalog(aggregator, check, dd_run_check, caplog, mock_http_post,
 
 
 @pytest.mark.parametrize(
-    ('mock_http_get', 'instance'),
+    ('mock_http_get', 'instance', 'expected_api_calls'),
     [
         pytest.param(
             {'http_error': {'/heat-api': MockResponse(status_code=500)}},
             configs.REST,
+            2,
             id='api rest',
         ),
         pytest.param(
             {'http_error': {'/heat-api': MockResponse(status_code=500)}},
             configs.SDK,
+            3,
             id='api sdk',
         ),
     ],
     indirect=['mock_http_get'],
 )
 @pytest.mark.usefixtures('mock_http_get', 'mock_http_post', 'openstack_connection')
-def test_response_time_exception(aggregator, check, dd_run_check, mock_http_get):
+def test_response_time_exception(aggregator, check, dd_run_check, mock_http_get, expected_api_calls):
     dd_run_check(check)
     aggregator.assert_metric(
         'openstack.heat.response_time',
@@ -132,7 +134,7 @@ def test_response_time_exception(aggregator, check, dd_run_check, mock_http_get)
     for call in mock_http_get.call_args_list:
         args, kwargs = call
         args_list += list(args)
-    assert args_list.count('http://127.0.0.1:8004/heat-api') == 2
+    assert args_list.count('http://127.0.0.1:8004/heat-api') == expected_api_calls
 
 
 @pytest.mark.parametrize(