modify the addcluster page

change the ttl of heartbeat
create a new rpc client when execute a rpc call

src/httprest.py

@@ -21,6 +21,7 @@ from log import logger
 
 import os
 import http.server, cgi, json, sys, shutil
+import xmlrpc.client
 from socketserver import ThreadingMixIn
 import nodemgr, vclustermgr, etcdlib, network, imagemgr, notificationmgr
 import userManager,beansapplicationmgr
@@ -69,13 +70,11 @@ def worker_ip_required(func):
     @wraps(func)
     def wrapper(*args, **kwargs):
        global G_nodemgr
-       workers = G_nodemgr.get_rpcs()
+       workers = G_nodemgr.get_nodeips()
        ip = request.remote_addr
        flag = False
        for worker in workers:
-           workerip = G_nodemgr.rpc_to_ip(worker)
+           if ip == '127.0.0.1' or ip == '0.0.0.0' or ip == worker:
-           #logger.info(str(ip) + " " + str(workerip))
-           if ip == '127.0.0.1' or ip == '0.0.0.0' or ip == workerip:
                 flag = True
                 break
        if not flag:

src/imagemgr.py

@@ -19,6 +19,7 @@ design:
 from configparser import ConfigParser
 from io import StringIO
 import os,sys,subprocess,time,re,datetime,threading,random
+import xmlrpc.client
 
 from log import logger
 import env
@@ -311,10 +312,11 @@ class ImageMgr():
             logger.info("only root can update base image")
         #vclustermgr.stop_allclusters()
         #vclustermgr.detach_allclusters()
-        workers = vclustermgr.nodemgr.get_rpcs()
+        workers = vclustermgr.nodemgr.get_nodeips()
         logger.info("update base image in all workers")
         for worker in workers:
-            worker.update_basefs(image)
+            workerrpc = xmlprc.client.ServerProxy("http://%s:%s" % (worker, env.getenv("WORKER_PORT")))
+            workerrpc.update_basefs(image)
         logger.info("update base image success")
         #vclustermgr.mount_allclusters()
         #logger.info("mount all cluster success")

src/monitor.py

@@ -20,6 +20,7 @@ Design:Monitor mainly consists of three parts: Collectors, Master_Collector and
 import subprocess,re,os,etcdlib,psutil,math,sys
 import time,threading,json,traceback,platform
 import env
+import xmlrpc.client
 from datetime import datetime
 
 from model import db,VNode,History
@@ -544,12 +545,13 @@ class Master_Collector(threading.Thread):
         while not self.thread_stop:
             for worker in monitor_hosts.keys():
                 monitor_hosts[worker]['running'] = False
-            workers = self.nodemgr.get_rpcs()
+            workers = self.nodemgr.get_nodeips()
             for worker in workers:
                 try:
-                    ip = self.nodemgr.rpc_to_ip(worker)
+                    ip = worker
+                    workerrpc = xmlrpc.client.ServerProxy("http://%s:%s" % (worker, env.getenv("WORKER_PORT")))
                     # fetch data
-                    info = list(eval(worker.workerFetchInfo(self.master_ip)))
+                    info = list(eval(workerrpc.workerFetchInfo(self.master_ip)))
                     #logger.info(info[0])
                     # store data in monitor_hosts and monitor_vnodes
                     monitor_hosts[ip] = info[0]

src/nodemgr.py

@@ -46,10 +46,6 @@ class NodeMgr(object):
                 logger.error("docklet-br not found")
                 sys.exit(1)
 
-        # init rpc list
-        self.rpcs = []
-        self.maprpcs = {}
-
         # get allnodes
         self.allnodes = self._nodelist_etcd("allnodes")
         self.runnodes = []
@@ -59,8 +55,6 @@ class NodeMgr(object):
             if node['value'] == 'ok':
                 logger.info ("running node %s" % nodeip)
                 self.runnodes.append(nodeip)
-                self.rpcs.append(xmlrpc.client.ServerProxy("http://%s:%s" % (nodeip, self.workerport)))
-                logger.info ("add %s:%s in rpc client list" % (nodeip, self.workerport))
 
         logger.info ("all nodes are: %s" % self.allnodes)
         logger.info ("run nodes are: %s" % self.runnodes)
