Add EtcdResult.etcd_index; minor fixes.

lavagetto · lavagetto · commit 7f6fa7f1fb35 · 2014-03-20T16:20:41.000+01:00
We added EtcdResult.etcd_index and EtcdResult.raft_index as result of parsing response headers from etcd, as requested in jplana#39. Also, we fixed the bug in the etcd.Client.write() response when updating a dir ( jplana#38), which is done by parsing the content of prevNode, which we formerly discarded. Last, this patch makes etcd.Client.update() finally work against directories, working around the unusual behaviour of the etcd server in this respect.
diff --git a/src/etcd/__init__.py b/src/etcd/__init__.py
@@ -16,7 +16,7 @@ class EtcdResult(object):
         'dir': False,
     }
 
-    def __init__(self, action=None, node=None, **kwdargs):
+    def __init__(self, action=None, node=None, prevNode=None, **kwdargs):
         """
         Creates an EtcdResult object.
 
@@ -38,6 +38,16 @@ def __init__(self, action=None, node=None, **kwdargs):
             # We keep the data in raw format, converting them only when needed
             self._children = node['nodes']
 
+        if prevNode:
+            self._prev_node = EtcdResult(None, node=prevNode)
+            # See issue 38: when returning a write() op etcd has a bogus result.
+            if self._prev_node.dir and not self.dir:
+                self.dir = True
+
+    def parse_headers(self, response):
+        headers = response.getheaders()
+        self.etcd_index = headers.get('x-etcd-index', 1)
+        self.raft_index = headers.get('x-raft-index', 1)
 
     def get_subtree(self, leaves_only=False):
         """
diff --git a/src/etcd/client.py b/src/etcd/client.py
@@ -282,13 +282,17 @@ def update(self, obj):
             obj (etcd.EtcdResult):  The object that needs updating.
 
         """
-        return self.write(
-            obj.key,
-            obj.value,
-            ttl=obj.ttl,
-            dir=obj.dir,
-            prevExist=True,
-            prevIndex=obj.modifiedIndex)
+        kwdargs = {
+            'dir': obj.dir,
+            'ttl': obj.ttl,
+            'prevExist': True
+            }
+
+        if not obj.dir:
+            # prevIndex on a dir causes a 'not a file' error. d'oh!
+            kwdargs['prevIndex'] = obj.modifiedIndex
+
+        return self.write(obj.key, obj.value, **kwdargs)
 
 
 
@@ -511,13 +515,12 @@ def election(self):
 
     def _result_from_response(self, response):
         """ Creates an EtcdResult from json dictionary """
-        # TODO: add headers we obtained from the http respose to the etcd
-        # result.
         try:
             res = json.loads(response.data.decode('utf-8'))
             r = etcd.EtcdResult(**res)
             if response.status == 201:
                 r.newKey = True
+            r.parse_headers(response)
             return r
         except Exception as e:
             raise etcd.EtcdException(
diff --git a/src/etcd/tests/integration/test_simple.py b/src/etcd/tests/integration/test_simple.py
@@ -127,6 +127,9 @@ def test_directory_ttl_update(self):
         self.client.write('/dir', None, dir=True, ttl=30)
         res = self.client.write('/dir', None, dir=True, ttl=31, prevExist=True)
         self.assertEquals(res.ttl, 31)
+        res.ttl = 120
+        new_res = self.client.update(res)
+        self.assertEquals(new_res.ttl, 120)
 
 
 
diff --git a/src/etcd/tests/unit/test_old_request.py b/src/etcd/tests/unit/test_old_request.py
@@ -14,6 +14,8 @@ def __init__(self, status, data=''):
         self.status = status
         self.data = data.encode('utf-8')
 
+    def getheaders(self):
+        return {}
 
 class TestClientRequest(unittest.TestCase):
 
