Merge pull request #61 from stackhpc/remaining-opensearch-fix

Remove mapping name from bulk API URL

Author: MoteHue

cloudkitty/storage/v2/elasticsearch/client.py

@@ -225,7 +225,7 @@ def bulk_with_instruction(self, instruction, terms):
         """Does a POST request against ES's bulk API
 
         The POST request will be done against
-        `/<index_name>/<mapping_name>/_bulk`
+        `/<index_name>/_bulk`
 
         The instruction will be appended before each term. For example,
         bulk_with_instruction('instr', ['one', 'two']) will produce::
@@ -246,7 +246,7 @@ def bulk_with_instruction(self, instruction, terms):
             *[(instruction, json.dumps(term)) for term in terms]
         )) + '\n'
         url = '/'.join(
-            (self._url, self._index_name, self._mapping_name, '_bulk'))
+            (self._url, self._index_name, '_bulk'))
         return self._req(self._sess.post, url, data, None, deserialize=False)
 
     def bulk_index(self, terms):

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

@@ -259,7 +259,7 @@ def test_bulk_with_instruction(self):
             self.client.bulk_with_instruction(instruction, terms)
             rmock.assert_called_once_with(
                 self.client._sess.post,
-                'http://elasticsearch:9200/index_name/test_mapping/_bulk',
+                'http://elasticsearch:9200/index_name/_bulk',
                 expected_data, None, deserialize=False)
 
     def test_bulk_index(self):