@@ -131,11 +125,6 @@ class NodeMgr(object):
                             self.etcd.setkey("machines/allnodes/"+nodeip, "ok")
                         logger.debug ("all nodes are: %s" % self.allnodes)
                         logger.debug ("run nodes are: %s" % self.runnodes)
-                        rpccl = xmlrpc.client.ServerProxy("http://%s:%s" % (nodeip, self.workerport))
-                        self.rpcs.append(rpccl)
-                        self.maprpcs[nodeip] = rpccl
-                        logger.info ("add %s:%s in rpc client list" %
-                            (nodeip, self.workerport))
                 elif node['value'] == 'ok':
                     etcd_runip.append(nodeip)
             for nodeip in self.runnodes:
@@ -145,30 +134,12 @@ class NodeMgr(object):
                     #print(self.runnodes)
                     #print(etcd_runip)
                     #print(self.rpcs)
-                    self.rpcs.remove(self.maprpcs[nodeip])
             self.runnodes = etcd_runip
 
     # get all run nodes' IP addr
     def get_nodeips(self):
-        return self.allnodes
+        return self.runnodes
 
-    def get_rpcs(self):
-        return self.rpcs
-
-    def get_onerpc(self):
-        return self.rpcs[random.randint(0, len(self.rpcs)-1)]
-
-    def rpc_to_ip(self, rpcclient):
-        try:
-            return self.runnodes[self.rpcs.index(rpcclient)]
-        except:
-            return None
-
-    def ip_to_rpc(self, nodeip):
-        try:
-            return self.rpcs[self.runnodes.index(nodeip)]
-        except:
-            return None
 
     def get_allnodes(self):
         return self.allnodes

src/vclustermgr.py

@@ -2,6 +2,7 @@
 
 import os, random, json, sys, imagemgr
 import datetime
+import xmlrpc.client
 
 from log import logger
 import env
@@ -84,7 +85,7 @@ class VclusterMgr(object):
             return [False, "cluster:%s already exists" % clustername]
         clustersize = int(self.defaultsize)
         logger.info ("starting cluster %s with %d containers for %s" % (clustername, int(clustersize), username))
-        workers = self.nodemgr.get_rpcs()
+        workers = self.nodemgr.get_nodeips()
         image_json = json.dumps(image)
         groupname = json.loads(user_info)["data"]["group"]
         if (len(workers) == 0):
@@ -108,17 +109,18 @@ class VclusterMgr(object):
         hosts = "127.0.0.1\tlocalhost\n"
         containers = []
         for i in range(0, clustersize):
-            onework = workers[random.randint(0, len(workers)-1)]
+            workerip = workers[random.randint(0, len(workers)-1)]
+            oneworker = xmlrpc.client.ServerProxy("http://%s:%s" % (workerip, env.getenv("WORKER_PORT")))
             lxc_name = username + "-" + str(clusterid) + "-" + str(i)
             hostname = "host-"+str(i)
             logger.info ("create container with : name-%s, username-%s, clustername-%s, clusterid-%s, hostname-%s, ip-%s, gateway-%s, image-%s" % (lxc_name, username, clustername, str(clusterid), hostname, ips[i], gateway, image_json))
-            [success,message] = onework.create_container(lxc_name, username, json.dumps(setting) , clustername, str(clusterid), str(i), hostname, ips[i], gateway, str(vlanid), image_json)
+            [success,message] = oneworker.create_container(lxc_name, username, json.dumps(setting) , clustername, str(clusterid), str(i), hostname, ips[i], gateway, str(vlanid), image_json)
             if success is False:
                 logger.info("container create failed, so vcluster create failed")
                 return [False, message]
             logger.info("container create success")
             hosts = hosts + ips[i].split("/")[0] + "\t" + hostname + "\t" + hostname + "."+clustername + "\n"
-            containers.append({ 'containername':lxc_name, 'hostname':hostname, 'ip':ips[i], 'host':self.nodemgr.rpc_to_ip(onework), 'image':image['name'], 'lastsave':datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), 'setting': setting })
+            containers.append({ 'containername':lxc_name, 'hostname':hostname, 'ip':ips[i], 'host':workerip, 'image':image['name'], 'lastsave':datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), 'setting': setting })
         hostfile = open(hostpath, 'w')
         hostfile.write(hosts)
         hostfile.close()
