add network connect|disconnect compat endpoints

this enables the ability to connect and disconnect a container from a
given network. it is only for the compatibility layer. some code had to
be refactored to avoid circular imports.

additionally, tests are being deferred temporarily due to some
incompatibility/bug in either docker-py or our stack.

Signed-off-by: baude <bbaude@redhat.com>

1 files changed, 8 insertions, 10 deletions

diff --git a/libpod/boltdb_state.go b/libpod/boltdb_state.go
index be0adfe6a..dcb2ff751 100644
--- a/libpod/boltdb_state.go
+++ b/libpod/boltdb_state.go
@@ -1296,10 +1296,6 @@ func (s *BoltState) NetworkDisconnect(ctr *Container, network string) error {
 		}
 
 		ctrAliasesBkt := dbCtr.Bucket(aliasesBkt)
-		if ctrAliasesBkt == nil {
-			return errors.Wrapf(define.ErrNoAliases, "container %s has no network aliases", ctr.ID())
-		}
-
 		ctrNetworksBkt := dbCtr.Bucket(networksBkt)
 		if ctrNetworksBkt == nil {
 			return errors.Wrapf(define.ErrNoSuchNetwork, "container %s is not connected to any CNI networks, so cannot disconnect", ctr.ID())
@@ -1313,13 +1309,15 @@ func (s *BoltState) NetworkDisconnect(ctr *Container, network string) error {
 			return errors.Wrapf(err, "error removing container %s from network %s", ctr.ID(), network)
 		}
 
-		bktExists := ctrAliasesBkt.Bucket([]byte(network))
-		if bktExists == nil {
-			return nil
-		}
+		if ctrAliasesBkt != nil {
+			bktExists := ctrAliasesBkt.Bucket([]byte(network))
+			if bktExists == nil {
+				return nil
+			}
 
-		if err := ctrAliasesBkt.DeleteBucket([]byte(network)); err != nil {
-			return errors.Wrapf(err, "error removing container %s network aliases for network %s", ctr.ID(), network)
+			if err := ctrAliasesBkt.DeleteBucket([]byte(network)); err != nil {
+				return errors.Wrapf(err, "error removing container %s network aliases for network %s", ctr.ID(), network)
+			}
 		}
 
 		return nil