use go-ipam with ipv6 support

cmd/metal-api/internal/datastore/migrations/03_childprefixlength.go

@@ -0,0 +1,53 @@
+package migrations
+
+import (
+	r "gopkg.in/rethinkdb/rethinkdb-go.v6"
+
+	"github.com/metal-stack/metal-api/cmd/metal-api/internal/datastore"
+)
+
+func init() {
+	type tmpPartition struct {
+		PrivateNetworkPrefixLength uint8 `rethinkdb:"privatenetworkprefixlength"`
+	}
+	datastore.MustRegisterMigration(datastore.Migration{
+		Name:    "migrate partition.childprefixlength to tenant super network",
+		Version: 3,
+		Up: func(db *r.Term, session r.QueryExecutor, rs *datastore.RethinkStore) error {
+			nws, err := rs.ListNetworks()
+			if err != nil {
+				return err
+			}
+
+			for _, old := range nws {
+				if !old.PrivateSuper {
+					continue
+				}
+
+				cursor, err := db.Table("partition").Get(old.PartitionID).Run(session)
+				if err != nil {
+					return err
+				}
+				var partition tmpPartition
+				err = cursor.One(&partition)
+				if err != nil {
+					return err
+				}
+
+				new := old
+				new.ChildPrefixLength = &partition.PrivateNetworkPrefixLength
+				err = rs.UpdateNetwork(&old, &new)
+				if err != nil {
+					return err
+				}
+				err = cursor.Close()
+				if err != nil {
+					return err
+				}
+			}
+
+			_, err = db.Table("partition").Replace(r.Row.Without("privatenetworkprefixlength")).RunWrite(session)
+			return err
+		},
+	})
+}

cmd/metal-api/internal/ipam/ipam.go

@@ -20,7 +20,7 @@ func New(ip ipam.Ipamer) *Ipam {
 }
 
 // AllocateChildPrefix creates a child prefix from a parent prefix in the IPAM.
