Fix elasticsearch & opensearch requests

Using list for metric_types in _build_must, in case it was not.
The APIs expects a list for "type" in "terms".

Story: 2011541
Task: 52868
Signed-off-by: Nicolas Maillet-Contoz <nicolas.maillet-contoz@infomaniak.com>
Change-Id: Ia57e81dade3f54383d66a27c6935dda3779b090a
(cherry picked from commit 677fc28)

Author: THEBATTEUR

cloudkitty/storage/v2/elasticsearch/client.py

@@ -76,6 +76,9 @@ def _build_must(start, end, metric_types, filters):
             must.append({'term': {'type': filters['type']}})
 
         if metric_types:
+            if type(metric_types) is not list:
+                metric_types = [metric_types]
+
             must.append({"terms": {"type": metric_types}})
 
         return must

cloudkitty/storage/v2/opensearch/client.py

@@ -76,6 +76,9 @@ def _build_must(start, end, metric_types, filters):
             must.append({'term': {'type': filters['type']}})
 
         if metric_types:
+            if type(metric_types) is not list:
+                metric_types = [metric_types]
+
             must.append({"terms": {"type": metric_types}})
 
         return must

cloudkitty/tests/storage/v2/elasticsearch/test_client.py

@@ -53,6 +53,13 @@ def test_build_must_with_filters(self):
             [{'term': {'type': 'awesome'}}],
         )
 
+    def test_build_must_with_metric_type(self):
+        types = 'awesome'
+        self.assertEqual(
+            self.client._build_must(None, None, types, None),
+            [{'terms': {'type': ['awesome']}}],
+        )
+
     def test_build_must_with_metric_types(self):
         types = ['awesome', 'amazing']
         self.assertEqual(

cloudkitty/tests/storage/v2/opensearch/test_client.py

@@ -53,6 +53,13 @@ def test_build_must_with_filters(self):
             [{'term': {'type': 'awesome'}}],
         )
 
+    def test_build_must_with_metric_type(self):
+        types = 'awesome'
+        self.assertEqual(
+            self.client._build_must(None, None, types, None),
+            [{'terms': {'type': ['awesome']}}],
+        )
+
     def test_build_must_with_metric_types(self):
         types = ['awesome', 'amazing']
         self.assertEqual(

releasenotes/notes/fix-elasticsearch-a9a37443f81b3a79.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fix request to Elasticsearch/OpenSearch that has potentially not the 
+    correct type.