@@ -132,7 +134,7 @@ class VclusterMgr(object):
     def scale_out_cluster(self,clustername,username,image,user_info, setting):
         if not self.is_cluster(clustername,username):
             return [False, "cluster:%s not found" % clustername]
-        workers = self.nodemgr.get_rpcs()
+        workers = self.nodemgr.get_nodeips()
         if (len(workers) == 0):
             logger.warning("no workers to start containers, scale out failed")
             return [False, "no workers are running"]
@@ -149,23 +151,24 @@ class VclusterMgr(object):
         clusterpath = self.fspath + "/global/users/" + username + "/clusters/" + clustername
         hostpath = self.fspath + "/global/users/" + username + "/hosts/" + str(clusterid) + ".hosts"
         cid = clusterinfo['nextcid']
-        onework = workers[random.randint(0, len(workers)-1)]
+        workerip = workers[random.randint(0, len(workers)-1)]
+        oneworker = xmlrpc.client.ServerProxy("http://%s:%s" % (workerip, env.getenv("WORKER_PORT")))
         lxc_name = username + "-" + str(clusterid) + "-" + str(cid)
         hostname = "host-" + str(cid)
-        [success, message] = onework.create_container(lxc_name, username, json.dumps(setting), clustername, clusterid, str(cid), hostname, ip, gateway, str(vlanid), image_json)
+        [success, message] = oneworker.create_container(lxc_name, username, json.dumps(setting), clustername, clusterid, str(cid), hostname, ip, gateway, str(vlanid), image_json)
         if success is False:
             logger.info("create container failed, so scale out failed")
             return [False, message]
         if clusterinfo['status'] == "running":
-            onework.start_container(lxc_name)
+            oneworker.start_container(lxc_name)
-        onework.start_services(lxc_name, ["ssh"]) # TODO: need fix
+        oneworker.start_services(lxc_name, ["ssh"]) # TODO: need fix
         logger.info("scale out success")
         hostfile = open(hostpath, 'a')
         hostfile.write(ip.split("/")[0] + "\t" + hostname + "\t" + hostname + "." + clustername + "\n")
         hostfile.close()
         clusterinfo['nextcid'] = int(clusterinfo['nextcid']) + 1
         clusterinfo['size'] = int(clusterinfo['size']) + 1
-        clusterinfo['containers'].append({'containername':lxc_name, 'hostname':hostname, 'ip':ip, 'host':self.nodemgr.rpc_to_ip(onework), 'image':image['name'], 'lastsave':datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), 'setting': setting})
+        clusterinfo['containers'].append({'containername':lxc_name, 'hostname':hostname, 'ip':ip, 'host':workerip, 'image':image['name'], 'lastsave':datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), 'setting': setting})
         clusterfile = open(clusterpath, 'w')
         clusterfile.write(json.dumps(clusterinfo))
         clusterfile.close()
@@ -204,8 +207,8 @@ class VclusterMgr(object):
         for container in containers:
             if container['containername'] == containername:
                 logger.info("container: %s found" % containername)
-                onework = self.nodemgr.ip_to_rpc(container['host'])
+                worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
-                onework.create_image(username,imagetmp,containername)
+                worker.create_image(username,imagetmp,containername)
                 fimage = container['image']
                 logger.info("image: %s created" % imagetmp)
                 break
@@ -214,10 +217,10 @@ class VclusterMgr(object):
         for container in containers:
             if container['containername'] != containername:
                 logger.info("container: %s now flush" % container['containername'])
-                onework = self.nodemgr.ip_to_rpc(container['host'])
+                worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
                 #t = threading.Thread(target=onework.flush_container,args=(username,imagetmp,container['containername']))
                 #threads.append(t)
-                onework.flush_container(username,imagetmp,container['containername'])
+                worker.flush_container(username,imagetmp,container['containername'])
                 container['lastsave'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                 container['image'] = fimage
                 logger.info("thread for container: %s has been prepared" % container['containername'])
@@ -247,10 +250,10 @@ class VclusterMgr(object):
         for container in containers:
             if container['containername'] == containername:
                 logger.info("container: %s found" % containername)
-                onework = self.nodemgr.ip_to_rpc(container['host'])
+                worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
-                if onework is None:
+                if worker is None:
                     return [False, "The worker can't be found or has been stopped."]
-                res = onework.create_image(username,imagename,containername,description,imagenum)
+                res = worker.create_image(username,imagename,containername,description,imagenum)
                 container['lastsave'] = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
                 container['image'] = imagename
                 break
@@ -271,7 +274,7 @@ class VclusterMgr(object):
             return [False, "cluster is still running, you need to stop it and then delete"]
         ips = []
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]
             worker.delete_container(container['containername'])
