Merge "Fix elasticsearch & opensearch requests"

cloudkitty/storage/v2/elasticsearch/client.py

@@ -78,6 +78,9 @@ class ElasticsearchClient(object):
             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

@@ -78,6 +78,9 @@ class OpenSearchClient(object):
             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 @@ class TestElasticsearchClient(unittest.TestCase):
             [{'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 @@ class TestOpenSearchClient(unittest.TestCase):
             [{'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.