Pony that displays the fedora pool or ip

Author: Catherine Hong

scriptspony/controllers/root.py

@@ -81,6 +81,8 @@ def index(self, locker=None, sudo=False, **kwargs):
             try:
                 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

scriptspony/templates/index.mak

@@ -9,8 +9,8 @@ from scripts import auth
 
   <p>
     <table border="1">
-      <tr><th>Hostname</th><th>Path</th><th>Edit</th></tr>
-      %for host,aliases,path in hosts:
+      <tr><th>Hostname</th><th>Path</th><th>Fedora Pool</th><th>Edit</th></tr>
+      %for host,aliases,path,ipv4 in hosts:
         <tr>
           <td>
 	  <a href="http://${host}">${host}</a>
@@ -21,6 +21,9 @@ from scripts import auth
 	  <td>
 	    <small>/mit/${locker}/web_scripts/</small>${path}
 	  </td>
+	  <td>
+	  <big>${ipv4}</big>
+	  </td>
           %if host not in (locker+'.scripts.mit.edu',):
             <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

@@ -65,17 +65,32 @@ def list_vhosts(locker):
             "(&(objectClass=scriptsVhost)(scriptsVhostAccount=uid=%s,ou=People,dc=scripts,dc=mit,dc=edu))",
             [locker],
         ),
-        ["scriptsVhostName", "scriptsVhostDirectory", "scriptsVhostAlias"],
+        ["scriptsVhostName", "scriptsVhostDirectory", "scriptsVhostAlias", "scriptsVhostPoolIPv4"],
     )
     return [
         (
             m["scriptsVhostName"][0],
             m.get("scriptsVhostAlias", []),
             m["scriptsVhostDirectory"][0],
+            m["scriptsVhostPoolIPv4"][0],
         )
-        for i, m in res
+        for _, m in res
     ]
 
+@log.exceptions
+@reconnecting
+def list_pools():
+    """Returns the IP and description for each VhostPool"""
+    res = conn.search_s(
+        "ou=Pools,dc=scripts,dc=mit,dc=edu",
+        ldap.SCOPE_ONELEVEL,
+        "objectClass=scriptsVhostPool",
+        ["scriptsVhostPoolIPv4", "description"],
+    )
+    return {
+      m["scriptsVhostPoolIPv4"][0]: m["description"][0]
+      for _, m in res
+    }
 
 @team_sensitive
 @log.exceptions