Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fixed updates of excluded prefixes #1180

Merged
merged 6 commits into from
Dec 24, 2021
Merged

fixed updates of excluded prefixes #1180

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
50483d3
fixed updates of excluded prefixes
Mixaster995 Nov 29, 2021
02815db
added metadata
Mixaster995 Dec 1, 2021
c0ccdd0
addressed review changes, refactored unit tests
Mixaster995 Dec 7, 2021
df2bfcf
modified updating logic, added diff cutting of prefixes
Mixaster995 Dec 8, 2021
1b302ad
returned old excludedPrefixServer implementation, added client
Mixaster995 Dec 13, 2021
51d027d
removed custom equality method
Mixaster995 Dec 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/networkservice/common/excludedprefixes/client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,8 @@ func (epc *excludedPrefixesClient) Request(ctx context.Context, request *network
logger.Debugf("Added excluded prefixes: %+v", epc.excludedPrefixes)
})

ipCtx.ExcludedPrefixes = oldExcludedPrefixes

return resp, err
}

Expand Down
94 changes: 78 additions & 16 deletions pkg/networkservice/common/excludedprefixes/client_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@ import (
"github.com/networkservicemesh/sdk/pkg/networkservice/core/adapters"
"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam"
"github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkconnection"
"github.com/networkservicemesh/sdk/pkg/networkservice/utils/checks/checkrequest"
"github.com/networkservicemesh/sdk/pkg/networkservice/utils/inject/injecterror"
"github.com/networkservicemesh/sdk/pkg/networkservice/utils/inject/injectexcludedprefixes"
"github.com/networkservicemesh/sdk/pkg/networkservice/utils/inject/injectipcontext"
Expand Down Expand Up @@ -108,17 +110,23 @@ func TestExcludedPrefixesClient_Request_SrcAndDestPrefixesAreDifferent(t *testin
Connection: &networkservice.Connection{},
}

resp, err = chain.NewNetworkServiceClient(client, server2).Request(ctx, request2)
resp, err = chain.NewNetworkServiceClient(
client,
checkconnection.NewClient(t, func(t *testing.T, conn *networkservice.Connection) {
if conn.GetContext() == nil || conn.GetContext().GetIpContext() == nil {
return
}
require.ElementsMatch(t, expectedExcludedIPs, conn.GetContext().GetIpContext().GetExcludedPrefixes())
}),
server2,
).Request(ctx, request2)
require.NoError(t, err)

srcIPs = resp.GetContext().GetIpContext().GetSrcIpAddrs()
require.Len(t, srcIPs, 1)
srcIP2 := srcIPs[0]

require.NotEqual(t, srcIP1, srcIP2)

excludedIPs := resp.GetContext().GetIpContext().GetExcludedPrefixes()
require.ElementsMatch(t, expectedExcludedIPs, excludedIPs)
}

func TestExcludedPrefixesClient_Close_PrefixesAreRemoved(t *testing.T) {
Expand Down Expand Up @@ -197,10 +205,17 @@ func TestExcludedPrefixesClient_Request_WithExcludedPrefixes(t *testing.T) {
point2pointipam.NewServer(ipNet),
)

resp, err = chain.NewNetworkServiceClient(client, server2).Request(ctx, request2)
_, err = chain.NewNetworkServiceClient(
client,
checkconnection.NewClient(t, func(t *testing.T, conn *networkservice.Connection) {
if conn.GetContext() == nil || conn.GetContext().GetIpContext() == nil {
return
}
require.ElementsMatch(t, expectedExcludedPrefixes, conn.GetContext().GetIpContext().GetExcludedPrefixes())
}),
server2,
).Request(ctx, request2)
require.NoError(t, err)

require.ElementsMatch(t, expectedExcludedPrefixes, resp.GetContext().GetIpContext().GetExcludedPrefixes())
}

func TestExcludedPrefixesClient_Request_PrefixesUnchangedAfterError(t *testing.T) {
Expand Down Expand Up @@ -261,10 +276,17 @@ func TestExcludedPrefixesClient_Request_PrefixesUnchangedAfterError(t *testing.T
point2pointipam.NewServer(ipNet)),
)

