Extract 'api' package

This commit is contained in:
Bryan Boreham committed 2015-11-30 14:27:33 +00:00
1 parent bd2b8df7c5
commit e101dde62e
7 files changed
+139 -149

No files matched your search

-55
View File
@@ -1,55 +0,0 @@
package plugin
import (
"fmt"
"net/http"
"net/url"
"strings"
)
func (d *dockerer) registerWithDNS(ID string, fqdn string, ip string) error {
dnsip, err := d.client.GetContainerBridgeIP(WeaveContainer)
if err != nil {
return fmt.Errorf("nameserver not available: %s", err)
}
data := url.Values{}
data.Add("fqdn", fqdn)
req, err := http.NewRequest("PUT", fmt.Sprintf("http://%s:6785/name/%s/%s", dnsip, ID, ip), strings.NewReader(data.Encode()))
if err != nil {
return err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
cl := &http.Client{}
res, err := cl.Do(req)
if err != nil {
return err
}
if res.StatusCode != http.StatusOK {
return fmt.Errorf("non-OK status from nameserver: %d", res.StatusCode)
}
return nil
}
func (d *dockerer) deregisterWithDNS(ID string, ip string) error {
dnsip, err := d.client.GetContainerBridgeIP(WeaveContainer)
if err != nil {
return fmt.Errorf("nameserver not available: %s", err)
}
req, err := http.NewRequest("DELETE", fmt.Sprintf("http://%s:6785/name/%s/%s", dnsip, ID, ip), nil)
if err != nil {
return err
}
cl := &http.Client{}
res, err := cl.Do(req)
if err != nil {
return err
}
if res.StatusCode != http.StatusOK {
return fmt.Errorf("non-OK status from nameserver: %d", res.StatusCode)
}
return nil
}
-89
View File
@@ -1,89 +0,0 @@
package plugin
import (
"fmt"
"io/ioutil"
"net"
"net/http"
. "github.com/weaveworks/weave/common"
)
func (d *dockerer) ipamOp(ID string, op string) (*net.IPNet, error) {
weaveip, err := d.client.GetContainerBridgeIP(WeaveContainer)
Log.Debugf("IPAM operation %s for %s", op, ID)
if err != nil {
return nil, err
}
var res *http.Response
url := fmt.Sprintf("http://%s:6784/ip/%s", weaveip, ipamID(ID))
Log.Debugf("Attempting to %s to %s", op, url)
if op == "POST" {
res, err = http.Post(url, "", nil)
} else if op == "GET" {
res, err = http.Get(url)
}
if err != nil {
return nil, err
}
if res.StatusCode != http.StatusOK {
return nil, fmt.Errorf("received status %d from IPAM", res.StatusCode)
}
body, err := ioutil.ReadAll(res.Body)
if err != nil {
return nil, err
}
return parseIP(string(body))
}
// returns an IP for the ID given, allocating a fresh one if necessary
func (d *dockerer) allocateIP(ID string) (*net.IPNet, error) {
return d.ipamOp(ID, "POST")
}
// returns an IP for the ID given, or nil if one has not been
// allocated
func (d *dockerer) lookupIP(ID string) (*net.IPNet, error) {
return d.ipamOp(ID, "GET")
}
// release an IP which is no longer needed
func (d *dockerer) releaseIP(ID string) error {
weaveip, err := d.client.GetContainerBridgeIP(WeaveContainer)
if err != nil {
return err
}
req, err := http.NewRequest("DELETE", fmt.Sprintf("http://%s:6784/ip/%s", weaveip, ipamID(ID)), nil)
if err != nil {
return err
}
cl := &http.Client{}
res, err := cl.Do(req)
if err != nil {
return err
}
if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusNoContent {
return fmt.Errorf("unexpected HTTP status code from IP release: %d", res.StatusCode)
}
return nil
}
func parseIP(body string) (*net.IPNet, error) {
ip, ipnet, err := net.ParseCIDR(string(body))
if err != nil {
return nil, err
}
ipnet.IP = ip
return ipnet, nil
}
// If something looking like a container ID is supplied to IPAM, it
// will try to check that it's running, and return nothing (and empty
// string) if it's not. So I make sure it doesn't look like a
// container ID by including non-hex characters.
func ipamID(ID string) string {
return "endpoint:" + ID
}
+18 -4
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"strings"
weaveapi "github.com/weaveworks/weave/api"
. "github.com/weaveworks/weave/common"
"github.com/weaveworks/weave/common/docker"
)
@@ -14,6 +15,7 @@ const (
type watcher struct {
dockerer
weave *weaveapi.Client
}
type Watcher interface {
@@ -33,6 +35,18 @@ func NewWatcher(client *docker.Client) (Watcher, error) {
return w, nil
}
func (w *watcher) haveWeaveClient() bool {
if w.weave == nil {
dnsip, err := w.client.GetContainerBridgeIP(WeaveContainer)
if err != nil {
Log.Warningf("nameserver not available: %s", err)
return false
}
w.weave = weaveapi.NewClient(dnsip)
}
return true
}
func (w *watcher) ContainerStarted(id string) {
Log.Debugf("Container started %s", id)
info, err := w.client.InspectContainer(id)
@@ -41,11 +55,11 @@ func (w *watcher) ContainerStarted(id string) {
return
}
// FIXME: check that it's on our network; but, the docker client lib doesn't know about .NetworkID
if isSubdomain(info.Config.Domainname, WeaveDomain) {
if isSubdomain(info.Config.Domainname, WeaveDomain) && w.haveWeaveClient() {
// one of ours
ip := info.NetworkSettings.IPAddress
fqdn := fmt.Sprintf("%s.%s", info.Config.Hostname, info.Config.Domainname)
if err := w.registerWithDNS(id, fqdn, ip); err != nil {
if err := w.weave.RegisterWithDNS(id, fqdn, ip); err != nil {
Log.Warningf("unable to register with weaveDNS: %s", err)
}
}
@@ -58,9 +72,9 @@ func (w *watcher) ContainerDied(id string) {
Log.Warningf("error inspecting container: %s", err)
return
}
if isSubdomain(info.Config.Domainname, WeaveDomain) {
if isSubdomain(info.Config.Domainname, WeaveDomain) && w.haveWeaveClient() {
ip := info.NetworkSettings.IPAddress
if err := w.deregisterWithDNS(id, ip); err != nil {
if err := w.weave.DeregisterWithDNS(id, ip); err != nil {
Log.Warningf("unable to deregister with weaveDNS: %s", err)
}
}