refactor network interface, will response subnets (#240)

projecteru2 · Aug 11, 2020 · fd80ffd · fd80ffd
1 parent cd44595
commit fd80ffd
Show file tree

Hide file tree

Showing 13 changed files with 401 additions and 371 deletions.
diff --git a/cluster/calcium/network.go b/cluster/calcium/network.go
@@ -32,17 +32,17 @@ func (c *Calcium) ListNetworks(ctx context.Context, podname string, driver strin
 }
 
 // ConnectNetwork connect to a network
-func (c *Calcium) ConnectNetwork(ctx context.Context, network, target, ipv4, ipv6 string) error {
+func (c *Calcium) ConnectNetwork(ctx context.Context, network, target, ipv4, ipv6 string) ([]string, error) {
 	container, err := c.GetContainer(ctx, target)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	return container.Engine.NetworkConnect(ctx, network, target, ipv4, ipv6)
 }
 
-// DisConnectNetwork connect to a network
-func (c *Calcium) DisConnectNetwork(ctx context.Context, network, target string, force bool) error {
+// DisconnectNetwork connect to a network
+func (c *Calcium) DisconnectNetwork(ctx context.Context, network, target string, force bool) error {
 	container, err := c.GetContainer(ctx, target)
 	if err != nil {
 		return err

diff --git a/cluster/calcium/network_test.go b/cluster/calcium/network_test.go
@@ -52,11 +52,11 @@ func TestConnectNetwork(t *testing.T) {
 	container := &types.Container{Engine: engine}
 
 	store.On("GetContainer", mock.Anything, mock.Anything).Return(nil, types.ErrBadMeta).Once()
-	err := c.ConnectNetwork(ctx, "network", "123", "", "")
+	_, err := c.ConnectNetwork(ctx, "network", "123", "", "")
 	assert.Error(t, err)
 	store.On("GetContainer", mock.Anything, mock.Anything).Return(container, nil)
-	engine.On("NetworkConnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
-	err = c.ConnectNetwork(ctx, "network", "123", "", "")
+	engine.On("NetworkConnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
+	_, err = c.ConnectNetwork(ctx, "network", "123", "", "")
 	assert.NoError(t, err)
 }
 
@@ -69,10 +69,10 @@ func TestDisConnectNetwork(t *testing.T) {
 	container := &types.Container{Engine: engine}
 
 	store.On("GetContainer", mock.Anything, mock.Anything).Return(nil, types.ErrBadMeta).Once()
-	err := c.DisConnectNetwork(ctx, "network", "123", true)
+	err := c.DisconnectNetwork(ctx, "network", "123", true)
 	assert.Error(t, err)
 	store.On("GetContainer", mock.Anything, mock.Anything).Return(container, nil)
 	engine.On("NetworkDisconnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
-	err = c.DisConnectNetwork(ctx, "network", "123", true)
+	err = c.DisconnectNetwork(ctx, "network", "123", true)
 	assert.NoError(t, err)
 }
diff --git a/cluster/cluster.go b/cluster/cluster.go
@@ -46,8 +46,8 @@ const (
 type Cluster interface {
 	// meta networks
 	ListNetworks(ctx context.Context, podname string, driver string) ([]*enginetypes.Network, error)
-	ConnectNetwork(ctx context.Context, network, target, ipv4, ipv6 string) error
-	DisConnectNetwork(ctx context.Context, network, target string, force bool) error
+	ConnectNetwork(ctx context.Context, network, target, ipv4, ipv6 string) ([]string, error)
+	DisconnectNetwork(ctx context.Context, network, target string, force bool) error
 	// meta pod
 	AddPod(ctx context.Context, podname, desc string) (*types.Pod, error)
 	RemovePod(ctx context.Context, podname string) error

diff --git a/cluster/mocks/Cluster.go b/cluster/mocks/Cluster.go
diff --git a/engine/docker/network.go b/engine/docker/network.go
@@ -13,12 +13,23 @@ import (
 )
 
 // NetworkConnect connect to a network
-func (e *Engine) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) error {
+func (e *Engine) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) ([]string, error) {
 	config, err := e.makeIPV4EndpointSetting(ipv4)
 	if err != nil {
-		return err
+		return nil, err
 	}
-	return e.client.NetworkConnect(ctx, network, target, config)
+	if err := e.client.NetworkConnect(ctx, network, target, config); err != nil {
+		return nil, err
+	}
+	container, err := e.client.ContainerInspect(ctx, target)
+	if err != nil {
+		return nil, err
+	}
+	ns := container.NetworkSettings.Networks[network]
+	if ns == nil {
+		return []string{}, nil
+	}
+	return []string{ns.IPAddress}, nil
 }
 
 // NetworkDisconnect disconnect from a network

diff --git a/engine/engine.go b/engine/engine.go
@@ -18,7 +18,7 @@ type API interface {
 	ExecResize(ctx context.Context, execID string, height, width uint) (err error)
 	ExecExitCode(ctx context.Context, execID string) (int, error)
 
-	NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) error
+	NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) ([]string, error)
 	NetworkDisconnect(ctx context.Context, network, target string, force bool) error
 	NetworkList(ctx context.Context, drivers []string) ([]*enginetypes.Network, error)
 

diff --git a/engine/mocks/API.go b/engine/mocks/API.go
diff --git a/engine/mocks/fakeengine/mock.go b/engine/mocks/fakeengine/mock.go
@@ -45,7 +45,7 @@ func MakeClient(ctx context.Context, config coretypes.Config, nodename, endpoint
 	e.On("ExecResize", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	e.On("ExecExitCode", mock.Anything, execID).Return(0, nil)
 	// network
-	e.On("NetworkConnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
+	e.On("NetworkConnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return([]string{}, nil)
 	e.On("NetworkDisconnect", mock.Anything, mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	e.On("NetworkList", mock.Anything, mock.Anything).Return([]*enginetypes.Network{{
 		Name: "mock-network", Subnets: []string{"1.1.1.1/8", "2.2.2.2/8"},

diff --git a/engine/systemd/network.go b/engine/systemd/network.go
@@ -8,7 +8,7 @@ import (
 )
 
 // NetworkConnect connects target netloc
-func (s *SSHClient) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) (err error) {
+func (s *SSHClient) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) (subnets []string, err error) {
 	err = types.ErrEngineNotImplemented
 	return
 }

diff --git a/engine/virt/virt.go b/engine/virt/virt.go
@@ -111,7 +111,7 @@ func (v *Virt) ExecResize(ctx context.Context, execID string, height, width uint
 }
 
 // NetworkConnect connects to a network.
-func (v *Virt) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) (err error) {
+func (v *Virt) NetworkConnect(ctx context.Context, network, target, ipv4, ipv6 string) (subnet []string, err error) {
 	log.Warnf("NetworkConnect does not implement")
 	return
 }