beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add Network method to return list of endpoints

Browse source 
Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch 2015-04-17 23:13:29 -07:00
parent 91eef607d0
commit f151cc23ab
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libnetwork/libnetwork_test.go
View file

@ -70,6 +70,14 @@ func TestSimplebridge(t *testing.T) {
t.Fatal(err)
}
epList := network.Endpoints()
if len(epList) != 1 {
t.Fatal(err)
}
if ep != epList[0] {
t.Fatal(err)
}
if err := ep.Delete(); err != nil {
t.Fatal(err)
}

20
libnetwork/network.go
View file

@ -31,7 +31,7 @@ create network namespaces and allocate interfaces for containers to use.
// For each new container: allocate IP and interfaces. The returned network
// settings will be used for container infos (inspect and such), as well as
// iptables rules for port publishing.
_, sinfo, err := network.CreateEndpoint("Endpoint1", networkNamespace.Key(), "")
ep, err := network.CreateEndpoint("Endpoint1", networkNamespace.Key(), "")
if err != nil {
return
}
@ -71,6 +71,9 @@ type Network interface {
// Labels support will be added in the near future.
CreateEndpoint(name string, sboxKey string, options interface{}) (Endpoint, *driverapi.SandboxInfo, error)
// Endpoints returns the list of Endpoint in this network.
Endpoints() []Endpoint
// Delete the network.
Delete() error
}
@ -240,6 +243,21 @@ func (n *network) CreateEndpoint(name string, sboxKey string, options interface{
return ep, sinfo, nil
}
func (n *network) Endpoints() []Endpoint {
n.Lock()
defer n.Unlock()
list := make([]Endpoint, len(n.endpoints))
idx := 0
for _, e := range n.endpoints {
list[idx] = e
idx++
}
return list
}
func (ep *endpoint) ID() string {
return string(ep.id)
}