resp, err = chain.NewNetworkServiceClient(client, server3).Request(ctx, request3)
_, err = chain.NewNetworkServiceClient(
client,
checkconnection.NewClient(t, func(t *testing.T, conn *networkservice.Connection) {
if conn.GetContext() == nil || conn.GetContext().GetIpContext() == nil {
return
}
require.ElementsMatch(t, expectedExcludedPrefixes, conn.GetContext().GetIpContext().GetExcludedPrefixes())
}),
server3,
).Request(ctx, request3)
require.NoError(t, err)

require.ElementsMatch(t, expectedExcludedPrefixes, resp.GetContext().GetIpContext().GetExcludedPrefixes())
}

func TestExcludedPrefixesClient_Request_SuccessfulRefresh(t *testing.T) {
Expand Down Expand Up @@ -307,11 +329,18 @@ func TestExcludedPrefixesClient_Request_SuccessfulRefresh(t *testing.T) {
// src/dest IPs from first server should still be present in a request to another server
expectedExcludedPrefixes2 := []string{"172.16.0.99/32", "172.16.0.97/32", "172.16.0.96/32", "172.16.0.98/32", "172.16.0.100/32"}

resp, err = chain.NewNetworkServiceClient(client, server1).Request(ctx, request)
_, err = chain.NewNetworkServiceClient(
client,
checkconnection.NewClient(t, func(t *testing.T, conn *networkservice.Connection) {
if conn.GetContext() == nil || conn.GetContext().GetIpContext() == nil {
return
}
require.ElementsMatch(t, expectedExcludedPrefixes, conn.GetContext().GetIpContext().GetExcludedPrefixes())
}),
server1,
).Request(ctx, request)
require.NoError(t, err)

require.ElementsMatch(t, expectedExcludedPrefixes, resp.GetContext().GetIpContext().GetExcludedPrefixes())

server2 := chain.NewNetworkServiceClient(
adapters.NewServerToClient(
point2pointipam.NewServer(ipNet)),
Expand All @@ -321,10 +350,17 @@ func TestExcludedPrefixesClient_Request_SuccessfulRefresh(t *testing.T) {
Connection: &networkservice.Connection{},
}

resp, err = chain.NewNetworkServiceClient(client, server2).Request(ctx, request2)
_, err = chain.NewNetworkServiceClient(
client,
checkconnection.NewClient(t, func(t *testing.T, conn *networkservice.Connection) {
if conn.GetContext() == nil || conn.GetContext().GetIpContext() == nil {
return
}
require.ElementsMatch(t, expectedExcludedPrefixes2, conn.GetContext().GetIpContext().GetExcludedPrefixes())
}),
server2,
).Request(ctx, request2)
require.NoError(t, err)

require.ElementsMatch(t, expectedExcludedPrefixes2, resp.GetContext().GetIpContext().GetExcludedPrefixes())
}

func TestExcludedPrefixesClient_Request_EndpointConflicts(t *testing.T) {
Expand Down Expand Up @@ -451,3 +487,29 @@ func TestExcludedPrefixesClient_Request_EndpointConflictCloseError(t *testing.T)
require.Error(t, err)
require.Contains(t, err.Error(), "connection closed")
}

func TestClient(t *testing.T) {
reqPrefixes := []string{"100.1.1.0/13", "10.32.0.0/12", "10.96.0.0/12"}

client := chain.NewNetworkServiceClient(
excludedprefixes.NewClient(),
checkrequest.NewClient(t, func(t *testing.T, request *networkservice.NetworkServiceRequest) {
request.Connection.Context.IpContext.ExcludedPrefixes = append(request.Connection.Context.IpContext.ExcludedPrefixes, []string{"172.16.2.0/24"}...)
}),
)

req := &networkservice.NetworkServiceRequest{
Connection: &networkservice.Connection{
Context: &networkservice.ConnectionContext{
IpContext: &networkservice.IPContext{
ExcludedPrefixes: reqPrefixes,
},
},
},
}

_, err := client.Request(context.Background(), req)

require.ElementsMatch(t, reqPrefixes, req.Connection.Context.IpContext.ExcludedPrefixes)
require.NoError(t, err)
}
54 changes: 54 additions & 0 deletions pkg/networkservice/common/excludedprefixes/server_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ package excludedprefixes_test

import (
"context"
"fmt"
"io/ioutil"
"os"
"path/filepath"
Expand Down Expand Up @@ -131,6 +132,59 @@ func TestUniqueRequestPrefixes(t *testing.T) {
require.NoError(t, err)
}

func TestFilePrefixesChanged(t *testing.T) {
filePrefixes := []string{"172.16.1.0/24", "10.32.0.0/12", "10.96.0.0/12", "10.20.128.0/17"}
reqPrefixes := []string{"100.1.1.0/13", "10.32.0.0/12", "10.96.0.0/12"}
diffPrefxies := []string{"100.1.1.0/13", "10.32.0.0/12", "10.96.0.0/12", "10.20.128.0/17", "172.16.1.0/24"}
newFilePrefixes := []string{"172.16.2.0/24"}

dir := filepath.Join(os.TempDir(), t.Name())
defer func() { _ = os.RemoveAll(dir) }()
require.NoError(t, os.MkdirAll(dir, os.ModePerm))

testConfig := strings.Join(append([]string{"prefixes:"}, filePrefixes...), "\n- ")
configPath := filepath.Join(dir, defaultPrefixesFileName)
require.NoError(t, ioutil.WriteFile(configPath, []byte(testConfig), os.ModePerm))
defer func() { _ = os.Remove(configPath) }()

var prefixesAfterServer []string
isFirst := true
server := chain.NewNetworkServiceServer(
excludedprefixes.NewServer(context.Background(), excludedprefixes.WithConfigPath(configPath)),
checkrequest.NewServer(t, func(t *testing.T, request *networkservice.NetworkServiceRequest) {
if isFirst {
require.ElementsMatch(t, diffPrefxies, request.Connection.Context.IpContext.ExcludedPrefixes)
isFirst = false
}

prefixesAfterServer = request.Connection.Context.IpContext.ExcludedPrefixes
}),
)

req := &networkservice.NetworkServiceRequest{
Connection: &networkservice.Connection{
Id: "1",
Context: &networkservice.ConnectionContext{
IpContext: &networkservice.IPContext{
ExcludedPrefixes: reqPrefixes,
},
},
},
}

_, err := server.Request(context.Background(), req)

require.NoError(t, ioutil.WriteFile(configPath, []byte(strings.Join(append([]string{"prefixes:"}, newFilePrefixes...), "\n- ")), os.ModePerm))

require.Eventually(t, func() bool {
_, err = server.Request(context.Background(), req)
fmt.Printf("%v\n", prefixesAfterServer)
return excludedprefixes.IsEqual(prefixesAfterServer, append(diffPrefxies, newFilePrefixes...))
}, time.Second, time.Millisecond*100)

require.NoError(t, err)
}

func testWaitForFile(t *testing.T, filePath string) {
prefixes := []string{"10.80.0.0/12", "172.16.1.0/24"}

Expand Down
19 changes: 19 additions & 0 deletions pkg/networkservice/common/excludedprefixes/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,11 @@

package excludedprefixes

import (
"reflect"
"sort"
)

func removeDuplicates(elements []string) []string {
encountered := map[string]bool{}
var result []string
Expand Down Expand Up @@ -50,3 +55,17 @@ func exclude(source, exclude []string) []string {

return source
}

// IsEqual check if two slices contains equal strings, no matter the order
func IsEqual(s1, s2 []string) bool {
s1copy := make([]string, len(s1))
s2copy := make([]string, len(s2))

copy(s1copy, s1)
copy(s2copy, s2)

sort.Strings(s1copy)
sort.Strings(s2copy)

return reflect.DeepEqual(s1copy, s2copy)
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Consider using github.com/google/go-cmp/cmp

We already have dep on it https://github.com/networkservicemesh/sdk/blob/main/go.mod#L17

Suggested change
// IsEqual check if two slices contains equal strings, no matter the order
func IsEqual(s1, s2 []string) bool {
s1copy := make([]string, len(s1))
s2copy := make([]string, len(s2))
copy(s1copy, s1)
copy(s2copy, s2)
sort.Strings(s1copy)
sort.Strings(s2copy)
return reflect.DeepEqual(s1copy, s2copy)
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@denis-tingaikin ok, done