implemented get swarm info

.gitignore

@@ -14,4 +14,5 @@
 /docs/playbooks/euroArgo_conf_playbook2.yml
 /Dockerfiles/env_file
 /argo_optimizer/nbproject/private/
-/drip_planner2/nbproject/private/
\ No newline at end of file
+/drip_planner2/nbproject/private/
+/drip-deployer/deployer_files/
\ No newline at end of file

docs/apidocs/apidocs/downloads.html

@@ -72,7 +72,7 @@
   <h1 class="page-header">Files and Libraries</h1>
 
   <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p>  <p>
     The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
     can be used to access the Web service API for this application.
@@ -97,7 +97,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Java client-side library is used to provide the set of Java objects that can be serialized
   to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>.  This is useful for accessing the
@@ -127,7 +127,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -155,7 +155,7 @@
     </tbody>
   </table>
   <h3 id="artifact_js_client_library">JavaScript Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -190,7 +190,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -219,7 +219,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
   This is useful for accessing the resources that are published by this application, but only
@@ -251,7 +251,7 @@
     </tbody>
   </table>
   <h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
   This is useful for accessing the REST endpoints that are published by this application, but only

docs/apidocs/downloads.html

@@ -72,7 +72,7 @@
   <h1 class="page-header">Files and Libraries</h1>
 
   <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p>  <p>
     The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
     can be used to access the Web service API for this application.
@@ -97,7 +97,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Java client-side library is used to provide the set of Java objects that can be serialized
   to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>.  This is useful for accessing the
@@ -127,7 +127,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -155,7 +155,7 @@
     </tbody>
   </table>
   <h3 id="artifact_js_client_library">JavaScript Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -190,7 +190,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -219,7 +219,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
   This is useful for accessing the resources that are published by this application, but only
@@ -251,7 +251,7 @@
     </tbody>
   </table>
   <h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
-  <p class="lead">Created October 9, 2017</p>
+  <p class="lead">Created October 10, 2017</p>
   <p><p>
   The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
   This is useful for accessing the REST endpoints that are published by this application, but only

drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java

@@ -602,6 +602,7 @@ public class DeployService {
         Map<String, Object> info = new HashMap();
         for (MessageParameter param : params) {
             String jsonResp = param.getValue().replaceAll("^\"|\"$", "");
+            
             Map<String, Object> kv = Converter.jsonString2Map(jsonResp);
             info.putAll(kv);
         }

drip-deployer/docker_check.py

@@ -32,28 +32,36 @@ def docker_check(vm, compose_name):
         node_format = '\'{\"ID\":\"{{.ID}}\",\"hostname\":\"{{.Hostname}}\",\"status\":\"{{.Status}}\",\"availability\":\"{{.Availability}}\",\"status\":\"{{.Status}}\"}\''
         cmd = 'sudo docker node ls --format ' + (node_format)
         json_response = {}
-        #print cmd
+        cluster_node_info = []
         stdin, stdout, stderr = ssh.exec_command(cmd)
         node_ls_resp = stdout.readlines()
-        retstr = ""
         for i in node_ls_resp: 
             if i.encode():
-                retstr += i.encode()
-        cluster_node_info = json.loads(retstr.strip('\n'))
+                json_str = json.loads(i.encode().strip('\n'))
+                cluster_node_info.append(json_str)
         
         json_response ['cluster_node_info'] = cluster_node_info
         services_format = '\'{\"ID\":\"{{.ID}}\",\"name\":\"{{.Name}}\",\"image\":\"{{.Image}}\",\"node\":\"{{.Node}}\",\"desired_state\":\"{{.DesiredState}}\",\"current_state\":\"{{.CurrentState}}\",\"error\":\"{{.Error}}\",\"ports\":\"{{.Ports}}\"}\''
         cmd = 'sudo docker stack ps '+ compose_name +' --format ' + services_format
-        #print cmd
         stdin, stdout, stderr = ssh.exec_command(cmd)
         stack_ps_resp = stdout.readlines()
-        retstr = ""
+        services_info = []
         for i in stack_ps_resp: 
             if i.encode():
-                retstr += i.encode()
-                print i.encode().strip('\n')
-        services_info = json.loads(retstr.strip('\n'))
+                json_str = json.loads(i.encode().strip('\n'))
+                services_info.append(json_str)
         json_response ['services_info'] = services_info
+        stack_format = '\'{"ID":"{{.ID}}","name":"{{.Name}}","mode":"{{.Mode}}","replicas":"{{.Replicas}}","image":"{{.Image}}"}\''
+        cmd = 'sudo docker stack services '+ compose_name +' --format ' + (stack_format)
+        stdin, stdout, stderr = ssh.exec_command(cmd)
+        stack_resp = stdout.readlines()
+        stack_info = []
+        for i in stack_resp:
+            if i.encode():
+                json_str = json.loads(i.encode().strip('\n'))
+                stack_info.append(json_str)
+        json_response ['stack_info'] = stack_info   
+        
         print "%s: =========== Check Finished ==============" % (vm.ip)
     except Exception as e:
         print '%s: %s' % (vm.ip, e)

drip-deployer/rpc_server.py

@@ -44,10 +44,10 @@ def handleDelivery(message):
     vm_list = []
     current_milli_time = lambda: int(round(time.time() * 1000))
     try:
-        path = os.path.dirname(os.path.abspath(__file__)) + "/"+ str(current_milli_time()) + "/"
+        path = os.path.dirname(os.path.abspath(__file__)) + "/deployer_files/"+str(current_milli_time()) + "/"
     except NameError:        
         import sys
-        path = os.path.dirname(os.path.abspath(sys.argv[0])) + "/"+ str(current_milli_time()) + "/"
+        path = os.path.dirname(os.path.abspath(sys.argv[0])) + "/deployer_files/"+str(current_milli_time()) + "/"
         
     if not os.path.exists(path):
         os.makedirs(path)