Merge pull request #12534 from Luap99/network-db

network db rewrite

1 files changed, 32 insertions, 1 deletions

diff --git a/cmd/podman/networks/connect.go b/cmd/podman/networks/connect.go
index 0d62a45df..b0ffbfe6d 100644
--- a/cmd/podman/networks/connect.go
+++ b/cmd/podman/networks/connect.go
@@ -1,9 +1,12 @@
 package network
 
 import (
+	"net"
+
 	"github.com/containers/common/pkg/completion"
 	"github.com/containers/podman/v3/cmd/podman/common"
 	"github.com/containers/podman/v3/cmd/podman/registry"
+	"github.com/containers/podman/v3/libpod/network/types"
 	"github.com/containers/podman/v3/pkg/domain/entities"
 	"github.com/spf13/cobra"
 )
@@ -23,13 +26,28 @@ var (
 
 var (
 	networkConnectOptions entities.NetworkConnectOptions
+	ipv4                  net.IP
+	ipv6                  net.IP
+	macAddress            string
 )
 
 func networkConnectFlags(cmd *cobra.Command) {
 	flags := cmd.Flags()
 	aliasFlagName := "alias"
-	flags.StringSliceVar(&networkConnectOptions.Aliases, aliasFlagName, []string{}, "network scoped alias for container")
+	flags.StringSliceVar(&networkConnectOptions.Aliases, aliasFlagName, nil, "network scoped alias for container")
 	_ = cmd.RegisterFlagCompletionFunc(aliasFlagName, completion.AutocompleteNone)
+
+	ipAddressFlagName := "ip"
+	flags.IPVar(&ipv4, ipAddressFlagName, nil, "set a static ipv4 address for this container network")
+	_ = cmd.RegisterFlagCompletionFunc(ipAddressFlagName, completion.AutocompleteNone)
+
+	ipv6AddressFlagName := "ip6"
+	flags.IPVar(&ipv6, ipv6AddressFlagName, nil, "set a static ipv6 address for this container network")
+	_ = cmd.RegisterFlagCompletionFunc(ipv6AddressFlagName, completion.AutocompleteNone)
+
+	macAddressFlagName := "mac-address"
+	flags.StringVar(&macAddress, macAddressFlagName, "", "set a static mac address for this container network")
+	_ = cmd.RegisterFlagCompletionFunc(macAddressFlagName, completion.AutocompleteNone)
 }
 
 func init() {
@@ -42,5 +60,18 @@ func init() {
 
 func networkConnect(cmd *cobra.Command, args []string) error {
 	networkConnectOptions.Container = args[1]
+	if macAddress != "" {
+		mac, err := net.ParseMAC(macAddress)
+		if err != nil {
+			return err
+		}
+		networkConnectOptions.StaticMAC = types.HardwareAddr(mac)
+	}
+	for _, ip := range []net.IP{ipv4, ipv6} {
+		if ip != nil {
+			networkConnectOptions.StaticIPs = append(networkConnectOptions.StaticIPs, ip)
+		}
+	}
+
 	return registry.ContainerEngine().NetworkConnect(registry.Context(), args[0], networkConnectOptions)
 }