-func (i *Ipam) AllocateChildPrefix(parentPrefix metal.Prefix, childLength int) (*metal.Prefix, error) {
+func (i *Ipam) AllocateChildPrefix(parentPrefix metal.Prefix, childLength uint8) (*metal.Prefix, error) {
 	ipamParentPrefix := i.ip.PrefixFrom(parentPrefix.String())
 
 	if ipamParentPrefix == nil {
@@ -131,12 +131,12 @@ func (i *Ipam) PrefixUsage(cidr string) (*metal.NetworkUsage, error) {
 		return nil, fmt.Errorf("prefix for cidr:%s not found", cidr)
 	}
 	usage := prefix.Usage()
-
 	return &metal.NetworkUsage{
-		AvailableIPs:      usage.AvailableIPs,
-		UsedIPs:           usage.AcquiredIPs,
-		AvailablePrefixes: usage.AvailablePrefixes,
-		UsedPrefixes:      usage.AcquiredPrefixes,
+		AvailableIPs:        usage.AvailableIPs,
+		UsedIPs:             usage.AcquiredIPs,
+		AvailablePrefixes:   usage.AvailableSmallestPrefixes,
+		AvailablePrefixList: usage.AvailablePrefixes,
+		UsedPrefixes:        usage.AcquiredPrefixes,
 	}, nil
 }
 

cmd/metal-api/internal/ipam/wrapper.go

@@ -11,7 +11,7 @@ type IPAMer interface {
 	AllocateIP(prefix metal.Prefix) (string, error)
 	AllocateSpecificIP(prefix metal.Prefix, specificIP string) (string, error)
 	ReleaseIP(ip metal.IP) error
-	AllocateChildPrefix(parentPrefix metal.Prefix, childLength int) (*metal.Prefix, error)
+	AllocateChildPrefix(parentPrefix metal.Prefix, childLength uint8) (*metal.Prefix, error)
 	ReleaseChildPrefix(childPrefix metal.Prefix) error
 	CreatePrefix(prefix metal.Prefix) error
 	DeletePrefix(prefix metal.Prefix) error

cmd/metal-api/internal/metal/network.go

@@ -3,7 +3,8 @@ package metal
 import (
 	"fmt"
 	"net"
-	"strings"
+
+	"inet.af/netaddr"
 )
 
 // A MacAddress is the type for mac adresses. When using a
@@ -32,15 +33,13 @@ type Prefixes []Prefix
 
 // NewPrefixFromCIDR returns a new prefix from a given cidr.
 func NewPrefixFromCIDR(cidr string) (*Prefix, error) {
-	parts := strings.Split(cidr, "/")
-	if len(parts) != 2 {
-		return nil, fmt.Errorf("cannot split cidr into pieces: %v", cidr)
+	ipprefix, err := netaddr.ParseIPPrefix(cidr)
+	if err != nil {
+		return nil, err
 	}
-	ip := strings.TrimSpace(parts[0])
-	length := strings.TrimSpace(parts[1])
 	return &Prefix{
-		IP:     ip,
-		Length: length,
+		IP:     ipprefix.IP.String(),
+		Length: fmt.Sprintf("%d", ipprefix.Bits),
 	}, nil
 }
 
@@ -73,6 +72,7 @@ type Network struct {
 	ParentNetworkID     string            `rethinkdb:"parentnetworkid" json:"parentnetworkid"`
 	Vrf                 uint              `rethinkdb:"vrf" json:"vrf"`
 	PrivateSuper        bool              `rethinkdb:"privatesuper" json:"privatesuper"`
+	ChildPrefixLength   *uint8            `rethinkdb:"childprefixlength" json:"childprefixlength" description:"if privatesuper, this defines the bitlen of child prefixes if not nil"`
 	Nat                 bool              `rethinkdb:"nat" json:"nat"`
 	Underlay            bool              `rethinkdb:"underlay" json:"underlay"`
 	Shared              bool              `rethinkdb:"shared" json:"shared"`
@@ -87,10 +87,11 @@ type NetworkMap map[string]Network
 
 // NetworkUsage contains usage information of a network
 type NetworkUsage struct {
-	AvailableIPs      uint64 `json:"available_ips" description:"the total available IPs" readonly:"true"`
-	UsedIPs           uint64 `json:"used_ips" description:"the total used IPs" readonly:"true"`
-	AvailablePrefixes uint64 `json:"available_prefixes" description:"the total available Prefixes" readonly:"true"`
-	UsedPrefixes      uint64 `json:"used_prefixes" description:"the total used Prefixes" readonly:"true"`
+	AvailableIPs        uint64   `json:"available_ips" description:"the total available IPs" readonly:"true"`
+	UsedIPs             uint64   `json:"used_ips" description:"the total used IPs" readonly:"true"`
+	AvailablePrefixes   uint64   `json:"available_prefixes" description:"the total available 2 bit Prefixes" readonly:"true"`
+	AvailablePrefixList []string `json:"available_prefix_list" description:"a list of possible child prefixes"`
+	UsedPrefixes        uint64   `json:"used_prefixes" description:"the total used Prefixes" readonly:"true"`
 }
 
 // ByID creates an indexed map of partitions whre the id is the index.
@@ -147,6 +148,7 @@ func (n *Network) SubstractPrefixes(prefixes ...Prefix) []Prefix {
 	return result
 }
 
+// NicMap returns the nic for a given macaddress
 type NicMap map[MacAddress]*Nic
 
 // ByMac creates a indexed map from a nic list.

cmd/metal-api/internal/metal/partition.go

@@ -3,9 +3,8 @@ package metal
 // A Partition represents a location.
 type Partition struct {
 	Base
-	BootConfiguration          BootConfiguration `rethinkdb:"bootconfig" json:"bootconfig"`
-	MgmtServiceAddress         string            `rethinkdb:"mgmtserviceaddr" json:"mgmtserviceaddr"`
-	PrivateNetworkPrefixLength int               `rethinkdb:"privatenetworkprefixlength" json:"privatenetworkprefixlength"`
+	BootConfiguration  BootConfiguration `rethinkdb:"bootconfig" json:"bootconfig"`
+	MgmtServiceAddress string            `rethinkdb:"mgmtserviceaddr" json:"mgmtserviceaddr"`
 }
 
 // BootConfiguration defines the metal-hammer initrd, kernel and commandline

cmd/metal-api/internal/service/ip-service_test.go

@@ -49,13 +49,15 @@ func TestGetIPs(t *testing.T) {
 	err = json.NewDecoder(resp.Body).Decode(&result)
 
 	require.Nil(t, err)
-	require.Len(t, result, 3)
+	require.Len(t, result, 4)
 	require.Equal(t, testdata.IP1.IPAddress, result[0].IPAddress)
 	require.Equal(t, testdata.IP1.Name, *result[0].Name)
 	require.Equal(t, testdata.IP2.IPAddress, result[1].IPAddress)
 	require.Equal(t, testdata.IP2.Name, *result[1].Name)
 	require.Equal(t, testdata.IP3.IPAddress, result[2].IPAddress)
 	require.Equal(t, testdata.IP3.Name, *result[2].Name)
+	require.Equal(t, testdata.IP4.IPAddress, result[3].IPAddress)
+	require.Equal(t, testdata.IP4.Name, *result[3].Name)
 }
 
 func TestGetIP(t *testing.T) {
@@ -80,6 +82,28 @@ func TestGetIP(t *testing.T) {
 	require.Equal(t, testdata.IP1.Name, *result.Name)
 }
 
+func TestGetIPv6(t *testing.T) {
+	ds, mock := datastore.InitMockDB()
+	testdata.InitMockDBData(mock)
+
+	ipservice, err := NewIP(ds, bus.DirectEndpoints(), ipam.New(goipam.New()), nil)
+	require.NoError(t, err)
+	container := restful.NewContainer().Add(ipservice)
+	req := httptest.NewRequest("GET", "/v1/ip/2001:0db8:85a3::1", nil)
+	container = injectViewer(container, req)
+	w := httptest.NewRecorder()
+	container.ServeHTTP(w, req)
+
+	resp := w.Result()
+	require.Equal(t, http.StatusOK, resp.StatusCode, w.Body.String())
+	var result v1.IPResponse
+	err = json.NewDecoder(resp.Body).Decode(&result)
+
+	require.Nil(t, err)
+	require.Equal(t, testdata.IP4.IPAddress, result.IPAddress)
+	require.Equal(t, testdata.IP4.Name, *result.Name)
+}
+
 func TestGetIPNotFound(t *testing.T) {
 	ds, mock := datastore.InitMockDB()
 	testdata.InitMockDBData(mock)
@@ -127,6 +151,11 @@ func TestDeleteIP(t *testing.T) {
 			ip:           testdata.IP3.IPAddress,
 			wantedStatus: http.StatusUnprocessableEntity,
 		},
+		{
+			name:         "free a ipv6 ip should work",
+			ip:           testdata.IP4.IPAddress,
+			wantedStatus: http.StatusUnprocessableEntity,
+		},
 		{
 			name:         "free an cluster-ip should fail",
 			ip:           testdata.IP2.IPAddress,