@@ -297,7 +300,7 @@ class VclusterMgr(object):
         new_containers = []
         for container in info['containers']:
             if container['containername'] == containername:
-                worker = self.nodemgr.ip_to_rpc(container['host'])
+                worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
                 if worker is None:
                     return [False, "The worker can't be found or has been stopped."]
                 worker.delete_container(containername)
@@ -348,7 +351,7 @@ class VclusterMgr(object):
         except:
             return [False, "start cluster failed with setting proxy failed"]
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]
             worker.start_container(container['containername'])
@@ -365,7 +368,7 @@ class VclusterMgr(object):
         if not status:
             return [False, "cluster not found"]
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]
             worker.mount_container(container['containername'])
@@ -387,7 +390,7 @@ class VclusterMgr(object):
             return [False, "start cluster failed with setting proxy failed"]
         # recover containers of this cluster
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]
             worker.recover_container(container['containername'])
@@ -402,7 +405,7 @@ class VclusterMgr(object):
         if info['status'] == 'stopped':
             return [False, 'cluster is already stopped']
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]
             worker.stop_container(container['containername'])
@@ -420,7 +423,7 @@ class VclusterMgr(object):
         if info['status'] == 'running':
             return [False, 'cluster is running, please stop it first']
         for container in info['containers']:
-            worker = self.nodemgr.ip_to_rpc(container['host'])
+            worker = xmlrpc.client.ServerProxy("http://%s:%s" % (container['host'], env.getenv("WORKER_PORT")))
             if worker is None:
                 return [False, "The worker can't be found or has been stopped."]              
             worker.detach_container(container['containername'])

src/worker.py

@@ -177,12 +177,12 @@ class Worker(object):
     def sendheartbeat(self):
         while(True):
             # check send heartbeat package every 1s
-            time.sleep(1)
+            time.sleep(20)
             [status, value] = self.etcd.getkey("machines/runnodes/"+self.addr)
             if status:
                 # master has know the worker so we start send heartbeat package
                 if value=='ok':
-                    self.etcd.setkey("machines/runnodes/"+self.addr, "ok", ttl = 2)
+                    self.etcd.setkey("machines/runnodes/"+self.addr, "ok", ttl = 60)
             else:
                 logger.error("get key %s failed, master crashed or initialized. restart worker please." % self.addr)
                 sys.exit(1)

web/templates/addCluster.html

@@ -24,22 +24,6 @@
 
 <div>
 {% block content %}
-<ul class="nav nav-tabs" role="tablist" id="myTabs">
-{% for master in allimages %}
-{% if loop.index == 1 %}
-<li role="presentation" class="active"><a href="#{{master.split("@")[1]}}" data-toggle="tab" aria-controls="{{master.split("@")[1]}}">{{master.split("@")[1]}}</a></li>
-{% else %}
-<li role="presentation"><a href="#{{master.split("@")[1]}}" data-toggle="tab" aria-controls="{{master.split("@")[1]}}">{{master.split("@")[1]}}</a></li>
-{% endif %}
-{% endfor %}
-</ul>
-<div id="myTabContent" class="tab-content">
-{% for master in allimages %}
-{% if loop.index == 1 %}
-<div role="tabpanel" class="tab-pane active" aria-labelledby="{{master.split("@")[1]}}" id="{{master.split("@")[1]}}">
-{% else %}
-<div role="tabpanel" class="tab-pane" aria-labelledby="{{master.split("@")[1]}}" id="{{master.split("@")[1]}}">
-{% endif %}
 <div class="row">
                 <div class="col-lg-12">
                   <div class="box box-info">
@@ -53,16 +37,24 @@
                          </div>
                        </div>
                         <div class="box-body">
-				<form id="form" class="form-horizontal" action="/workspace/add/{{master.split("@")[0]}}/" method="POST">
+				<form id="form" class="form-horizontal" action="/workspace/add/{{masterips[0].split("@")[0]}}/" method="POST">
 
 				    <div class="form-group"><label class="col-sm-2 control-label">Workspace Name</label>
 					    <div class="col-sm-10"><input type="text" class="form-control" name="clusterName" id="clusterName"></div>
 				    </div>
 				    <div class="hr-line-dashed"></div>
                     <br/>
