From 4623276886033aedb4932c3996c7f61e7fc35861 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 7 Jul 2016 16:08:40 -0700 Subject: [PATCH 1/2] Revert "Fixed a few network UI issues in swarm-mode" This reverts commit 0ce5158a2a9a3f10a62d3c1ea289c55e524cdac5. Signed-off-by: Madhu Venugopal --- api/server/router/network/network_routes.go | 4 ---- daemon/network.go | 10 ---------- 2 files changed, 14 deletions(-) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index ebf2ce2872..7e5b94cb91 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -81,10 +81,6 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr return err } - if _, err := n.clusterProvider.GetNetwork(create.Name); err == nil { - return libnetwork.NetworkNameError(create.Name) - } - nw, err := n.backend.CreateNetwork(create) if err != nil { if _, ok := err.(libnetwork.ManagerRedirectError); !ok { diff --git a/daemon/network.go b/daemon/network.go index af10723383..a9944e637c 100644 --- a/daemon/network.go +++ b/daemon/network.go @@ -292,10 +292,6 @@ func (daemon *Daemon) UpdateContainerServiceConfig(containerName string, service return nil } -func errClusterNetworkConnect() error { - return fmt.Errorf("cannot connect or disconnect managed containers on a network") -} - // ConnectContainerToNetwork connects the given container to the given // network. If either cannot be found, an err is returned. If the // network cannot be set up, an err is returned. @@ -304,9 +300,6 @@ func (daemon *Daemon) ConnectContainerToNetwork(containerName, networkName strin if err != nil { return err } - if container.Managed { - return errClusterNetworkConnect() - } return daemon.ConnectToNetwork(container, networkName, endpointConfig) } @@ -320,9 +313,6 @@ func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, netwo } return err } - if container.Managed { - return errClusterNetworkConnect() - } return daemon.DisconnectFromNetwork(container, network, force) } From 6a4b21bd863f955d05e5df1e54be4dfcf6889870 Mon Sep 17 00:00:00 2001 From: Madhu Venugopal Date: Thu, 7 Jul 2016 16:10:43 -0700 Subject: [PATCH 2/2] fixes #23983 Signed-off-by: Madhu Venugopal --- api/server/router/network/network_routes.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/server/router/network/network_routes.go b/api/server/router/network/network_routes.go index 7e5b94cb91..ebf2ce2872 100644 --- a/api/server/router/network/network_routes.go +++ b/api/server/router/network/network_routes.go @@ -81,6 +81,10 @@ func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWr return err } + if _, err := n.clusterProvider.GetNetwork(create.Name); err == nil { + return libnetwork.NetworkNameError(create.Name) + } + nw, err := n.backend.CreateNetwork(create) if err != nil { if _, ok := err.(libnetwork.ManagerRedirectError); !ok {