Added options to change vhost pools in Pony

Author: Catherine Hong

scriptspony/controllers/root.py

@@ -55,6 +55,7 @@ def index(self, locker=None, sudo=False, **kwargs):
 
         olocker = locker
         hosts = None
+        pools = None
         user = auth.current_user()
         https = auth.is_https()
         # Find or create the associated user info object.
@@ -82,7 +83,6 @@ def index(self, locker=None, sudo=False, **kwargs):
                 hosts = vhosts.list_vhosts(locker)
                 hosts.sort(key=lambda k: k[0])
                 pools = vhosts.list_pools()
-                hosts = [(host,aliases,path,pools.get(ip,ip)) for host,aliases,path,ip in hosts]
             except auth.AuthError as e:
                 flash(e.message)
                 # User has been deauthorized from this locker
@@ -100,7 +100,7 @@ def index(self, locker=None, sudo=False, **kwargs):
                     user_info.lockers.sort()
                     DBSession.add(user_info)
                     flash('You can administer the "%s" locker.' % locker)
-        return dict(hosts=hosts, locker=locker, user_info=user_info, https=https)
+        return dict(hosts=hosts, locker=locker, user_info=user_info, https=https, pools=pools)
 
     @expose("scriptspony.templates.edit")
     def edit(self, locker, hostname, pool=None, path=None, token=None, alias="", **kwargs):