+		    		    <div class="form-group"><label class="col-sm-2 control-label">Center Choose</label>
+					    <div class="col-sm-10"><select id="masterselector" class="form-control">
+						{% for master in masterips %}
+						<option value="{{master.split("@")[0]}}">{{master.split("@")[1]}}</option>
+						{% endfor %}
+					    </select></div>
+				    </div>
+					<br/>
 				    <div class="form-group"><label class="col-sm-2 control-label">Image Choose</label>
 					    <div class="col-sm-10">
-					    	<table class="table table-striped table-bordered table-hover table-image" >
+					    	<table id="imagetable" class="table table-striped table-bordered table-hover table-image" >
 						    <thead>
 						    <tr>
 						    	<th>ImageName</th>
@@ -80,22 +72,22 @@
 							<td>A base image for you</td>
 							<td><div class="i-checks"><label><input type="radio" name="image" value="base_base_base" checked="checked"></label></div></td>
 						    </tr>
-						    {% for image in allimages[master]['private'] %}
+						    {% for image in images['private'] %}
 						    <tr>
 							<td>{{image['name']}}</td>
 							<td>private</td>
 							<td>{{user}}</td>
-							<td><a href="/image/description/{{image['name']}}_{{user}}_private/{{master.split("@")[1]}}/" target="_blank">{{image['description']}}</a></td>
+							<td><a href="/image/description/{{image['name']}}_{{user}}_private/{{masterips[0].split("@")[1]}}/" target="_blank">{{image['description']}}</a></td>
 							<td><div class="i-checks"><label><input type="radio" name="image" value="{{image['name']}}_{{user}}_private"></label></div></td>
 						    </tr>
 						    {% endfor %}
-						    {% for p_user,p_images in allimages[master]['public'].items() %}
+						    {% for p_user,p_images in images['public'].items() %}
 						    	{% for image in p_images %}
 						    	<tr>
 								<td>{{image['name']}}</td>
 								<td>public</td>
 								<td>{{p_user}}</td>
-								<td><a href="/image/description/{{image['name']}}_{{p_user}}_public/{{master.split("@")[1]}}/" target="_blank">{{image['description']}}</a></td>
+								<td><a href="/image/description/{{image['name']}}_{{p_user}}_public/{{masterips[0].split("@")[1]}}/" target="_blank">{{image['description']}}</a></td>
 								<td><div class="i-checks"><label><input type="radio" name="image" value="{{image['name']}}_{{p_user}}_public"></label></div></td>
 						    	</tr>
 							{% endfor %}
@@ -106,16 +98,16 @@
                     </div>
 
 				    <div class="hr-line-dashed"></div>
-				    <div class="panel-group" id="accordion_{{master.split("@")[1]}}">
+				    <div class="panel-group" id="accordion">
                         <div class="panel panel-default">
                             <div class="panel-heading">
                                 <h4 class="panel-title">
-					<a data-toggle="collapse" data-panel="#accordion_{{master.split("@")[1]}}" href="#collapseOne_{{master.split("@")[1]}}">
+					<a data-toggle="collapse" data-panel="#accordion" href="#collapseOne">
                                         show advanced options
                                     </a>
                                 </h4>
                             </div>
-			    <div id="collapseOne_{{master.split("@")[1]}}" class="panel-collapse collapse">
+			    <div id="collapseOne" class="panel-collapse collapse">
                                 <div class="panel-body">
 				                    <div class="form-group">
                                         <label class="col-sm-2 control-label">CPU</label>
@@ -150,9 +142,7 @@
                     </div>
                     </div>
 
-            </div>
 </div>
-{% endfor %}
 </div>
 {% endblock %}
 
@@ -174,14 +164,57 @@
 	<script src="http://cdn.bootcss.com/datatables-tabletools/2.1.5/js/TableTools.min.js"></script>
 
 
