From 29d0f901dce745a30689dde510f0ecfbd9902c91 Mon Sep 17 00:00:00 2001
From: Armon Dadgar <armon.dadgar@gmail.com>
Date: Tue, 10 Dec 2013 13:17:54 -0800
Subject: [PATCH] consul: Adding LANMembers and WANMembers

---
 consul/server.go      | 10 ++++++++++
 consul/server_test.go | 18 ++++++++++++++++++
 2 files changed, 28 insertions(+)

diff --git a/consul/server.go b/consul/server.go
index b194569391..cfa9687992 100644
--- a/consul/server.go
+++ b/consul/server.go
@@ -327,3 +327,13 @@ func (s *Server) JoinWAN(addr string) error {
 	_, err := s.serfWAN.Join([]string{addr}, false)
 	return err
 }
+
+// LANMembers is used to return the members of the LAN cluster
+func (s *Server) LANMembers() []serf.Member {
+	return s.serfLAN.Members()
+}
+
+// WANMembers is used to return the members of the LAN cluster
+func (s *Server) WANMembers() []serf.Member {
+	return s.serfWAN.Members()
+}
diff --git a/consul/server_test.go b/consul/server_test.go
index 7e40be6773..ab13a71baf 100644
--- a/consul/server_test.go
+++ b/consul/server_test.go
@@ -82,6 +82,15 @@ func TestServer_JoinLAN(t *testing.T) {
 	if err := s2.JoinLAN(addr); err != nil {
 		t.Fatalf("err: %v", err)
 	}
+
+	// Check the members
+	if len(s1.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	if len(s2.LANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
 }
 
 func TestServer_JoinWAN(t *testing.T) {
@@ -99,6 +108,15 @@ func TestServer_JoinWAN(t *testing.T) {
 	if err := s2.JoinWAN(addr); err != nil {
 		t.Fatalf("err: %v", err)
 	}
+
+	// Check the members
+	if len(s1.WANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
+
+	if len(s2.WANMembers()) != 2 {
+		t.Fatalf("bad len")
+	}
 }
 
 func TestServer_Leave(t *testing.T) {