5.0 compatibility

Author: honzakral

elasticsearch/client/__init__.py

@@ -90,7 +90,8 @@ def help(self, params=None):
  """
  return self.transport.perform_request('GET', '/_cat', params=params)
 
- @query_params('bytes', 'h', 'help', 'local', 'master_timeout', 'pri', 'v')
+ @query_params('bytes', 'format', 'h', 'health', 'help', 'local',
+ 'master_timeout', 'pri', 'v')
  def indices(self, index=None, params=None):
  """
  The indices command provides a cross-section of each index.
@@ -101,6 +102,9 @@ def indices(self, index=None, params=None):
  :arg bytes: The unit in which to display byte values, valid choices are:
  'b', 'k', 'm', 'g'
  :arg h: Comma-separated list of column names to display
+ :arg health: A health status ("green", "yellow", or "red" to filter only
+ indices matching the specified health status, default None, valid
+ choices are: 'green', 'yellow', 'red'
  :arg help: Return help information, default False
  :arg local: Return local information, do not retrieve the state from
  master node (default: false)
@@ -312,7 +316,7 @@ def repositories(self, params=None):
  params=params)
 
  @query_params('h', 'help', 'ignore_unavailable', 'master_timeout', 'v')
- def snapshots(self, repository, params=None):
+ def snapshots(self, repository=None, params=None):
  """
  `<http://www.elastic.co/guide/en/elasticsearch/reference/current/cat-snapshots.html>`_
 
@@ -326,8 +330,6 @@ def snapshots(self, repository, params=None):
  node
  :arg v: Verbose mode. Display column headers, default False
  """
- if repository in SKIP_IN_PATH:
- raise ValueError("Empty value passed for a required argument 'repository'.")
  return self.transport.perform_request('GET', _make_path('_cat',
  'snapshots', repository), params=params)
 

elasticsearch/client/cat.py

@@ -2,8 +2,8 @@
 
 class ClusterClient(NamespacedClient):
  @query_params('level', 'local', 'master_timeout', 'timeout',
- 'wait_for_active_shards', 'wait_for_events', 'wait_for_nodes',
- 'wait_for_relocating_shards', 'wait_for_status')
+ 'wait_for_active_shards', 'wait_for_events',
+ 'wait_for_no_relocating_shards', 'wait_for_nodes', 'wait_for_status')
  def health(self, index=None, params=None):
  """
  Get a very simple status on the health of the cluster.
@@ -22,10 +22,10 @@ def health(self, index=None, params=None):
  :arg wait_for_events: Wait until all currently queued events with the
  given priorty are processed, valid choices are: 'immediate',
  'urgent', 'high', 'normal', 'low', 'languid'
+ :arg wait_for_no_relocating_shards: Whether to wait until there are no
+ relocating shards in the cluster
  :arg wait_for_nodes: Wait until the specified number of nodes is
  available
- :arg wait_for_relocating_shards: Wait until the specified number of
- relocating shards is finished
  :arg wait_for_status: Wait until cluster is in a specific state, default
  None, valid choices are: 'green', 'yellow', 'red'
  """

elasticsearch/client/cluster.py

@@ -13,8 +13,8 @@ def analyze(self, index=None, body=None, params=None):
  :arg analyzer: The name of the analyzer to use
  :arg attributes: A comma-separated list of token attributes to output,
  this parameter works only with `explain=true`
- :arg char_filter: A comma-separated list of character filters to use
- for the analysis
+ :arg char_filter: A comma-separated list of character filters to use for
+ the analysis
  :arg explain: With `true`, outputs more advanced details. (default:
  false)
  :arg field: Use the analyzer configured for this field (instead of
@@ -79,9 +79,8 @@ def flush(self, index=None, params=None):
  ignored when unavailable (missing or closed)
  :arg wait_if_ongoing: If set to true the flush operation will block
  until the flush can be executed if another flush operation is
- already executing. The default is false and will cause an exception
- to be thrown on the shard level if another flush operation is
- already running.
+ already executing. The default is true. If set to false the flush
+ will be skipped iff if another flush operation is already running.
  """
  return self.transport.perform_request('POST', _make_path(index,
  '_flush'), params=params)

elasticsearch/client/indices.py

@@ -2,16 +2,14 @@
 
 class IngestClient(NamespacedClient):
  @query_params('master_timeout')
- def get_pipeline(self, id, params=None):
+ def get_pipeline(self, id=None, params=None):
  """
  `<https://www.elastic.co/guide/en/elasticsearch/plugins/current/ingest.html>`_
 
  :arg id: Comma separated list of pipeline ids. Wildcards supported
  :arg master_timeout: Explicit operation timeout for connection to master
  node
  """
- if id in SKIP_IN_PATH:
- raise ValueError("Empty value passed for a required argument 'id'.")
  return self.transport.perform_request('GET', _make_path('_ingest',
  'pipeline', id), params=params)
 

elasticsearch/client/ingest.py

@@ -38,14 +38,16 @@ def delete(self, repository, snapshot, params=None):
  return self.transport.perform_request('DELETE',
  _make_path('_snapshot', repository, snapshot), params=params)
 
- @query_params('master_timeout')
+ @query_params('ignore_unavailable', 'master_timeout')
  def get(self, repository, snapshot, params=None):
  """
  Retrieve information about a snapshot.
  `<http://www.elastic.co/guide/en/elasticsearch/reference/current/modules-snapshots.html>`_
 
  :arg repository: A repository name
  :arg snapshot: A comma-separated list of snapshot names
+ :arg ignore_unavailable: Whether to ignore unavailable snapshots,
+ defaults to false which means a SnapshotMissingException is thrown
  :arg master_timeout: Explicit operation timeout for connection to master
  node
  """
@@ -125,7 +127,7 @@ def restore(self, repository, snapshot, body=None, params=None):
  return self.transport.perform_request('POST', _make_path('_snapshot',
  repository, snapshot, '_restore'), params=params, body=body)
 
- @query_params('master_timeout')
+ @query_params('ignore_unavailable', 'master_timeout')
  def status(self, repository=None, snapshot=None, params=None):
  """
  Return information about all currently running snapshots. By specifying
@@ -135,6 +137,8 @@ def status(self, repository=None, snapshot=None, params=None):
 
  :arg repository: A repository name
  :arg snapshot: A comma-separated list of snapshot names
+ :arg ignore_unavailable: Whether to ignore unavailable snapshots,
+ defaults to false which means a SnapshotMissingException is thrown
  :arg master_timeout: Explicit operation timeout for connection to master
  node
  """

elasticsearch/client/snapshot.py

@@ -285,11 +285,8 @@ def test_children_are_reindexed_correctly(self):
  q = self.client.get(
  index='real-index',
  doc_type='question',
- id=42,
- fields=['_source']
+ id=42
  )
- if 'fields' in q:
- q.update(q.pop('fields'))
  self.assertEquals(
  {
  '_id': '42',
@@ -304,11 +301,8 @@ def test_children_are_reindexed_correctly(self):
  index='test-index',
  doc_type='answer',
  id=47,
- parent=42,
- fields=['_source', '_parent']
+ parent=42
  )
- if 'fields' in q:
- q.update(q.pop('fields'))
  if '_routing' in q:
  self.assertEquals(q.pop('_routing'), '42')
  self.assertEquals(