-    <script>
+    <script type="text/javascript">
-        $(document).ready(function(){
+		$("select#masterselector").change(function() {
- 	        $(".table-image").DataTable();
+			var masterip=$(this).children('option:selected').val();
-		$(".table-image").attr("style","");
+			console.log(masterip);
-		$('#myTabs a').click(function (e) {
+			document.getElementById("form").action="/workspace/add/"+masterip+"/";
-			  e.preventDefault();
+			var host = window.location.host;
-		          $(this).tab('show');
+			$.post("http://"+host+"/image/list/"+masterip+"/",{},function(data){
-		})
+				var images = data.images;
-        });
+				var imagehtml = 
+					"<thread>"
+					+"<tr>"
+					+"<th>ImageName</th>"
+					+"<th>Type</th>"
+					+"<th>Owner</th>"
+					+"<th>Description</th>"
+					+"<th>Choose</th>"
+                                        +"</tr>"
+					+"</thead>"
+					+"<tbody>"
+					+"<tr>"
+					+"<td>base</td>"
+					+"<td>public</td>"
+					+"<td>docklet</td>"
+					+"<td>A base image for you</td>"
+					+'<td><div class="i-checks"><label><input type="radio" name="image" value="base_base_base" checked="checked"></label></div></td>'
+					+"</tr>";
+				for(var index in images.private) {
+					var image = images.private[index];
+					imagehtml +=
+						"<tr>"
+						+"<td>"+image.name+"</td>"
+						+"<td>private</td>"
+						+"<td>{{user}}</td>"
+						+'<td><a href="/image/description/' + image.name + "_{{user}}_private/" + masterip + '/" target="_blank">' + image.description + '</a></td>'
+						+'<td><div class="i-checks"><label><input type="radio" name="image" value="' + image.name + '_{{user}}_private"><label></div></td>'
+						+"</tr>";
+				}
+				for(var p_user in images.public) {
+					for(var index in images.public[p_user]) {
+						image=images.public[p_user][index];
+						imagehtml +=
+							"<tr>"
+							+"<td>"+image.name+"</td>"
+							+"<td>public</td>"
+							+"<td>" + p_user + "</td>"
+							+'<td><a href="/image/description/' + image.name + "_" + p_user + "_ublic/" + masterip + '/" target="_blank">' + image.description + '</a></td>'
+							+'<td><div class="i-checks"><label><input type="radio" name="image" value="' + image.name + "_" + p_user + '_public"><label></div></td>';
+					}
+				}
+				$("#imagetable").html(imagehtml);
+		},"json");
+	});
     </script>
 {% endblock %}

web/templates/config.html

@@ -34,17 +34,17 @@
 {% for clustername, clusterinfo in allclusters[master].items() %}
 <div class="row">
 	     <div class="col-md-12">
-         <div class="box box-info">
+         <div class="box box-info collapsed-box">
               <div class="box-header with-border">
                 <h3 class="box-title">WorkSpace Name: {{ clustername }} <strong>@ {{master.split("@")[1]}}</strong></h3>
 
                 <div class="box-tools pull-right">
-                  <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
+                  <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i>
                   </button>
                   <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
                 </div>
               </div>
-                     <div class="box-body">
+                     <div class="box-body" style="display:none">
 				<div class="row">
 					<div class="col-md-12">
             <div class="box box-info">
@@ -258,16 +258,16 @@
 {% endfor %}
 <div class="row">
          <div class="col-lg-12">
-           <div class="box box-info">
+           <div class="box box-info collapsed-box">
                 <div class="box-header with-border">
                   <h3 class="box-title">Image Info</h3>
                   <div class="box-tools pull-right">
-                    <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i>
+                    <button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-plus"></i>
                     </button>
                     <button type="button" class="btn btn-box-tool" data-widget="remove"><i class="fa fa-times"></i></button>
                   </div>
                 </div>
-                 <div class="box-body">
+                 <div class="box-body" style="display:none">
 
                      <table class="table table-striped table-bordered table-hover table-image" >
                          <thead>

web/templates/dashboard.html

@@ -55,7 +55,7 @@
 				     <button type="button" class="btn btn-xs btn-default"> Delete </button>
 			     </td>
 				 <td>
-					 <a href="/go/{{ mysession['username'] }}/{{ cluster['name'] }}" target="_blank"><button type="button" class="btn btn-xs btn-success">&nbsp;&nbsp;&nbsp;Go&nbsp;&nbsp;&nbsp;</button></a>
+					 <a href="http://{{master.split("@")[0]}}:8000/go/{{ mysession['username'] }}/{{ cluster['name'] }}" target="_blank"><button type="button" class="btn btn-xs btn-success">&nbsp;&nbsp;&nbsp;Go&nbsp;&nbsp;&nbsp;</button></a>
 				</td>
 			     {% else %}
 			     <td><a href="/vclusters/"><div class="text-warning"><i class="fa fa-stop "></i> Stopped</div></a></td>

