Dualstack support

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.20
+FROM alpine:3.21
 LABEL maintainer="metal-stack authors <[email protected]>"
 COPY bin/metalctl-linux-amd64 /metalctl
 ENTRYPOINT ["/metalctl"]

Dockerfile.test

@@ -1,4 +1,4 @@
-FROM golang:1.23
+FROM golang:1.24
 WORKDIR /work
 COPY go.* .
 RUN go mod download

cmd/completion/ip.go

@@ -2,6 +2,7 @@ package completion
 
 import (
 	"github.com/metal-stack/metal-go/api/client/ip"
+	"github.com/metal-stack/metal-go/api/models"
 	"github.com/spf13/cobra"
 )
 
@@ -16,3 +17,7 @@ func (c *Completion) IpListCompletion(cmd *cobra.Command, args []string, toCompl
 	}
 	return names, cobra.ShellCompDirectiveNoFileComp
 }
+
+func (c *Completion) IPAddressFamilyCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	return []string{models.V1IPAllocateRequestAddressfamilyIPV4, models.V1IPAllocateRequestAddressfamilyIPV6}, cobra.ShellCompDirectiveNoFileComp
+}

cmd/completion/network.go

@@ -2,6 +2,8 @@ package completion
 
 import (
 	"github.com/metal-stack/metal-go/api/client/network"
+	"github.com/metal-stack/metal-go/api/models"
+
 	"github.com/spf13/cobra"
 )
 
@@ -28,3 +30,6 @@ func (c *Completion) NetworkDestinationPrefixesCompletion(cmd *cobra.Command, ar
 	}
 	return prefixes, cobra.ShellCompDirectiveNoFileComp
 }
+func (c *Completion) NetworkAddressFamilyCompletion(cmd *cobra.Command, args []string, toComplete string) ([]string, cobra.ShellCompDirective) {
+	return []string{models.V1NetworkAllocateRequestAddressfamilyIPV4, models.V1NetworkAllocateRequestAddressfamilyIPV6}, cobra.ShellCompDirectiveNoFileComp
+}

cmd/ip.go

