Adding update option to graph edit methods

Makefile

@@ -28,6 +28,11 @@ proto:
 	--grpc-gateway_out=logtostderr=true:. \
 	aql.proto
 
+proto-tool:
+	go get github.com/golang/protobuf/protoc-gen-go
+	go get github.com/grpc-ecosystem/grpc-gateway/protoc-gen-grpc-gateway/
+
+
 # Automatially update code formatting
 tidy:
 	@for f in $$(find ./ -name "*.go" -print | egrep -v "\.pb\.go|\.gw\.go|underscore\.go"); do \
@@ -47,6 +52,7 @@ lint:
 test:
 	@go test $(TESTS)
 
+
 # Build binaries for all OS/Architectures
 cross-compile: depends
 	@echo '=== Cross compiling... ==='

aql.py

@@ -45,18 +45,25 @@ def __init__(self, url, name):
     def query(self):
         return Query(self)
 
-    def addVertex(self, id, label, prop={}):
+    def addVertex(self, id, label, prop={}, update=False):
         payload = json.dumps({
             "gid" : id,
             "label" : label,
             "data" : prop
         })
         headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
-        request = urllib2.Request(self.url + "/" + self.name + "/vertex", payload, headers=headers)
+        url = self.url + "/" + self.name + "/vertex"
+        if update:
+            url += "?update=true"
+        print url
+        request = urllib2.Request(url, payload, headers=headers)
         response = urllib2.urlopen(request)
         result = response.read()
         return json.loads(result)
 
+    def updateVertex(self, id, label, prop={}):
+        self.addVertex(id, label, prop, True)
+
     def addEdge(self, src, dst, label, prop={}):
         payload = json.dumps({
             "from" : src,

aql/aql.proto

@@ -115,6 +115,7 @@ message GraphElement {
   Vertex vertex = 2;
   Edge edge = 3;
   Bundle bundle = 4;
+  bool update = 5;
 }
 
 message Graph {

conformance/tests/ot_update.py

@@ -0,0 +1,23 @@
+
+
+
+def test_update(O):
+    errors = []
+    #print O.query().addV("vertex1").property("field1", {"test" : 1, "value" : False}).render()
+    O.addVertex("vertex1", "person", {"test" : 1, "value" : False} )
+    O.updateVertex("vertex1", "person", {"value" : True, "other":True} )
+    #print "vertices", O.query().V().execute()
+    count = 0
+    for i in O.query().V().execute():
+        count += 1
+        p = i['vertex']['data']
+        if "test" not in p or "value" not in p:
+            errors.append("missing keys in structure field")
+            continue
+        if p["test"] != 1 or p["value"] != True:
+            errors.append("Incorrect values in structure")
+
+    if count != 1:
+        errors.append("Vertex struct property count failed")
+
+    return errors