Add node_meta to

ibrahimmenem · ibrahimmenem · commit c9a97d2ec804 · 2018-07-24T16:19:54.000+02:00
diff --git a/consul/base.py b/consul/base.py
@@ -1258,7 +1258,6 @@ def nodes(
                 for nodemeta_name, nodemeta_value in node_meta.items():
                     params.append(('node-meta', '{0}:{1}'.
                                    format(nodemeta_name, nodemeta_value)))
-
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/nodes', params=params)
 
@@ -1322,7 +1321,6 @@ def services(self,
                 for nodemeta_name, nodemeta_value in node_meta.items():
                     params.append(('node-meta', '{0}:{1}'.
                                    format(nodemeta_name, nodemeta_value)))
-
             return self.agent.http.get(
                 CB.json(index=True), '/v1/catalog/services', params=params)
 
@@ -1406,7 +1404,8 @@ def service(
                 consistency=None,
                 dc=None,
                 near=None,
-                token=None):
+                token=None,
+                node_meta=None):
             """
             Returns a tuple of (*index*, *nodes*) of the nodes providing
             *service* in the *dc* datacenter. *dc* defaults to the current
@@ -1431,6 +1430,9 @@ def service(
 
             *token* is an optional `ACL token`_ to apply to this request.
 
+            *node_meta* is an optional meta data used for filtering, a
+            dictionary formatted as {k1:v1, k2:v2}.
+
             The response looks like this::
 
                 (index, [
@@ -1462,6 +1464,10 @@ def service(
             consistency = consistency or self.agent.consistency
             if consistency in ('consistent', 'stale'):
                 params.append((consistency, '1'))
+            if node_meta:
+                for nodemeta_name, nodemeta_value in node_meta.items():
+                    params.append(('node-meta', '{0}:{1}'.
+                                   format(nodemeta_name, nodemeta_value)))
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/catalog/service/%s' % service,
@@ -1531,7 +1537,6 @@ def service(self,
                 for nodemeta_name, nodemeta_value in node_meta.items():
                     params.append(('node-meta', '{0}:{1}'.
                                    format(nodemeta_name, nodemeta_value)))
-
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/health/service/%s' % service,
@@ -1587,7 +1592,6 @@ def checks(
                 for nodemeta_name, nodemeta_value in node_meta.items():
                     params.append(('node-meta', '{0}:{1}'.
                                    format(nodemeta_name, nodemeta_value)))
-
             return self.agent.http.get(
                 CB.json(index=True),
                 '/v1/health/checks/%s' % service,
