libpod: Move getContainerNetworkInfo to networking_common.go

[NO NEW TESTS NEEDED]

Signed-off-by: Doug Rabson <dfr@rabson.org>

3 files changed, 104 insertions, 182 deletions

diff --git a/libpod/networking_common.go b/libpod/networking_common.go
index d6e06152e..1dd799b40 100644
--- a/libpod/networking_common.go
+++ b/libpod/networking_common.go
@@ -197,3 +197,107 @@ func (r *Runtime) reloadContainerNetwork(ctr *Container) (map[string]types.Statu
 
 	return r.configureNetNS(ctr, ctr.state.NetNS)
 }
+
+// Produce an InspectNetworkSettings containing information on the container
+// network.
+func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) {
+	if c.config.NetNsCtr != "" {
+		netNsCtr, err := c.runtime.GetContainer(c.config.NetNsCtr)
+		if err != nil {
+			return nil, err
+		}
+		// see https://github.com/containers/podman/issues/10090
+		// the container has to be locked for syncContainer()
+		netNsCtr.lock.Lock()
+		defer netNsCtr.lock.Unlock()
+		// Have to sync to ensure that state is populated
+		if err := netNsCtr.syncContainer(); err != nil {
+			return nil, err
+		}
+		logrus.Debugf("Container %s shares network namespace, retrieving network info of container %s", c.ID(), c.config.NetNsCtr)
+
+		return netNsCtr.getContainerNetworkInfo()
+	}
+
+	settings := new(define.InspectNetworkSettings)
+	settings.Ports = makeInspectPortBindings(c.config.PortMappings, c.config.ExposedPorts)
+
+	networks, err := c.networks()
+	if err != nil {
+		return nil, err
+	}
+
+	if c.state.NetNS == nil {
+		if networkNSPath := c.joinedNetworkNSPath(); networkNSPath != "" {
+			if result, err := c.inspectJoinedNetworkNS(networkNSPath); err == nil {
+				// fallback to dummy configuration
+				settings.InspectBasicNetworkConfig = resultToBasicNetworkConfig(result)
+				return settings, nil
+			}
+			// do not propagate error inspecting a joined network ns
+			logrus.Errorf("Inspecting network namespace: %s of container %s: %v", networkNSPath, c.ID(), err)
+		}
+		// We can't do more if the network is down.
+
+		// We still want to make dummy configurations for each CNI net
+		// the container joined.
+		if len(networks) > 0 {
+			settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(networks))
+			for net, opts := range networks {
+				cniNet := new(define.InspectAdditionalNetwork)
+				cniNet.NetworkID = net
+				cniNet.Aliases = opts.Aliases
+				settings.Networks[net] = cniNet
+			}
+		}
+
+		return settings, nil
+	}
+
+	// Set network namespace path
+	settings.SandboxKey = c.state.NetNS.Path()
+
+	netStatus := c.getNetworkStatus()
+	// If this is empty, we're probably slirp4netns
+	if len(netStatus) == 0 {
+		return settings, nil
+	}
+
+	// If we have networks - handle that here
+	if len(networks) > 0 {
+		if len(networks) != len(netStatus) {
+			return nil, fmt.Errorf("network inspection mismatch: asked to join %d network(s) %v, but have information on %d network(s): %w", len(networks), networks, len(netStatus), define.ErrInternal)
+		}
+
+		settings.Networks = make(map[string]*define.InspectAdditionalNetwork)
+
+		for name, opts := range networks {
+			result := netStatus[name]
+			addedNet := new(define.InspectAdditionalNetwork)
+			addedNet.NetworkID = name
+			addedNet.Aliases = opts.Aliases
+			addedNet.InspectBasicNetworkConfig = resultToBasicNetworkConfig(result)
+
+			settings.Networks[name] = addedNet
+		}
+
+		// if not only the default network is connected we can return here
+		// otherwise we have to populate the InspectBasicNetworkConfig settings
+		_, isDefaultNet := networks[c.runtime.config.Network.DefaultNetwork]
+		if !(len(networks) == 1 && isDefaultNet) {
+			return settings, nil
+		}
+	}
+
+	// If not joining networks, we should have at most 1 result
+	if len(netStatus) > 1 {
+		return nil, fmt.Errorf("should have at most 1 network status result if not joining networks, instead got %d: %w", len(netStatus), define.ErrInternal)
+	}
+
+	if len(netStatus) == 1 {
+		for _, status := range netStatus {
+			settings.InspectBasicNetworkConfig = resultToBasicNetworkConfig(status)
+		}
+	}
+	return settings, nil
+}
diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go
index 7b6ea0d1e..5bc2872fc 100644
--- a/libpod/networking_freebsd.go
+++ b/libpod/networking_freebsd.go
@@ -249,84 +249,6 @@ func getContainerNetIO(ctr *Container) (*LinkStatistics64, error) {
 	return &LinkStatistics64{}, nil
 }
 
