flesh out the domain groups page

eleather · Apr 22, 2011 · 6e451e7 · 6e451e7
1 parent ff1ce7c
commit 6e451e7
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 7 deletions.
diff --git a/src/java/com/rapleaf/hank/ui/domain_groups.jsp b/src/java/com/rapleaf/hank/ui/domain_groups.jsp
@@ -20,15 +20,36 @@ Coordinator coord = (Coordinator)getServletContext().getAttribute("coordinator")
 <a href="ring_groups.jsp">Ring Groups</a>
 
 <h1>Domain Groups</h1>
-<table border=1>
-  <tr>
-    <td>Name</td>
-  </tr>
+<table>
   <%
   for (DomainGroupConfig domainConfig : coord.getDomainGroupConfigs()) {
     %>
     <tr>
-      <td><%= domainConfig.getName() %></td>
+      <td colspan=2><%= domainConfig.getName() %></td>
+    </tr>
+    <tr>
+      <td width=10>&nbsp;</td>
+      <td>
+	      <table>
+	        <% for (DomainGroupConfigVersion version : domainConfig.getVersions()) { %>
+	        <tr>
+	          <td colspan=2>v<%= version.getVersionNumber() %></td>
+	        </tr>
+	        <tr>
+            <td width=10>&nbsp;</td>
+	          <td>
+	            <table>
+	              <% for (DomainConfigVersion dcv : version.getDomainConfigVersions()) { %>
+	              <tr>
+	                <td><%= dcv.getDomainConfig().getName() %> @<%= dcv.getVersionNumber() %></td>
+	              </tr>
+	              <% } %>
+	            </table>
+	          </td>
+	        </tr>
+	        <% } %>
+	      </table>
+      </td>
     </tr>
     <%
   }

diff --git a/test/java/com/rapleaf/hank/ui/StatusWebDaemonTester.java b/test/java/com/rapleaf/hank/ui/StatusWebDaemonTester.java
@@ -4,17 +4,23 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
+import java.util.SortedSet;
+import java.util.TreeSet;
 
 import junit.framework.TestCase;
 
 import com.rapleaf.hank.config.ClientConfigurator;
 import com.rapleaf.hank.coordinator.Coordinator;
 import com.rapleaf.hank.coordinator.DomainConfig;
+import com.rapleaf.hank.coordinator.DomainConfigVersion;
 import com.rapleaf.hank.coordinator.DomainGroupConfig;
+import com.rapleaf.hank.coordinator.DomainGroupConfigVersion;
 import com.rapleaf.hank.coordinator.HostConfig;
 import com.rapleaf.hank.coordinator.MockCoordinator;
 import com.rapleaf.hank.coordinator.MockDomainConfig;
+import com.rapleaf.hank.coordinator.MockDomainConfigVersion;
 import com.rapleaf.hank.coordinator.MockDomainGroupConfig;
+import com.rapleaf.hank.coordinator.MockDomainGroupConfigVersion;
 import com.rapleaf.hank.coordinator.MockHostConfig;
 import com.rapleaf.hank.coordinator.MockRingConfig;
 import com.rapleaf.hank.coordinator.MockRingGroupConfig;
@@ -31,8 +37,24 @@ public void testIt() throws Exception {
     final DomainConfig domainConfig2 = new MockDomainConfig("Domain 2", 1024, new Murmur64Partitioner(), new ConstantStorageEngine(null), 10);
     final DomainConfig domainConfig3 = new MockDomainConfig("Domain 3", 1024, new Murmur64Partitioner(), new ConstantStorageEngine(null), 10);
 
-    final DomainGroupConfig domainGroup1 = new MockDomainGroupConfig("Domain Group 1");
-    final DomainGroupConfig domainGroup2 = new MockDomainGroupConfig("Domain Group 2");
+    final DomainGroupConfig domainGroup1 = new MockDomainGroupConfig("Domain Group 1") {
+      @Override
+      public SortedSet<DomainGroupConfigVersion> getVersions() {
+        HashSet<DomainConfigVersion> domainVersions = new HashSet<DomainConfigVersion>(Arrays.asList(
+            new MockDomainConfigVersion(domainConfig1, 5),
+            new MockDomainConfigVersion(domainConfig3, 7))
+        );
+        return new TreeSet<DomainGroupConfigVersion>(Arrays.asList(
+            new MockDomainGroupConfigVersion(domainVersions, this, 1)
+        ));
+      }
+    };
+    final DomainGroupConfig domainGroup2 = new MockDomainGroupConfig("Domain Group 2") {
+      @Override
+      public SortedSet<DomainGroupConfigVersion> getVersions() {
+        return new TreeSet<DomainGroupConfigVersion>();
+      }
+    };
 
     final RingConfig ring1_1 = new MockRingConfig(null, null, 1, RingState.UP) {
       @Override