transfer tests, arrangement and shim to dynamic setting

Author: palmskog

extraction/aggregation-dynamic/Makefile

@@ -1,26 +1,35 @@
-OCAMLBUILD = ocamlbuild -lib str -lib unix -I lib -I ocaml -cflag -g
-OCAMLBUILD_TEST = ocamlbuild -package oUnit -lib str -I ocaml -I test -cflag -g
+PYTHON=python2.7
+
+OCAMLBUILD = ocamlbuild -package uuidm -lib str -lib unix -I ocaml -cflag -g
+OCAMLBUILD_TEST = ocamlbuild -package uuidm -package oUnit -lib str -I ocaml -I test -cflag -g
 
 AGGREGATION = ocaml/TreeAggregation.ml ocaml/TreeAggregation.mli \
- ocaml/TreeAggregationArrangement.ml ocaml/TreeAggregationMain.ml ocaml/Serialization.ml
-AGGREGATION_TEST = test/SerializationTest.ml test/TreeAggregationTest.ml
-LIB = lib/OrderedMain.ml lib/OrderedShim.ml
+ ocaml/TreeAggregationArrangement.ml ocaml/TreeAggregationMain.ml \
+ ocaml/Serialization.ml ocaml/Opts.ml ocaml/OrderedShim.ml ocaml/Util.ml
+
+AGGREGATION_TEST = test/SerializationTest.ml test/OptsTest.ml \
+test/TreeAggregationTest.ml test/TestCommon.ml
 
 default: TreeAggregationMain.native
 
-TreeAggregationMain.native: $(AGGREGATION) $(LIB)
+TreeAggregationMain.native: $(AGGREGATION)
 	$(OCAMLBUILD) TreeAggregationMain.native
 
 TreeAggregationTest.native: $(AGGREGATION) $(AGGREGATION_TEST)
 	$(OCAMLBUILD_TEST) TreeAggregationTest.native
 
-test: TreeAggregationTest.native
+test-units: TreeAggregationTest.native
 	./TreeAggregationTest.native
 
+test-integration: TreeAggregationMain.native test/integration.py
+	$(PYTHON) test/integration.py
+
+test: test-units test-integration
+
 clean:
 	$(OCAMLBUILD) TreeAggregationMain.native -clean
 	$(OCAMLBUILD_TEST) TreeAggregationTest.native -clean
 
-.PHONY: default clean test
+.PHONY: default clean test test-units test-integration
 
 .NOTPARALLEL: TreeAggregationMain.native TreeAggregationTest.native

extraction/aggregation-dynamic/ocaml/Opts.ml

@@ -0,0 +1,49 @@
+open List
+open Printf
+open Str
+
+let cluster_default = []
+let me_default = -1
+let port_default = 8351
+let dbpath_default = "/var/lib/vard"
+let debug_default = false
+
+let cluster = ref cluster_default
+let me = ref me_default
+let port = ref port_default
+let dbpath = ref dbpath_default
+let debug = ref debug_default
+
+let node_spec arg nodes_ref doc =
+  let parse opt =
+    (* name,ip:port *)
+    if string_match (regexp "\\([0-9]+\\),\\(.+\\):\\([0-9]+\\)") opt 0 then
+      (int_of_string (matched_group 1 opt),
+       (matched_group 2 opt, int_of_string (matched_group 3 opt)))
+    else
+      raise (Arg.Bad (sprintf "wrong argument: '%s'; option '%s' expects an address in the form 'name,host:port'" arg opt))
+  in (arg, Arg.String (fun opt -> nodes_ref := !nodes_ref @ [parse opt]), doc)
+
+let parse inp =
+  let opts =
+    [ node_spec "-node" cluster "{name,host:port} one node in the cluster"
+    ; ("-me", Arg.Set_int me, "{name} name for this node")
+    ; ("-port", Arg.Set_int port, "{port} port for client commands")
+    ; ("-dbpath", Arg.Set_string dbpath, "{path} directory for storing database files")
+    ; ("-debug", Arg.Set debug, "run in debug mode")
+    ] in  
+   Arg.parse_argv ?current:(Some (ref 0)) inp
+    opts
+    (fun x -> raise (Arg.Bad (sprintf "%s does not take position arguments" inp.(0))))
+    "Try -help for help or one of the following."
+
+let validate () =
+  if length !cluster == 0 then begin
+    raise (Arg.Bad "Please specify at least one -node")
+  end;
+  if !me == me_default then begin
+    raise (Arg.Bad "Please specify the node name -me")
+  end;
+  if not (mem_assoc !me !cluster) then begin
+    raise (Arg.Bad (sprintf "%d is not a member of this cluster" !me))
+  end