-// Produce an InspectNetworkSettings containing information on the container
-// network.
-func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) {
-	if c.config.NetNsCtr != "" {
-		netNsCtr, err := c.runtime.GetContainer(c.config.NetNsCtr)
-		if err != nil {
-			return nil, err
-		}
-		// see https://github.com/containers/podman/issues/10090
-		// the container has to be locked for syncContainer()
-		netNsCtr.lock.Lock()
-		defer netNsCtr.lock.Unlock()
-		// Have to sync to ensure that state is populated
-		if err := netNsCtr.syncContainer(); err != nil {
-			return nil, err
-		}
-		logrus.Debugf("Container %s shares network namespace, retrieving network info of container %s", c.ID(), c.config.NetNsCtr)
-
-		return netNsCtr.getContainerNetworkInfo()
-	}
-
-	settings := new(define.InspectNetworkSettings)
-	settings.Ports = makeInspectPortBindings(c.config.PortMappings, c.config.ExposedPorts)
-
-	networks, err := c.networks()
-	if err != nil {
-		return nil, err
-	}
-
-	netStatus := c.getNetworkStatus()
-	// If this is empty, we're probably slirp4netns
-	if len(netStatus) == 0 {
-		return settings, nil
-	}
-
-	// If we have networks - handle that here
-	if len(networks) > 0 {
-		if len(networks) != len(netStatus) {
-			return nil, fmt.Errorf("network inspection mismatch: asked to join %d network(s) %v, but have information on %d network(s): %w", len(networks), networks, len(netStatus), define.ErrInternal)
-		}
-
-		settings.Networks = make(map[string]*define.InspectAdditionalNetwork)
-
-		for name, opts := range networks {
-			result := netStatus[name]
-			addedNet := new(define.InspectAdditionalNetwork)
-			addedNet.NetworkID = name
-
-			basicConfig := resultToBasicNetworkConfig(result)
-			addedNet.Aliases = opts.Aliases
-
-			addedNet.InspectBasicNetworkConfig = basicConfig
-
-			settings.Networks[name] = addedNet
-		}
-
-		// if not only the default network is connected we can return here
-		// otherwise we have to populate the InspectBasicNetworkConfig settings
-		_, isDefaultNet := networks[c.runtime.config.Network.DefaultNetwork]
-		if !(len(networks) == 1 && isDefaultNet) {
-			return settings, nil
-		}
-	}
-
-	// If not joining networks, we should have at most 1 result
-	if len(netStatus) > 1 {
-		return nil, fmt.Errorf("should have at most 1 network status result if not joining networks, instead got %d: %w", len(netStatus), define.ErrInternal)
-	}
-
-	if len(netStatus) == 1 {
-		for _, status := range netStatus {
-			basicConfig := resultToBasicNetworkConfig(status)
-			settings.InspectBasicNetworkConfig = basicConfig
-		}
-	}
-	return settings, nil
-}
-
 // resultToBasicNetworkConfig produces an InspectBasicNetworkConfig from a CNI
 // result
 func resultToBasicNetworkConfig(result types.StatusBlock) define.InspectBasicNetworkConfig {
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index d442b3fe0..e8923ed30 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -794,110 +794,6 @@ func getContainerNetIO(ctr *Container) (*netlink.LinkStatistics, error) {
 	return netStats, err
 }
 
-// Produce an InspectNetworkSettings containing information on the container
-// network.
-func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, error) {
-	if c.config.NetNsCtr != "" {
-		netNsCtr, err := c.runtime.GetContainer(c.config.NetNsCtr)
-		if err != nil {
-			return nil, err
-		}
-		// see https://github.com/containers/podman/issues/10090
-		// the container has to be locked for syncContainer()
-		netNsCtr.lock.Lock()
-		defer netNsCtr.lock.Unlock()
-		// Have to sync to ensure that state is populated
-		if err := netNsCtr.syncContainer(); err != nil {
-			return nil, err
-		}
-		logrus.Debugf("Container %s shares network namespace, retrieving network info of container %s", c.ID(), c.config.NetNsCtr)
-
-		return netNsCtr.getContainerNetworkInfo()
-	}
-
-	settings := new(define.InspectNetworkSettings)
-	settings.Ports = makeInspectPortBindings(c.config.PortMappings, c.config.ExposedPorts)
-
-	networks, err := c.networks()
-	if err != nil {
-		return nil, err
-	}
-
-	if c.state.NetNS == nil {
-		if networkNSPath := c.joinedNetworkNSPath(); networkNSPath != "" {
-			if result, err := c.inspectJoinedNetworkNS(networkNSPath); err == nil {
-				// fallback to dummy configuration
-				settings.InspectBasicNetworkConfig = resultToBasicNetworkConfig(result)
-				return settings, nil
-			}
-			// do not propagate error inspecting a joined network ns
-			logrus.Errorf("Inspecting network namespace: %s of container %s: %v", networkNSPath, c.ID(), err)
-		}
-		// We can't do more if the network is down.
-
-		// We still want to make dummy configurations for each CNI net
-		// the container joined.
-		if len(networks) > 0 {
-			settings.Networks = make(map[string]*define.InspectAdditionalNetwork, len(networks))
-			for net, opts := range networks {
-				cniNet := new(define.InspectAdditionalNetwork)
-				cniNet.NetworkID = net
-				cniNet.Aliases = opts.Aliases
-				settings.Networks[net] = cniNet
-			}
-		}
-
-		return settings, nil
-	}
-
-	// Set network namespace path
-	settings.SandboxKey = c.state.NetNS.Path()
-
-	netStatus := c.getNetworkStatus()
-	// If this is empty, we're probably slirp4netns
-	if len(netStatus) == 0 {
-		return settings, nil
-	}
-
-	// If we have networks - handle that here
-	if len(networks) > 0 {
-		if len(networks) != len(netStatus) {
-			return nil, fmt.Errorf("network inspection mismatch: asked to join %d network(s) %v, but have information on %d network(s): %w", len(networks), networks, len(netStatus), define.ErrInternal)
-		}
-
-		settings.Networks = make(map[string]*define.InspectAdditionalNetwork)
-
-		for name, opts := range networks {
-			result := netStatus[name]
-			addedNet := new(define.InspectAdditionalNetwork)
-			addedNet.NetworkID = name
-			addedNet.Aliases = opts.Aliases
-			addedNet.InspectBasicNetworkConfig = resultToBasicNetworkConfig(result)
-
-			settings.Networks[name] = addedNet
-		}
-
-		// if not only the default network is connected we can return here
-		// otherwise we have to populate the InspectBasicNetworkConfig settings
-		_, isDefaultNet := networks[c.runtime.config.Network.DefaultNetwork]
-		if !(len(networks) == 1 && isDefaultNet) {
-			return settings, nil
-		}
-	}
-
-	// If not joining networks, we should have at most 1 result
-	if len(netStatus) > 1 {
-		return nil, fmt.Errorf("should have at most 1 network status result if not joining networks, instead got %d: %w", len(netStatus), define.ErrInternal)
-	}
-
-	if len(netStatus) == 1 {
-		for _, status := range netStatus {
-			settings.InspectBasicNetworkConfig = resultToBasicNetworkConfig(status)
-		}
-	}
-	return settings, nil
-}
-
 func (c *Container) joinedNetworkNSPath() string {
 	for _, namespace := range c.config.Spec.Linux.Namespaces {
 		if namespace.Type == specs.NetworkNamespace {