web/templates/monitor/hosts.html

@@ -16,7 +16,22 @@
 {% endblock %}
 
 {% block content %}
+<ul class="nav nav-tabs" role="tablist" id="myTabs">
 {% for master in allmachines %}
+{% if loop.index == 1%}
+<li role="presentation" class="active"><a href="#{{master.split("@")[1]}}" data-toggle="tab" aria-controls="{{master.split("@")[1]}}">{{master.split("@")[1]}}</a></li>
+{% else %}
+<li role="presentation"><a href="#{{master.split("@")[1]}}" data-toggle="tab" aria-controls="{{master.split("@")[1]}}">{{master.split("@")[1]}}</a></li>
+{% endif %}
+{% endfor %}
+</ul>
+<div id="myTabContent" class="tab-content">
+{% for master in allmachines %}
+{% if loop.index == 1 %}
+<div role="tabpanel" class="tab-pane active" aria-labelledby="{{master.split("@")[1]}}" id="{{master.split("@")[1]}}">
+{% else %}
+<div role="tabpanel" class="tab-pane" aria-labelledby="{{master.split("@")[1]}}" id="{{master.split("@")[1]}}">
+{% endif %}
 	  <div class="row">
 	     <div class="col-md-12">
          <div class="box box-info">
@@ -75,6 +90,7 @@
                  </div>
              </div>
 	   </div>
+</div>
 {% endfor %}
 {% endblock %}
 
@@ -85,6 +101,7 @@
 
        var MB = 1024;
        $.post(url+"/status/"+masterip+"/",{},function(data){
+	       console.log(data);
 		var status = data.monitor.status;
 		if(status == 'RUNNING')
        		{

web/web.py

@@ -225,6 +225,18 @@ def deleteproxy(clustername,masterip):
     deleteproxyView.masterip = masterip
     return deleteproxyView.as_view()
 
+@app.route("/image/list/<masterip>/", methods=['POST'])
+@login_required
+def image_list(masterip):
+    data = {
+        "user": session['username']
+    }
+    path = request.path[:request.path.rfind("/")]
+    path = path[:path.rfind("/")+1]
+    result = dockletRequest.post(path, data, masterip)
+    logger.debug("image" + str(type(result)))
+    return json.dumps(result)
+
 @app.route("/image/description/<image>/<masterip>/", methods=['GET'])
 @login_required
 def descriptionImage(image,masterip):
@@ -315,6 +327,7 @@ def monitor_request(comid,infotype,masterip):
     path = path[:path.rfind("/")+1]
     logger.debug(path + "_____" + masterip)
     result = dockletRequest.post(path, data, masterip)
+    logger.debug("monitor" + str(type(result)))
     return json.dumps(result)
 
 @app.route("/beans/application/", methods=['GET'])
@@ -630,4 +643,4 @@ if __name__ == '__main__':
         elif opt in ("-p", "--port"):
             webport = int(arg)
 
-    app.run(host = webip, port = webport, threaded=True,)
+    app.run(host = webip, port = webport, threaded=True, debug=True)

web/webViews/cluster.py

@@ -10,10 +10,8 @@ class addClusterView(normalView):
 
     @classmethod
     def get(self):
-        result = dockletRequest.post_to_all("/image/list/")
+        masterips = dockletRequest.post_to_all()
-        allimages={}
+        images = dockletRequest.post("/image/list/",{},masterips[0].split("@")[0]).get("images")
-        for master in result:
-            allimages[master] = result[master].get("images")
         result = dockletRequest.post("/user/usageQuery/")
         quota = result.get("quota")
         usage = result.get("usage")
@@ -48,7 +46,7 @@ class addClusterView(normalView):
                 'disk': defaultdisk
                 }
         if (result):
-            return self.render(self.template_path, user = session['username'], allimages = allimages, quota = quota, usage = usage, defaultsetting = defaultsetting)
+            return self.render(self.template_path, user = session['username'],masterips = masterips, images = images, quota = quota, usage = usage, defaultsetting = defaultsetting)
         else:
             self.error()