Dualstack Network Support #549
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| package migrations | ||
|
|
||
| import ( | ||
| "net/netip" | ||
|
|
||
| r "gopkg.in/rethinkdb/rethinkdb-go.v6" | ||
|
|
||
| "github.com/metal-stack/metal-api/cmd/metal-api/internal/datastore" | ||
| "github.com/metal-stack/metal-api/cmd/metal-api/internal/metal" | ||
| ) | ||
|
|
||
| func init() { | ||
| type tmpPartition struct { | ||
| PrivateNetworkPrefixLength uint8 `rethinkdb:"privatenetworkprefixlength"` | ||
| } | ||
| datastore.MustRegisterMigration(datastore.Migration{ | ||
| Name: "migrate partition.childprefixlength to tenant super network", | ||
| Version: 8, | ||
| 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 { | ||
| cursor, err := db.Table("partition").Get(old.PartitionID).Run(session) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if cursor.IsNil() { | ||
| _ = cursor.Close() | ||
| continue | ||
| } | ||
| var partition tmpPartition | ||
| err = cursor.One(&partition) | ||
| if err != nil { | ||
| _ = cursor.Close() | ||
| return err | ||
| } | ||
| err = cursor.Close() | ||
| if err != nil { | ||
| return err | ||
| } | ||
| new := old | ||
|
|
||
| var ( | ||
| af metal.AddressFamily | ||
| defaultChildPrefixLength = metal.ChildPrefixLength{} | ||
| ) | ||
| // FIXME check all prefixes | ||
| parsed, err := netip.ParsePrefix(new.Prefixes[0].String()) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| if parsed.Addr().Is4() { | ||
| af = metal.IPv4AddressFamily | ||
| defaultChildPrefixLength[af] = 22 | ||
| } | ||
| if parsed.Addr().Is6() { | ||
| af = metal.IPv6AddressFamily | ||
| defaultChildPrefixLength[af] = 64 | ||
| } | ||
|
|
||
| if new.AddressFamilies == nil { | ||
| new.AddressFamilies = metal.AddressFamilies{} | ||
| } | ||
| new.AddressFamilies = metal.AddressFamilies{af} | ||
|
Comment on lines
+55
to
+67
There was a problem hiding this comment. This is only required for private super networks and for those it's probably enough just to take the value from the partition for IPv4 and 64 for IPv6. |
||
|
|
||
| if new.PrivateSuper { | ||
| if new.DefaultChildPrefixLength == nil { | ||
| new.DefaultChildPrefixLength = make(map[metal.AddressFamily]uint8) | ||
| } | ||
| if partition.PrivateNetworkPrefixLength > 0 { | ||
| new.DefaultChildPrefixLength[af] = partition.PrivateNetworkPrefixLength | ||
| } else { | ||
| new.DefaultChildPrefixLength = defaultChildPrefixLength | ||
| } | ||
|
|
||
| } | ||
| err = rs.UpdateNetwork(&old, &new) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| } | ||
|
|
||
| _, err = db.Table("partition").Replace(r.Row.Without("privatenetworkprefixlength")).RunWrite(session) | ||
| return err | ||
| }, | ||
| }) | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -68,6 +68,9 @@ func (_ *networkTestable) defaultBody(n *metal.Network) *metal.Network { | |
| if n.AdditionalAnnouncableCIDRs == nil { | ||
| n.AdditionalAnnouncableCIDRs = []string{} | ||
| } | ||
| if n.AddressFamilies == nil { | ||
| n.AddressFamilies = metal.AddressFamilies{} | ||
| } | ||
| return n | ||
| } | ||
|
|
||
|
|
@@ -301,6 +304,34 @@ func TestRethinkStore_SearchNetworks(t *testing.T) { | |
| }, | ||
| wantErr: nil, | ||
| }, | ||
| { | ||
| name: "search by ipv4 addressfamily", | ||
| q: &NetworkSearchQuery{ | ||
| AddressFamily: pointer.Pointer(string(metal.IPv4AddressFamily)), | ||
| }, | ||
| mock: []*metal.Network{ | ||
| {Base: metal.Base{ID: "1"}, Prefixes: metal.Prefixes{{IP: "1.2.3.4", Length: "32"}}}, | ||
| {Base: metal.Base{ID: "2"}, Prefixes: metal.Prefixes{{IP: "fe80::", Length: "64"}}}, | ||
| }, | ||
| want: []*metal.Network{ | ||
| tt.defaultBody(&metal.Network{Base: metal.Base{ID: "1"}, Prefixes: metal.Prefixes{{IP: "1.2.3.4", Length: "32"}}}), | ||
| }, | ||
| wantErr: nil, | ||
| }, | ||
| { | ||
| name: "search by ipv6 addressfamily", | ||
| q: &NetworkSearchQuery{ | ||
| AddressFamily: pointer.Pointer(string(metal.IPv6AddressFamily)), | ||
| }, | ||
| mock: []*metal.Network{ | ||
| {Base: metal.Base{ID: "1"}, Prefixes: metal.Prefixes{{IP: "1.2.3.4", Length: "32"}}}, | ||
| {Base: metal.Base{ID: "2"}, Prefixes: metal.Prefixes{{IP: "fe80::", Length: "64"}}}, | ||
| }, | ||
| want: []*metal.Network{ | ||
| tt.defaultBody(&metal.Network{Base: metal.Base{ID: "2"}, Prefixes: metal.Prefixes{{IP: "fe80::", Length: "64"}}}), | ||
| }, | ||
| wantErr: nil, | ||
| }, | ||
| } | ||
|
|
||
| for i := range tests { | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -384,7 +384,7 @@ func (rs *RethinkStore) findEntity(query *r.Term, entity interface{}) error { | |
| } | ||
| defer res.Close() | ||
| if res.IsNil() { | ||
| return metal.NotFound("no %v found", getEntityName(entity)) | ||
| } | ||
|
|
||
| hasResult := res.Next(entity) | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.