@@ -120,7 +120,6 @@ def edit(self, locker, hostname, pool=None, path=None, token=None, alias="", **k
                 else:
                     flash("Host '%s' reconfigured." % hostname)
                     redirect("/index/" + locker)
-            _, aliases, pool = vhosts.get_vhost_info(locker, hostname)
         else:
             if alias:
                 if token != auth.token():
@@ -133,15 +132,23 @@ def edit(self, locker, hostname, pool=None, path=None, token=None, alias="", **k
                     else:
                         flash("Alias '%s' added to hostname '%s'." % (alias, hostname))
                         redirect("/index/" + locker)
-            try:
-                path, aliases, pool = vhosts.get_vhost_info(locker, hostname)
-            except vhosts.UserError as e:
-                flash(e.message)
-                redirect("/index/" + locker)
+        try:
+            info = vhosts.get_vhost_info(locker, hostname)
+        except vhosts.UserError as e:
+            flash(e.message)
+            redirect("/index/" + locker)
         pools = vhosts.list_pools()
-        pool = pools.get(pool, pool)
+        pool_choices = []
+        pool_choices.append({"name": 'Default', "value": 'DEFAULT', "selected": info['poolIPv4'] is None})
+        for ip, pool in pools.items():
+            # TODO: Only show selectable pools
+            if pool["scriptsVhostPoolUserSelectable"] == "TRUE":
+               pool_choices.append({"name": pool["description"], "value": ip, "selected": info['poolIPv4'] == ip})
+        if not any(choice["selected"] for choice in pool_choices):
+            name = pools.get(info['poolIPv4'], {"description": info['poolIPv4']})["description"]
+            pool_choices.insert(0, {"name": "Unchanged (%s)" % (name,), "value": "", "selected": True})
         return dict(
-            locker=locker, hostname=hostname, pool=pool, pools=pools, path=path, aliases=aliases, alias=alias
+            locker=locker, hostname=hostname, path=info["path"], aliases=info["aliases"], alias=alias, pool_choices=pool_choices,
         )
 
     @expose("scriptspony.templates.delete")
@@ -159,14 +166,12 @@ def delete(self, locker, hostname, confirm=False, token=None, **kwargs):
                 else:
                     flash("Host '%s' deleted." % hostname)
                     redirect("/index/" + locker)
-            _, aliases, _ = vhosts.get_vhost_info(locker, hostname)
-        else:
-            try:
-                path, aliases, _ = vhosts.get_vhost_info(locker, hostname)
-            except vhosts.UserError as e:
-                flash(e.message)
-                redirect("/index/" + locker)
-        return dict(locker=locker, hostname=hostname, path=path, aliases=aliases)
+        try:
+            info = vhosts.get_vhost_info(locker, hostname)
+        except vhosts.UserError as e:
+            flash(e.message)
+            redirect("/index/" + locker)
+        return dict(locker=locker, hostname=hostname, path=info["path"], aliases=info["aliases"])
 
     @expose("scriptspony.templates.new")
     def new(

scriptspony/templates/edit.mak

@@ -10,17 +10,17 @@ from scripts.auth import token
   <ul>
     <li>Hostname: ${hostname}</li>
     <li>Locker: ${locker}</li>
-%if hostname not in [locker + '.scripts.mit.edu']:
+  %if hostname not in [locker + '.scripts.mit.edu']:
     <li>Path: /mit/${locker}/web_scripts/<input type="text" name="path" value="${path}" /></li>
-    %endif
-    <li>Server Pool: ${pool["description"]} <select name="pool">
-    <option value="unchanged">Unchanged</option>
-    <option value="default">Default</option>
-    %for ip, info in pools.items():
-       %if info["scriptsVhostPoolUserSelectable"] == "TRUE":
-          <option value="${ip}">${info["description"]}</option>
-       %endif
-    %endfor
+  %endif
+    <li>Server Pool: <select name="pool">
+  %for choice in pool_choices:
+    <option value="${choice["value"]}"
+%if choice["selected"]:
+    selected
+%endif
+    >${choice["name"]}</option>
+%endfor
     </select></li>
   </ul>
   <button class="btn"><span class="fa fa-save"></span>Save Changes</button>

scriptspony/templates/index.mak

@@ -10,7 +10,7 @@ from scripts import auth
   <p>
     <table border="1">
       <tr><th>Hostname</th><th>Path</th><th>Fedora Pool</th><th>Edit</th></tr>
-      %for host,aliases,path,pool in hosts:
+      %for host,aliases,path,ip in hosts:
         <tr>
           <td>
 	  <a href="http://${host}">${host}</a>
@@ -22,7 +22,11 @@ from scripts import auth
 	    <small>/mit/${locker}/web_scripts/</small>${path}
 	  </td>
 	  <td>
-	  ${pool["description"]}
+	  %if pools.get(ip):
+	  	${pools.get(ip)["description"]}
+	  %else:
+	  	${ip}
+	  %endif 
 	  </td>
             <td class="nbr">
               <a href="${tg.url('/edit/'+locker+'/'+host)}" class="btn sm-btn" aria-label="Edit"><span class="fa fa-pencil" aria-hidden="true"></span></a>

scriptspony/vhosts.py

@@ -98,7 +98,7 @@ def get_path(locker, hostname):
     """Return a the path for the given hostname.
 
     The directory is relative to web_scripts or Scripts/*/"""
-    return get_vhost_info(locker, hostname)[0]
+    return get_vhost_info(locker, hostname)["path"]
 
 
 @team_sensitive
@@ -113,14 +113,14 @@ def get_vhost_info(locker, hostname):
             "(&(objectClass=scriptsVhost)(scriptsVhostAccount=uid=%s,ou=People,dc=scripts,dc=mit,dc=edu)(scriptsVhostName=%s))",
             [locker, hostname],
         ),
-        ["scriptsVhostDirectory", "scriptsVhostAlias", "scriptsVhostPoolIPv4"],
     )
     try:
-        return (
-            res[0][1]["scriptsVhostDirectory"][0],
-            res[0][1].get("scriptsVhostAlias", []),
-            res[0][1]["scriptsVhostPoolIPv4"][0]
-        )
+        attrs = res[0][1]
+        return {
+            "path": attrs["scriptsVhostDirectory"][0],
+            "aliases": attrs.get("scriptsVhostAlias", []),
+            "poolIPv4": attrs.get("scriptsVhostPoolIPv4", [None])[0],
+         }
     except IndexError:
         raise UserError(
             "The hostname '%s' does not exist for the '%s' locker." % (hostname, locker)