Handle optional IPAM and DNS

weaveworks · Aug 3, 2015 · af6f664 · af6f664
1 parent 611bc89
commit af6f664
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 10 deletions.
diff --git a/ipam/status.go b/ipam/status.go
@@ -18,15 +18,20 @@ type IPAMEntryStatus struct {
 	Version uint32
 }
 
-func NewIPAMStatus(allocator *Allocator, defaultSubnet address.CIDR) IPAMStatus {
-	resultChan := make(chan IPAMStatus)
+func NewIPAMStatus(allocator *Allocator, defaultSubnet address.CIDR) *IPAMStatus {
+	if allocator == nil {
+		return nil
+	}
+
+	resultChan := make(chan *IPAMStatus)
 	allocator.actionChan <- func() {
-		resultChan <- IPAMStatus{
+		resultChan <- &IPAMStatus{
 			paxos.NewPaxosStatus(allocator.paxos),
 			allocator.universe.String(),
 			defaultSubnet.String(),
 			newIPAMEntryStatusSlice(allocator)}
 	}
+
 	return <-resultChan
 }
 

diff --git a/nameserver/status.go b/nameserver/status.go
@@ -15,8 +15,12 @@ type DNSEntryStatus struct {
 	Version     int
 }
 
-func NewDNSStatus(ns *Nameserver, dnsServer *DNSServer) DNSStatus {
-	return DNSStatus{
+func NewDNSStatus(ns *Nameserver, dnsServer *DNSServer) *DNSStatus {
+	if dnsServer == nil {
+		return nil
+	}
+
+	return &DNSStatus{
 		dnsServer.domain,
 		dnsServer.address,
 		dnsServer.ttl,

diff --git a/prog/weaver/http.go b/prog/weaver/http.go
@@ -63,6 +63,7 @@ var statusTemplate = defTemplate("status", `\
       DirectPeers: {{len .Router.ConnectionMaker.DirectPeers}}
      Reconnecting: {{len .Router.ConnectionMaker.Reconnects}}
     Unestablished: {{countUnestablished .Router.Peers}}
+{{if .IPAM}}\
 
           Service: ipam
 {{if .IPAM.Paxos}}\
@@ -73,12 +74,15 @@ var statusTemplate = defTemplate("status", `\
             Range: {{.IPAM.Range}}
     DefaultSubnet: {{.IPAM.DefaultSubnet}}
           Entries: {{len .IPAM.Entries}}
+{{end}}\
+{{if .DNS}}\
 
           Service: dns
            Domain: {{.DNS.Domain}}
           Address: {{.DNS.Address}}
               TTL: {{.DNS.TTL}}
           Entries: {{len .DNS.Entries}}
+{{end}}\
 `)
 
 var peersTemplate = defTemplate("peers", `\

diff --git a/prog/weaver/status.go b/prog/weaver/status.go
@@ -8,9 +8,9 @@ import (
 )
 
 type WeaveStatus struct {
-	Router router.RouterStatus
-	IPAM   ipam.IPAMStatus
-	DNS    nameserver.DNSStatus
+	Router *router.RouterStatus  `json:"Router,omitempty"`
+	IPAM   *ipam.IPAMStatus      `json:"IPAM,omitempty"`
+	DNS    *nameserver.DNSStatus `json:"DNS,omitempty"`
 }
 
 func NewWeaveStatus(

diff --git a/router/status.go b/router/status.go
@@ -64,8 +64,8 @@ type BroadcastRouteStatus struct {
 	Via    []string
 }
 
-func NewRouterStatus(router *Router) RouterStatus {
-	return RouterStatus{
+func NewRouterStatus(router *Router) *RouterStatus {
+	return &RouterStatus{
 		router.UsingPassword(),
 		router.PeerDiscovery,
 		router.Ourself.Name.String(),