libpod: Move resultToBasicNetworkConfig to networking_common.go

[NO NEW TESTS NEEDED]

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

3 files changed, 44 insertions, 85 deletions

diff --git a/libpod/networking_common.go b/libpod/networking_common.go
index 1dd799b40..e6509e66b 100644
--- a/libpod/networking_common.go
+++ b/libpod/networking_common.go
@@ -6,6 +6,7 @@ package libpod
 import (
 	"fmt"
 	"regexp"
+	"sort"
 
 	"github.com/containers/common/libnetwork/types"
 	"github.com/containers/common/pkg/machine"
@@ -301,3 +302,46 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e
 	}
 	return settings, nil
 }
+
+// resultToBasicNetworkConfig produces an InspectBasicNetworkConfig from a CNI
+// result
+func resultToBasicNetworkConfig(result types.StatusBlock) define.InspectBasicNetworkConfig {
+	config := define.InspectBasicNetworkConfig{}
+	interfaceNames := make([]string, 0, len(result.Interfaces))
+	for interfaceName := range result.Interfaces {
+		interfaceNames = append(interfaceNames, interfaceName)
+	}
+	// ensure consistent inspect results by sorting
+	sort.Strings(interfaceNames)
+	for _, interfaceName := range interfaceNames {
+		netInt := result.Interfaces[interfaceName]
+		for _, netAddress := range netInt.Subnets {
+			size, _ := netAddress.IPNet.Mask.Size()
+			if netAddress.IPNet.IP.To4() != nil {
+				// ipv4
+				if config.IPAddress == "" {
+					config.IPAddress = netAddress.IPNet.IP.String()
+					config.IPPrefixLen = size
+					config.Gateway = netAddress.Gateway.String()
+				} else {
+					config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
+				}
+			} else {
+				// ipv6
+				if config.GlobalIPv6Address == "" {
+					config.GlobalIPv6Address = netAddress.IPNet.IP.String()
+					config.GlobalIPv6PrefixLen = size
+					config.IPv6Gateway = netAddress.Gateway.String()
+				} else {
+					config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
+				}
+			}
+		}
+		if config.MacAddress == "" {
+			config.MacAddress = netInt.MacAddress.String()
+		} else {
+			config.AdditionalMacAddresses = append(config.AdditionalMacAddresses, netInt.MacAddress.String())
+		}
+	}
+	return config
+}
diff --git a/libpod/networking_freebsd.go b/libpod/networking_freebsd.go
index 00666064b..b6bcb3f71 100644
--- a/libpod/networking_freebsd.go
+++ b/libpod/networking_freebsd.go
@@ -260,49 +260,7 @@ func (c *Container) joinedNetworkNSPath() string {
 func (c *Container) inspectJoinedNetworkNS(networkns string) (q types.StatusBlock, retErr error) {
 	// TODO: extract interface information from the vnet jail
 	return types.StatusBlock{}, nil
-}
 
-// resultToBasicNetworkConfig produces an InspectBasicNetworkConfig from a CNI
-// result
-func resultToBasicNetworkConfig(result types.StatusBlock) define.InspectBasicNetworkConfig {
-	config := define.InspectBasicNetworkConfig{}
-	interfaceNames := make([]string, 0, len(result.Interfaces))
-	for interfaceName := range result.Interfaces {
-		interfaceNames = append(interfaceNames, interfaceName)
-	}
-	// ensure consistent inspect results by sorting
-	sort.Strings(interfaceNames)
-	for _, interfaceName := range interfaceNames {
-		netInt := result.Interfaces[interfaceName]
-		for _, netAddress := range netInt.Subnets {
-			size, _ := netAddress.IPNet.Mask.Size()
-			if netAddress.IPNet.IP.To4() != nil {
-				// ipv4
-				if config.IPAddress == "" {
-					config.IPAddress = netAddress.IPNet.IP.String()
-					config.IPPrefixLen = size
-					config.Gateway = netAddress.Gateway.String()
-				} else {
-					config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
-				}
-			} else {
-				// ipv6
-				if config.GlobalIPv6Address == "" {
-					config.GlobalIPv6Address = netAddress.IPNet.IP.String()
-					config.GlobalIPv6PrefixLen = size
-					config.IPv6Gateway = netAddress.Gateway.String()
-				} else {
-					config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
-				}
-			}
-		}
-		if config.MacAddress == "" {
-			config.MacAddress = netInt.MacAddress.String()
-		} else {
-			config.AdditionalMacAddresses = append(config.AdditionalMacAddresses, netInt.MacAddress.String())
-		}
-	}
-	return config
 }
 
 // NetworkDisconnect removes a container from the network
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go
index e8923ed30..7eae5c396 100644
--- a/libpod/networking_linux.go
+++ b/libpod/networking_linux.go
@@ -860,49 +860,6 @@ func (c *Container) inspectJoinedNetworkNS(networkns string) (q types.StatusBloc
 	return result, err
 }
 
-// resultToBasicNetworkConfig produces an InspectBasicNetworkConfig from a CNI
-// result
-func resultToBasicNetworkConfig(result types.StatusBlock) define.InspectBasicNetworkConfig {
-	config := define.InspectBasicNetworkConfig{}
-	interfaceNames := make([]string, 0, len(result.Interfaces))
-	for interfaceName := range result.Interfaces {
-		interfaceNames = append(interfaceNames, interfaceName)
-	}
-	// ensure consistent inspect results by sorting
-	sort.Strings(interfaceNames)
-	for _, interfaceName := range interfaceNames {
-		netInt := result.Interfaces[interfaceName]
-		for _, netAddress := range netInt.Subnets {
-			size, _ := netAddress.IPNet.Mask.Size()
-			if netAddress.IPNet.IP.To4() != nil {
-				// ipv4
-				if config.IPAddress == "" {
-					config.IPAddress = netAddress.IPNet.IP.String()
-					config.IPPrefixLen = size
-					config.Gateway = netAddress.Gateway.String()
-				} else {
-					config.SecondaryIPAddresses = append(config.SecondaryIPAddresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
-				}
-			} else {
-				// ipv6
-				if config.GlobalIPv6Address == "" {
-					config.GlobalIPv6Address = netAddress.IPNet.IP.String()
-					config.GlobalIPv6PrefixLen = size
-					config.IPv6Gateway = netAddress.Gateway.String()
-				} else {
-					config.SecondaryIPv6Addresses = append(config.SecondaryIPv6Addresses, define.Address{Addr: netAddress.IPNet.IP.String(), PrefixLength: size})
-				}
-			}
-		}
-		if config.MacAddress == "" {
-			config.MacAddress = netInt.MacAddress.String()
-		} else {
-			config.AdditionalMacAddresses = append(config.AdditionalMacAddresses, netInt.MacAddress.String())
-		}
-	}
-	return config
-}
-
 type logrusDebugWriter struct {
 	prefix string
 }