@@ -49,9 +49,11 @@ func newIPCmd(c *config) *cobra.Command {
 			cmd.Flags().StringP("network", "", "", "network from where the IP should be allocated.")
 			cmd.Flags().StringP("project", "", "", "project for which the IP should be allocated.")
 			cmd.Flags().StringSliceP("tags", "", nil, "tags to attach to the IP.")
+			cmd.Flags().StringP("addressfamily", "", "", "addressfamily of the ip to acquire, defaults to IPv4 [optional]")
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("network", c.comp.NetworkListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("project", c.comp.ProjectListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("type", cobra.FixedCompletions([]string{models.V1IPAllocateRequestTypeEphemeral, models.V1IPAllocateRequestTypeStatic}, cobra.ShellCompDirectiveNoFileComp)))
+			genericcli.Must(cmd.RegisterFlagCompletionFunc("addressfamily", c.comp.IPAddressFamilyCompletion))
 		},
 		ListCmdMutateFn: func(cmd *cobra.Command) {
 			cmd.Flags().StringP("ipaddress", "", "", "ipaddress to filter [optional]")
@@ -62,11 +64,13 @@ func newIPCmd(c *config) *cobra.Command {
 			cmd.Flags().StringP("network", "", "", "network to filter [optional]")
 			cmd.Flags().StringP("name", "", "", "name to filter [optional]")
 			cmd.Flags().StringSliceP("tags", "", nil, "tags to filter [optional]")
+			cmd.Flags().StringP("addressfamily", "", "", "addressfamily of the ip to filter, defaults to all addressfamilies [optional]")
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("ipaddress", c.comp.IpListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("network", c.comp.NetworkListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("project", c.comp.ProjectListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("type", cobra.FixedCompletions([]string{models.V1IPAllocateRequestTypeEphemeral, models.V1IPAllocateRequestTypeStatic}, cobra.ShellCompDirectiveNoFileComp)))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("machineid", c.comp.MachineListCompletion))
+			genericcli.Must(cmd.RegisterFlagCompletionFunc("addressfamily", c.comp.IPAddressFamilyCompletion))
 		},
 		DeleteCmdMutateFn: func(cmd *cobra.Command) {
 			cmd.Aliases = append(cmd.Aliases, "free")
@@ -105,6 +109,7 @@ func (c *ipCmd) List() ([]*models.V1IPResponse, error) {
 		Machineid:     viper.GetString("machineid"),
 		Networkprefix: viper.GetString("prefix"),
 		Tags:          viper.GetStringSlice("tags"),
+		Addressfamily: viper.GetString("addressfamily"),
 	}), nil)
 	if err != nil {
 		return nil, err
@@ -136,6 +141,8 @@ func (c *ipCmd) Create(rq *ipAllocateRequest) (*models.V1IPResponse, error) {
 		return resp.Payload, nil
 	}
 
+	// FIXME this is a workaround, if specificIP is set, AF must not be set.
+	rq.Addressfamily = nil
 	resp, err := c.client.IP().AllocateSpecificIP(ip.NewAllocateSpecificIPParams().WithIP(rq.SpecificIP).WithBody(rq.V1IPAllocateRequest), nil)
 	if err != nil {
 		var r *ip.AllocateSpecificIPConflict
@@ -169,6 +176,7 @@ func ipResponseToCreate(r *models.V1IPResponse) *ipAllocateRequest {
 	if r.Ipaddress != nil {
 		ip = *r.Ipaddress
 	}
+
 	return &ipAllocateRequest{
 		SpecificIP: ip,
 		V1IPAllocateRequest: &models.V1IPAllocateRequest{
@@ -193,15 +201,22 @@ func ipResponseToUpdate(r *models.V1IPResponse) *models.V1IPUpdateRequest {
 }
 
 func (c *ipCmd) createRequestFromCLI() (*ipAllocateRequest, error) {
+
+	var af *string
+	if viper.IsSet("addressfamily") {
+		af = pointer.Pointer(viper.GetString("addressfamily"))
+	}
+
 	return &ipAllocateRequest{
 		SpecificIP: viper.GetString("ipaddress"),
 		V1IPAllocateRequest: &models.V1IPAllocateRequest{
-			Description: viper.GetString("description"),
-			Name:        viper.GetString("name"),
-			Networkid:   pointer.Pointer(viper.GetString("network")),
-			Projectid:   pointer.Pointer(viper.GetString("project")),
-			Type:        pointer.Pointer(viper.GetString("type")),
-			Tags:        viper.GetStringSlice("tags"),
+			Description:   viper.GetString("description"),
+			Name:          viper.GetString("name"),
+			Networkid:     pointer.Pointer(viper.GetString("network")),
+			Projectid:     pointer.Pointer(viper.GetString("project")),
+			Type:          pointer.Pointer(viper.GetString("type")),
+			Tags:          viper.GetStringSlice("tags"),
+			Addressfamily: af,
 		},
 	}, nil
 }

cmd/ip_test.go

@@ -228,6 +228,7 @@ IP        ALLOCATION UUID   DESCRIPTION   NAME   NETWORK    PROJECT     TYPE
 					"--project", *want.Projectid,
 					"--type", *want.Type,
 					"--tags", strings.Join(want.Tags, ","),
+					"--addressfamily", models.V1IPAllocateRequestAddressfamilyIPV4, // TODO: this is not correct for specificip, but makes the matcher happy.
 				}
 				assertExhaustiveArgs(t, args, commonExcludedFileArgs()...)
 				return args

cmd/network.go

@@ -3,6 +3,7 @@ package cmd
 import (
 	"errors"
 	"fmt"
+	"strconv"
 
 	"slices"
 
@@ -46,6 +47,8 @@ func newNetworkCmd(c *config) *cobra.Command {
 			cmd.Flags().StringP("name", "n", "", "name of the network to create. [optional]")
 			cmd.Flags().StringP("partition", "p", "", "partition where this network should exist.")
 			cmd.Flags().StringP("project", "", "", "project of the network to create. [optional]")
+			cmd.Flags().Int64("default-ipv4-child-prefix-length", 0, "default child prefix length for ipv4 prefixes for private super networks.")
+			cmd.Flags().Int64("default-ipv6-child-prefix-length", 0, "default child prefix length for ipv6 prefixes for private super networks.")
 			cmd.Flags().StringSlice("prefixes", []string{}, "prefixes in this network.")
 			cmd.Flags().StringSlice("labels", []string{}, "add initial labels, must be in the form of key=value, use it like: --labels \"key1=value1,key2=value2\".")
 			cmd.Flags().StringSlice("destination-prefixes", []string{}, "destination prefixes in this network.")
@@ -70,8 +73,10 @@ func newNetworkCmd(c *config) *cobra.Command {
 			cmd.Flags().Int64P("vrf", "", 0, "vrf to filter [optional]")
 			cmd.Flags().StringSlice("prefixes", []string{}, "prefixes to filter, use it like: --prefixes prefix1,prefix2.")
 			cmd.Flags().StringSlice("destination-prefixes", []string{}, "destination prefixes to filter, use it like: --destination-prefixes prefix1,prefix2.")
+			cmd.Flags().String("addressfamily", "", "addressfamily to filter, either ipv4 or ipv6 [optional]")
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("project", c.comp.ProjectListCompletion))
 			genericcli.Must(cmd.RegisterFlagCompletionFunc("partition", c.comp.PartitionListCompletion))
+			genericcli.Must(cmd.RegisterFlagCompletionFunc("addressfamily", c.comp.NetworkAddressFamilyCompletion))
 		},
 		UpdateCmdMutateFn: func(cmd *cobra.Command) {
 			cmd.Flags().String("name", "", "the name of the network [optional]")
@@ -105,6 +110,20 @@ func newNetworkCmd(c *config) *cobra.Command {
 					return err
 				}
 
+				var (
+					af     *string
+					length = make(map[string]int64)
+				)
+				if viper.IsSet("ipv4length") {
+					length[models.V1IPAllocateRequestAddressfamilyIPV4] = viper.GetInt64("ipv4length")
+				}
+				if viper.IsSet("ipv6length") {
+					length[models.V1IPAllocateRequestAddressfamilyIPV6] = viper.GetInt64("ipv6length")
+				}
+				if viper.IsSet("addressfamily") {
+					af = pointer.Pointer(viper.GetString("addressfamily"))
+				}
+
 				return w.childCLI.CreateAndPrint(&models.V1NetworkAllocateRequest{
 					Description:         viper.GetString("description"),
 					Name:                viper.GetString("name"),
@@ -114,6 +133,8 @@ func newNetworkCmd(c *config) *cobra.Command {
 					Labels:              labels,
 					Destinationprefixes: destinationPrefixes,
 					Nat:                 nat,
+					Addressfamily:       af,
+					Length:              length,
 				}, c.describePrinter)
 			}
 
@@ -142,8 +163,12 @@ func newNetworkCmd(c *config) *cobra.Command {
 	allocateCmd.Flags().StringSlice("labels", []string{}, "labels for this network. [optional]")
 	allocateCmd.Flags().BoolP("dmz", "", false, "use this private network as dmz. [optional]")
 	allocateCmd.Flags().BoolP("shared", "", false, "shared allows usage of this private network from other networks")
+	allocateCmd.Flags().StringP("addressfamily", "", "ipv4", "addressfamily of the network to acquire  [optional]")
+	allocateCmd.Flags().Int64P("ipv4length", "", 22, "ipv4 bitlength of network to create. [optional]")
+	allocateCmd.Flags().Int64P("ipv6length", "", 64, "ip6 bitlength of network to create. [optional]")
 	genericcli.Must(allocateCmd.RegisterFlagCompletionFunc("project", c.comp.ProjectListCompletion))
 	genericcli.Must(allocateCmd.RegisterFlagCompletionFunc("partition", c.comp.PartitionListCompletion))
+	genericcli.Must(allocateCmd.RegisterFlagCompletionFunc("addressfamily", c.comp.NetworkAddressFamilyCompletion))
 
 	genericcli.Must(allocateCmd.MarkFlagRequired("name"))
 	genericcli.Must(allocateCmd.MarkFlagRequired("project"))
@@ -179,6 +204,7 @@ func (c *networkCmd) List() ([]*models.V1NetworkResponse, error) {
 		Prefixes:            viper.GetStringSlice("prefixes"),
 		Destinationprefixes: viper.GetStringSlice("destination-prefixes"),
 		Parentnetworkid:     viper.GetString("parent"),
+		Addressfamily:       viper.GetString("addressfamily"),
 	}), nil)
 	if err != nil {
 		return nil, err
@@ -235,6 +261,7 @@ func networkResponseToCreate(r *models.V1NetworkResponse) *models.V1NetworkCreat
 		Nat:                        r.Nat,
 		Parentnetworkid:            r.Parentnetworkid,
 		Partitionid:                r.Partitionid,
+		Defaultchildprefixlength:   r.Defaultchildprefixlength,
 		Prefixes:                   r.Prefixes,
 		Privatesuper:               r.Privatesuper,
 		Projectid:                  r.Projectid,
@@ -256,6 +283,7 @@ func networkResponseToUpdate(r *models.V1NetworkResponse) *models.V1NetworkUpdat
 		Prefixes:                   r.Prefixes,
 		Shared:                     r.Shared,
 		AdditionalAnnouncableCIDRs: r.AdditionalAnnouncableCIDRs,
+		Defaultchildprefixlength:   r.Defaultchildprefixlength,
 	}
 }
 
@@ -265,6 +293,18 @@ func (c *networkCmd) createRequestFromCLI() (*models.V1NetworkCreateRequest, err
 		return nil, err
 	}
 
+	var defaultChildPrefixLengths map[string]int64
+	if viper.GetBool("privatesuper") {
+		defaultChildPrefixLengths = map[string]int64{}
+
+		if length := viper.GetInt64("default-ipv4-child-prefix-length"); length > 0 {
+			defaultChildPrefixLengths[models.V1IPAllocateRequestAddressfamilyIPV4] = length
+		}
+		if length := viper.GetInt64("default-ipv6-child-prefix-length"); length > 0 {
+			defaultChildPrefixLengths[models.V1IPAllocateRequestAddressfamilyIPV6] = length
+		}
+	}
+
 	return &models.V1NetworkCreateRequest{
 		ID:                         pointer.Pointer(viper.GetString("id")),
 		Description:                viper.GetString("description"),
@@ -280,6 +320,7 @@ func (c *networkCmd) createRequestFromCLI() (*models.V1NetworkCreateRequest, err
 		Vrfshared:                  viper.GetBool("vrfshared"),
 		Labels:                     lbs,
 		AdditionalAnnouncableCIDRs: viper.GetStringSlice("additional-announcable-cidrs"),
+		Defaultchildprefixlength:   defaultChildPrefixLengths,
 	}, nil
 }
 
@@ -365,6 +406,17 @@ func (c *networkCmd) updateRequestFromCLI(args []string) (*models.V1NetworkUpdat
 	if viper.IsSet("additional-announcable-cidrs") {
 		additionalCidrs = viper.GetStringSlice("additional-announcable-cidrs")
 	}
+	defaultchildprefixlength := resp.Defaultchildprefixlength
+	if viper.IsSet("default-child-prefixlength") {
+		defaultchildprefixlengthMap := viper.GetStringMapString("default-child-prefixlength")
+		for af, length := range defaultchildprefixlengthMap {
+			l, err := strconv.Atoi(length)
+			if err != nil {
+				return nil, err
+			}
+			defaultchildprefixlength[af] = int64(l)
+		}
+	}
 	var (
 		ur = &models.V1NetworkUpdateRequest{
 			Description:                viper.GetString("description"),
@@ -375,6 +427,7 @@ func (c *networkCmd) updateRequestFromCLI(args []string) (*models.V1NetworkUpdat
 			Prefixes:                   nil,
 			Shared:                     shared,
 			AdditionalAnnouncableCIDRs: additionalCidrs,
+			Defaultchildprefixlength:   defaultchildprefixlength,
 		}
 		addPrefixes                = sets.New(viper.GetStringSlice("add-prefixes")...)
 		removePrefixes             = sets.New(viper.GetStringSlice("remove-prefixes")...)

cmd/network_test.go

@@ -33,15 +33,21 @@ var (
 		Projectid:           "",
 		Shared:              false,
 		Underlay:            pointer.Pointer(true),
-		Usage: &models.V1NetworkUsage{
-			AvailableIps:      pointer.Pointer(int64(100)),
-			AvailablePrefixes: pointer.Pointer(int64(200)),
-			UsedIps:           pointer.Pointer(int64(300)),
-			UsedPrefixes:      pointer.Pointer(int64(400)),
+		Consumption: &models.V1NetworkConsumption{
+			IPV4: &models.V1NetworkUsage{
+				AvailableIps:      pointer.Pointer(int64(100)),
+				AvailablePrefixes: pointer.Pointer(int64(200)),
+				UsedIps:           pointer.Pointer(int64(300)),
+				UsedPrefixes:      pointer.Pointer(int64(400)),
+			},
 		},
 		Vrf:                        50,
 		Vrfshared:                  true,
 		AdditionalAnnouncableCIDRs: []string{"10.240.0.0/12"},
+		Defaultchildprefixlength: map[string]int64{
+			"IPv4": 22,
+			"IPv6": 96,
+		},
 	}
 	network1child = &models.V1NetworkResponse{
 		Description:         "child 1",
@@ -57,11 +63,13 @@ var (
 		Projectid:           "project-1",
 		Shared:              false,
 		Underlay:            pointer.Pointer(false),
-		Usage: &models.V1NetworkUsage{
-			AvailableIps:      pointer.Pointer(int64(100)),
-			AvailablePrefixes: pointer.Pointer(int64(200)),
-			UsedIps:           pointer.Pointer(int64(300)),
-			UsedPrefixes:      pointer.Pointer(int64(400)),
+		Consumption: &models.V1NetworkConsumption{
+			IPV4: &models.V1NetworkUsage{
+				AvailableIps:      pointer.Pointer(int64(100)),
+				AvailablePrefixes: pointer.Pointer(int64(200)),
+				UsedIps:           pointer.Pointer(int64(300)),
+				UsedPrefixes:      pointer.Pointer(int64(400)),
+			},
 		},
 		Vrf:                        50,
 		Vrfshared:                  true,
@@ -81,11 +89,13 @@ var (
 		Projectid:           "project-1",
 		Shared:              false,
 		Underlay:            pointer.Pointer(false),
-		Usage: &models.V1NetworkUsage{
-			AvailableIps:      pointer.Pointer(int64(400)),
-			AvailablePrefixes: pointer.Pointer(int64(300)),
-			UsedIps:           pointer.Pointer(int64(200)),
-			UsedPrefixes:      pointer.Pointer(int64(100)),
+		Consumption: &models.V1NetworkConsumption{
+			IPV4: &models.V1NetworkUsage{
+				AvailableIps:      pointer.Pointer(int64(400)),
+				AvailablePrefixes: pointer.Pointer(int64(300)),
+				UsedIps:           pointer.Pointer(int64(200)),
+				UsedPrefixes:      pointer.Pointer(int64(100)),
+			},
 		},
 		Vrf:                        60,
 		Vrfshared:                  true,
@@ -301,6 +311,8 @@ nw1 network-1
 					"--vrf", strconv.FormatInt(want.Vrf, 10),
 					"--vrfshared", strconv.FormatBool(want.Vrfshared),
 					"--additional-announcable-cidrs", "10.240.0.0/12",
+					"--default-ipv4-child-prefix-length", "22",
+					"--default-ipv6-child-prefix-length", "96",
 				}
 				assertExhaustiveArgs(t, args, commonExcludedFileArgs()...)
 				return args
@@ -350,6 +362,7 @@ nw1 network-1
 						Labels:                     network1.Labels,
 						Shared:                     network1.Shared,
 						AdditionalAnnouncableCIDRs: network1.AdditionalAnnouncableCIDRs,
+						Defaultchildprefixlength:   network1.Defaultchildprefixlength,
 					}).WithForce(pointer.Pointer(false))), nil).Return(&network.UpdateNetworkOK{
 						Payload: network1,
 					}, nil)

cmd/partition.go

@@ -132,13 +132,12 @@ func partitionResponseToCreate(r *models.V1PartitionResponse) *models.V1Partitio
 			Imageurl:    r.Bootconfig.Imageurl,
 			Kernelurl:   r.Bootconfig.Kernelurl,
 		},
-		Description:                r.Description,
-		ID:                         r.ID,
-		Mgmtserviceaddress:         r.Mgmtserviceaddress,
-		Name:                       r.Name,
-		Privatenetworkprefixlength: r.Privatenetworkprefixlength,
-		DNSServers:                 r.DNSServers,
-		NtpServers:                 r.NtpServers,
+		Description:        r.Description,
+		ID:                 r.ID,
+		Mgmtserviceaddress: r.Mgmtserviceaddress,
+		Name:               r.Name,
+		DNSServers:         r.DNSServers,
+		NtpServers:         r.NtpServers,
 	}
 }