mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
Reorganized the libnetwork code to seperate Controller, Network and Endpoint
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
This commit is contained in:
Jana Radhakrishnan
parent
b9a9f9117a
commit
713ff79ed5
3 changed files with 377 additions and 363 deletions
237
libnetwork/controller.go
Normal file
237
libnetwork/controller.go
Normal file
|
|
@ -0,0 +1,237 @@
|
|||
/*
|
||||
Package libnetwork provides the basic functionality and extension points to
|
||||
create network namespaces and allocate interfaces for containers to use.
|
||||
|
||||
// Create a new controller instance
|
||||
controller := libnetwork.New()
|
||||
|
||||
// Select and configure the network driver
|
||||
networkType := "bridge"
|
||||
option := options.Generic{}
|
||||
err := controller.ConfigureNetworkDriver(networkType, option)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
netOptions := options.Generic{}
|
||||
// Create a network for containers to join.
|
||||
network, err := controller.NewNetwork(networkType, "network1", netOptions)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 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. This info is contained or accessible
|
||||
// from the returned endpoint.
|
||||
ep, err := network.CreateEndpoint("Endpoint1", nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// A container can join the endpoint by providing the container ID to the join
|
||||
// api which returns the sandbox key which can be used to access the sandbox
|
||||
// created for the container during join.
|
||||
_, err = ep.Join("container1")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
*/
|
||||
package libnetwork
|
||||
|
||||
import (
|
||||
"sync"
|
||||
|
||||
"github.com/docker/docker/pkg/stringid"
|
||||
"github.com/docker/libnetwork/sandbox"
|
||||
"github.com/docker/libnetwork/types"
|
||||
)
|
||||
|
||||
// NetworkController provides the interface for controller instance which manages
|
||||
// networks.
|
||||
type NetworkController interface {
|
||||
// ConfigureNetworkDriver applies the passed options to the driver instance for the specified network type
|
||||
ConfigureNetworkDriver(networkType string, options interface{}) error
|
||||
|
||||
// Create a new network. The options parameter carries network specific options.
|
||||
// Labels support will be added in the near future.
|
||||
NewNetwork(networkType, name string, options interface{}) (Network, error)
|
||||
|
||||
// Networks returns the list of Network(s) managed by this controller.
|
||||
Networks() []Network
|
||||
|
||||
// WalkNetworks uses the provided function to walk the Network(s) managed by this controller.
|
||||
WalkNetworks(walker NetworkWalker)
|
||||
|
||||
// NetworkByName returns the Network which has the passed name, if it exists otherwise nil is returned
|
||||
NetworkByName(name string) Network
|
||||
|
||||
// NetworkByID returns the Network which has the passed id, if it exists otherwise nil is returned
|
||||
NetworkByID(id string) Network
|
||||
}
|
||||
|
||||
// NetworkWalker is a client provided function which will be used to walk the Networks.
|
||||
// When the function returns true, the walk will stop.
|
||||
type NetworkWalker func(nw Network) bool
|
||||
|
||||
type sandboxData struct {
|
||||
sandbox sandbox.Sandbox
|
||||
refCnt int
|
||||
}
|
||||
|
||||
type networkTable map[types.UUID]*network
|
||||
type endpointTable map[types.UUID]*endpoint
|
||||
type sandboxTable map[string]sandboxData
|
||||
|
||||
type controller struct {
|
||||
networks networkTable
|
||||
drivers driverTable
|
||||
sandboxes sandboxTable
|
||||
sync.Mutex
|
||||
}
|
||||
|
||||
// New creates a new instance of network controller.
|
||||
func New() NetworkController {
|
||||
return &controller{networkTable{}, enumerateDrivers(), sandboxTable{}, sync.Mutex{}}
|
||||
}
|
||||
|
||||
func (c *controller) ConfigureNetworkDriver(networkType string, options interface{}) error {
|
||||
d, ok := c.drivers[networkType]
|
||||
if !ok {
|
||||
return NetworkTypeError(networkType)
|
||||
}
|
||||
return d.Config(options)
|
||||
}
|
||||
|
||||
// NewNetwork creates a new network of the specified network type. The options
|
||||
// are network specific and modeled in a generic way.
|
||||
func (c *controller) NewNetwork(networkType, name string, options interface{}) (Network, error) {
|
||||
// Check if a driver for the specified network type is available
|
||||
d, ok := c.drivers[networkType]
|
||||
if !ok {
|
||||
return nil, ErrInvalidNetworkDriver
|
||||
}
|
||||
|
||||
// Check if a network already exists with the specified network name
|
||||
c.Lock()
|
||||
for _, n := range c.networks {
|
||||
if n.name == name {
|
||||
c.Unlock()
|
||||
return nil, NetworkNameError(name)
|
||||
}
|
||||
}
|
||||
c.Unlock()
|
||||
|
||||
// Construct the network object
|
||||
network := &network{
|
||||
name: name,
|
||||
id: types.UUID(stringid.GenerateRandomID()),
|
||||
ctrlr: c,
|
||||
driver: d,
|
||||
endpoints: endpointTable{},
|
||||
}
|
||||
|
||||
// Create the network
|
||||
if err := d.CreateNetwork(network.id, options); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Store the network handler in controller
|
||||
c.Lock()
|
||||
c.networks[network.id] = network
|
||||
c.Unlock()
|
||||
|
||||
return network, nil
|
||||
}
|
||||
|
||||
func (c *controller) Networks() []Network {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
list := make([]Network, 0, len(c.networks))
|
||||
for _, n := range c.networks {
|
||||
list = append(list, n)
|
||||
}
|
||||
|
||||
return list
|
||||
}
|
||||
|
||||
func (c *controller) WalkNetworks(walker NetworkWalker) {
|
||||
for _, n := range c.Networks() {
|
||||
if walker(n) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *controller) NetworkByName(name string) Network {
|
||||
var n Network
|
||||
|
||||
if name != "" {
|
||||
s := func(current Network) bool {
|
||||
if current.Name() == name {
|
||||
n = current
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
c.WalkNetworks(s)
|
||||
}
|
||||
|
||||
return n
|
||||
}
|
||||
|
||||
func (c *controller) NetworkByID(id string) Network {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
if n, ok := c.networks[types.UUID(id)]; ok {
|
||||
return n
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *controller) sandboxAdd(key string) (sandbox.Sandbox, error) {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData, ok := c.sandboxes[key]
|
||||
if !ok {
|
||||
sb, err := sandbox.NewSandbox(key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sData = sandboxData{sandbox: sb, refCnt: 1}
|
||||
c.sandboxes[key] = sData
|
||||
return sData.sandbox, nil
|
||||
}
|
||||
|
||||
sData.refCnt++
|
||||
return sData.sandbox, nil
|
||||
}
|
||||
|
||||
func (c *controller) sandboxRm(key string) {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData := c.sandboxes[key]
|
||||
sData.refCnt--
|
||||
|
||||
if sData.refCnt == 0 {
|
||||
sData.sandbox.Destroy()
|
||||
delete(c.sandboxes, key)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *controller) sandboxGet(key string) sandbox.Sandbox {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData, ok := c.sandboxes[key]
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
return sData.sandbox
|
||||
}
|
||||
140
libnetwork/endpoint.go
Normal file
140
libnetwork/endpoint.go
Normal file
|
|
@ -0,0 +1,140 @@
|
|||
package libnetwork
|
||||
|
||||
import (
|
||||
"github.com/docker/libnetwork/sandbox"
|
||||
"github.com/docker/libnetwork/types"
|
||||
)
|
||||
|
||||
// Endpoint represents a logical connection between a network and a sandbox.
|
||||
type Endpoint interface {
|
||||
// A system generated id for this endpoint.
|
||||
ID() string
|
||||
|
||||
// Name returns the name of this endpoint.
|
||||
Name() string
|
||||
|
||||
// Network returns the name of the network to which this endpoint is attached.
|
||||
Network() string
|
||||
|
||||
// Join creates a new sandbox for the given container ID and populates the
|
||||
// network resources allocated for the endpoint and joins the sandbox to
|
||||
// the endpoint. It returns the sandbox key to the caller
|
||||
Join(containerID string) (string, error)
|
||||
|
||||
// Leave removes the sandbox associated with container ID and detaches
|
||||
// the network resources populated in the sandbox
|
||||
Leave(containerID string) error
|
||||
|
||||
// SandboxInfo returns the sandbox information for this endpoint.
|
||||
SandboxInfo() *sandbox.Info
|
||||
|
||||
// Delete and detaches this endpoint from the network.
|
||||
Delete() error
|
||||
}
|
||||
|
||||
type endpoint struct {
|
||||
name string
|
||||
id types.UUID
|
||||
network *network
|
||||
sandboxInfo *sandbox.Info
|
||||
sandBox sandbox.Sandbox
|
||||
containerID string
|
||||
}
|
||||
|
||||
func (ep *endpoint) ID() string {
|
||||
return string(ep.id)
|
||||
}
|
||||
|
||||
func (ep *endpoint) Name() string {
|
||||
return ep.name
|
||||
}
|
||||
|
||||
func (ep *endpoint) Network() string {
|
||||
return ep.network.name
|
||||
}
|
||||
|
||||
func (ep *endpoint) SandboxInfo() *sandbox.Info {
|
||||
if ep.sandboxInfo == nil {
|
||||
return nil
|
||||
}
|
||||
return ep.sandboxInfo.GetCopy()
|
||||
}
|
||||
|
||||
func (ep *endpoint) Join(containerID string) (string, error) {
|
||||
if containerID == "" {
|
||||
return "", InvalidContainerIDError(containerID)
|
||||
}
|
||||
|
||||
if ep.containerID != "" {
|
||||
return "", ErrInvalidJoin
|
||||
}
|
||||
|
||||
sboxKey := sandbox.GenerateKey(containerID)
|
||||
sb, err := ep.network.ctrlr.sandboxAdd(sboxKey)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer func() {
|
||||
if err != nil {
|
||||
ep.network.ctrlr.sandboxRm(sboxKey)
|
||||
}
|
||||
}()
|
||||
|
||||
sinfo := ep.SandboxInfo()
|
||||
if sinfo != nil {
|
||||
for _, i := range sinfo.Interfaces {
|
||||
err = sb.AddInterface(i)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
err = sb.SetGateway(sinfo.Gateway)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
err = sb.SetGatewayIPv6(sinfo.GatewayIPv6)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
ep.containerID = containerID
|
||||
return sb.Key(), nil
|
||||
}
|
||||
|
||||
func (ep *endpoint) Leave(containerID string) error {
|
||||
if ep.containerID == "" || containerID == "" || ep.containerID != containerID {
|
||||
return InvalidContainerIDError(containerID)
|
||||
}
|
||||
|
||||
ep.network.ctrlr.sandboxRm(sandbox.GenerateKey(containerID))
|
||||
ep.containerID = ""
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ep *endpoint) Delete() error {
|
||||
var err error
|
||||
|
||||
n := ep.network
|
||||
n.Lock()
|
||||
_, ok := n.endpoints[ep.id]
|
||||
if !ok {
|
||||
n.Unlock()
|
||||
return &UnknownEndpointError{name: ep.name, id: string(ep.id)}
|
||||
}
|
||||
|
||||
delete(n.endpoints, ep.id)
|
||||
n.Unlock()
|
||||
defer func() {
|
||||
if err != nil {
|
||||
n.Lock()
|
||||
n.endpoints[ep.id] = ep
|
||||
n.Unlock()
|
||||
}
|
||||
}()
|
||||
|
||||
err = n.driver.DeleteEndpoint(n.id, ep.id)
|
||||
return err
|
||||
}
|
||||
|
|
@ -1,42 +1,3 @@
|
|||
/*
|
||||
Package libnetwork provides the basic functionality and extension points to
|
||||
create network namespaces and allocate interfaces for containers to use.
|
||||
|
||||
// Create a new controller instance
|
||||
controller := libnetwork.New()
|
||||
|
||||
// Select and configure the network driver
|
||||
networkType := "bridge"
|
||||
option := options.Generic{}
|
||||
err := controller.ConfigureNetworkDriver(networkType, option)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
netOptions := options.Generic{}
|
||||
// Create a network for containers to join.
|
||||
network, err := controller.NewNetwork(networkType, "network1", netOptions)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// 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. This info is contained or accessible
|
||||
// from the returned endpoint.
|
||||
ep, err := network.CreateEndpoint("Endpoint1", nil)
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
|
||||
// A container can join the endpoint by providing the container ID to the join
|
||||
// api which returns the sandbox key which can be used to access the sandbox
|
||||
// created for the container during join.
|
||||
_, err = ep.Join("container1")
|
||||
if err != nil {
|
||||
return
|
||||
}
|
||||
*/
|
||||
package libnetwork
|
||||
|
||||
import (
|
||||
|
|
@ -44,33 +5,9 @@ import (
|
|||
|
||||
"github.com/docker/docker/pkg/stringid"
|
||||
"github.com/docker/libnetwork/driverapi"
|
||||
"github.com/docker/libnetwork/sandbox"
|
||||
"github.com/docker/libnetwork/types"
|
||||
)
|
||||
|
||||
// NetworkController provides the interface for controller instance which manages
|
||||
// networks.
|
||||
type NetworkController interface {
|
||||
// ConfigureNetworkDriver applies the passed options to the driver instance for the specified network type
|
||||
ConfigureNetworkDriver(networkType string, options interface{}) error
|
||||
|
||||
// Create a new network. The options parameter carries network specific options.
|
||||
// Labels support will be added in the near future.
|
||||
NewNetwork(networkType, name string, options interface{}) (Network, error)
|
||||
|
||||
// Networks returns the list of Network(s) managed by this controller.
|
||||
Networks() []Network
|
||||
|
||||
// WalkNetworks uses the provided function to walk the Network(s) managed by this controller.
|
||||
WalkNetworks(walker NetworkWalker)
|
||||
|
||||
// NetworkByName returns the Network which has the passed name, if it exists otherwise nil is returned
|
||||
NetworkByName(name string) Network
|
||||
|
||||
// NetworkByID returns the Network which has the passed id, if it exists otherwise nil is returned
|
||||
NetworkByID(id string) Network
|
||||
}
|
||||
|
||||
// A Network represents a logical connectivity zone that containers may
|
||||
// join using the Link method. A Network is managed by a specific driver.
|
||||
type Network interface {
|
||||
|
|
@ -104,37 +41,6 @@ type Network interface {
|
|||
EndpointByID(id string) Endpoint
|
||||
}
|
||||
|
||||
// NetworkWalker is a client provided function which will be used to walk the Networks.
|
||||
// When the function returns true, the walk will stop.
|
||||
type NetworkWalker func(nw Network) bool
|
||||
|
||||
// Endpoint represents a logical connection between a network and a sandbox.
|
||||
type Endpoint interface {
|
||||
// A system generated id for this endpoint.
|
||||
ID() string
|
||||
|
||||
// Name returns the name of this endpoint.
|
||||
Name() string
|
||||
|
||||
// Network returns the name of the network to which this endpoint is attached.
|
||||
Network() string
|
||||
|
||||
// Join creates a new sandbox for the given container ID and populates the
|
||||
// network resources allocated for the endpoint and joins the sandbox to
|
||||
// the endpoint. It returns the sandbox key to the caller
|
||||
Join(containerID string) (string, error)
|
||||
|
||||
// Leave removes the sandbox associated with container ID and detaches
|
||||
// the network resources populated in the sandbox
|
||||
Leave(containerID string) error
|
||||
|
||||
// SandboxInfo returns the sandbox information for this endpoint.
|
||||
SandboxInfo() *sandbox.Info
|
||||
|
||||
// Delete and detaches this endpoint from the network.
|
||||
Delete() error
|
||||
}
|
||||
|
||||
// EndpointWalker is a client provided function which will be used to walk the Endpoints.
|
||||
// When the function returns true, the walk will stop.
|
||||
type EndpointWalker func(ep Endpoint) bool
|
||||
|
|
@ -149,177 +55,6 @@ type network struct {
|
|||
sync.Mutex
|
||||
}
|
||||
|
||||
type endpoint struct {
|
||||
name string
|
||||
id types.UUID
|
||||
network *network
|
||||
sandboxInfo *sandbox.Info
|
||||
sandBox sandbox.Sandbox
|
||||
containerID string
|
||||
}
|
||||
|
||||
type sandboxData struct {
|
||||
sandbox sandbox.Sandbox
|
||||
refCnt int
|
||||
}
|
||||
|
||||
type networkTable map[types.UUID]*network
|
||||
type endpointTable map[types.UUID]*endpoint
|
||||
type sandboxTable map[string]sandboxData
|
||||
|
||||
type controller struct {
|
||||
networks networkTable
|
||||
drivers driverTable
|
||||
sandboxes sandboxTable
|
||||
sync.Mutex
|
||||
}
|
||||
|
||||
// New creates a new instance of network controller.
|
||||
func New() NetworkController {
|
||||
return &controller{networkTable{}, enumerateDrivers(), sandboxTable{}, sync.Mutex{}}
|
||||
}
|
||||
|
||||
func (c *controller) ConfigureNetworkDriver(networkType string, options interface{}) error {
|
||||
d, ok := c.drivers[networkType]
|
||||
if !ok {
|
||||
return NetworkTypeError(networkType)
|
||||
}
|
||||
return d.Config(options)
|
||||
}
|
||||
|
||||
// NewNetwork creates a new network of the specified network type. The options
|
||||
// are network specific and modeled in a generic way.
|
||||
func (c *controller) NewNetwork(networkType, name string, options interface{}) (Network, error) {
|
||||
// Check if a driver for the specified network type is available
|
||||
d, ok := c.drivers[networkType]
|
||||
if !ok {
|
||||
return nil, ErrInvalidNetworkDriver
|
||||
}
|
||||
|
||||
// Check if a network already exists with the specified network name
|
||||
c.Lock()
|
||||
for _, n := range c.networks {
|
||||
if n.name == name {
|
||||
c.Unlock()
|
||||
return nil, NetworkNameError(name)
|
||||
}
|
||||
}
|
||||
c.Unlock()
|
||||
|
||||
// Construct the network object
|
||||
network := &network{
|
||||
name: name,
|
||||
id: types.UUID(stringid.GenerateRandomID()),
|
||||
ctrlr: c,
|
||||
driver: d,
|
||||
endpoints: endpointTable{},
|
||||
}
|
||||
|
||||
// Create the network
|
||||
if err := d.CreateNetwork(network.id, options); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
// Store the network handler in controller
|
||||
c.Lock()
|
||||
c.networks[network.id] = network
|
||||
c.Unlock()
|
||||
|
||||
return network, nil
|
||||
}
|
||||
|
||||
func (c *controller) Networks() []Network {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
list := make([]Network, 0, len(c.networks))
|
||||
for _, n := range c.networks {
|
||||
list = append(list, n)
|
||||
}
|
||||
|
||||
return list
|
||||
}
|
||||
|
||||
func (c *controller) WalkNetworks(walker NetworkWalker) {
|
||||
for _, n := range c.Networks() {
|
||||
if walker(n) {
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func (c *controller) NetworkByName(name string) Network {
|
||||
var n Network
|
||||
|
||||
if name != "" {
|
||||
s := func(current Network) bool {
|
||||
if current.Name() == name {
|
||||
n = current
|
||||
return true
|
||||
}
|
||||
return false
|
||||
}
|
||||
|
||||
c.WalkNetworks(s)
|
||||
}
|
||||
|
||||
return n
|
||||
}
|
||||
|
||||
func (c *controller) NetworkByID(id string) Network {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
if n, ok := c.networks[types.UUID(id)]; ok {
|
||||
return n
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (c *controller) sandboxAdd(key string) (sandbox.Sandbox, error) {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData, ok := c.sandboxes[key]
|
||||
if !ok {
|
||||
sb, err := sandbox.NewSandbox(key)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
sData = sandboxData{sandbox: sb, refCnt: 1}
|
||||
c.sandboxes[key] = sData
|
||||
return sData.sandbox, nil
|
||||
}
|
||||
|
||||
sData.refCnt++
|
||||
return sData.sandbox, nil
|
||||
}
|
||||
|
||||
func (c *controller) sandboxRm(key string) {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData := c.sandboxes[key]
|
||||
sData.refCnt--
|
||||
|
||||
if sData.refCnt == 0 {
|
||||
sData.sandbox.Destroy()
|
||||
delete(c.sandboxes, key)
|
||||
}
|
||||
}
|
||||
|
||||
func (c *controller) sandboxGet(key string) sandbox.Sandbox {
|
||||
c.Lock()
|
||||
defer c.Unlock()
|
||||
|
||||
sData, ok := c.sandboxes[key]
|
||||
if !ok {
|
||||
return nil
|
||||
}
|
||||
|
||||
return sData.sandbox
|
||||
}
|
||||
|
||||
func (n *network) Name() string {
|
||||
return n.name
|
||||
}
|
||||
|
|
@ -431,101 +166,3 @@ func (n *network) EndpointByID(id string) Endpoint {
|
|||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ep *endpoint) ID() string {
|
||||
return string(ep.id)
|
||||
}
|
||||
|
||||
func (ep *endpoint) Name() string {
|
||||
return ep.name
|
||||
}
|
||||
|
||||
func (ep *endpoint) Network() string {
|
||||
return ep.network.name
|
||||
}
|
||||
|
||||
func (ep *endpoint) SandboxInfo() *sandbox.Info {
|
||||
if ep.sandboxInfo == nil {
|
||||
return nil
|
||||
}
|
||||
return ep.sandboxInfo.GetCopy()
|
||||
}
|
||||
|
||||
func (ep *endpoint) Join(containerID string) (string, error) {
|
||||
if containerID == "" {
|
||||
return "", InvalidContainerIDError(containerID)
|
||||
}
|
||||
|
||||
if ep.containerID != "" {
|
||||
return "", ErrInvalidJoin
|
||||
}
|
||||
|
||||
sboxKey := sandbox.GenerateKey(containerID)
|
||||
sb, err := ep.network.ctrlr.sandboxAdd(sboxKey)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
defer func() {
|
||||
if err != nil {
|
||||
ep.network.ctrlr.sandboxRm(sboxKey)
|
||||
}
|
||||
}()
|
||||
|
||||
sinfo := ep.SandboxInfo()
|
||||
if sinfo != nil {
|
||||
for _, i := range sinfo.Interfaces {
|
||||
err = sb.AddInterface(i)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
err = sb.SetGateway(sinfo.Gateway)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
err = sb.SetGatewayIPv6(sinfo.GatewayIPv6)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
}
|
||||
|
||||
ep.containerID = containerID
|
||||
return sb.Key(), nil
|
||||
}
|
||||
|
||||
func (ep *endpoint) Leave(containerID string) error {
|
||||
if ep.containerID == "" || containerID == "" || ep.containerID != containerID {
|
||||
return InvalidContainerIDError(containerID)
|
||||
}
|
||||
|
||||
ep.network.ctrlr.sandboxRm(sandbox.GenerateKey(containerID))
|
||||
ep.containerID = ""
|
||||
return nil
|
||||
}
|
||||
|
||||
func (ep *endpoint) Delete() error {
|
||||
var err error
|
||||
|
||||
n := ep.network
|
||||
n.Lock()
|
||||
_, ok := n.endpoints[ep.id]
|
||||
if !ok {
|
||||
n.Unlock()
|
||||
return &UnknownEndpointError{name: ep.name, id: string(ep.id)}
|
||||
}
|
||||
|
||||
delete(n.endpoints, ep.id)
|
||||
n.Unlock()
|
||||
defer func() {
|
||||
if err != nil {
|
||||
n.Lock()
|
||||
n.endpoints[ep.id] = ep
|
||||
n.Unlock()
|
||||
}
|
||||
}()
|
||||
|
||||
err = n.driver.DeleteEndpoint(n.id, ep.id)
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue