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

Delete label matching #1244

Merged
merged 3 commits into from
Mar 16, 2022
Merged

Delete label matching #1244

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2130559
delete label matching (for ci)
NikitaSkrynnik Mar 15, 2022
7ffbb4c
fix Test_AwareNSEs
NikitaSkrynnik Mar 16, 2022
4f97557
fix Test_AwareNSEs timeout
NikitaSkrynnik Mar 16, 2022
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
45 changes: 29 additions & 16 deletions pkg/networkservice/chains/nsmgr/single_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func Test_DNSUsecase(t *testing.T) {
func Test_AwareNSEs(t *testing.T) {
t.Cleanup(func() { goleak.VerifyNone(t) })

ctx, cancel := context.WithTimeout(context.Background(), time.Second*500)
ctx, cancel := context.WithTimeout(context.Background(), time.Second*5)
defer cancel()

domain := sandbox.NewBuilder(ctx, t).
Expand All @@ -128,35 +128,32 @@ func Test_AwareNSEs(t *testing.T) {
var nses [count]*sandbox.EndpointEntry
var requests [count]*networkservice.NetworkServiceRequest

ns1, err := nsRegistryClient.Register(ctx, defaultRegistryService("my-ns-1"))
require.NoError(t, err)
ns1 := defaultRegistryService("my-ns-1")
ns2 := defaultRegistryService("my-ns-2")

nsurl1, err := url.Parse(fmt.Sprintf("kernel://%s?%s=%s", ns1.Name, "color", "red"))
require.NoError(t, err)

ns2, err := nsRegistryClient.Register(ctx, defaultRegistryService("my-ns-2"))
require.NoError(t, err)

nsurl2, err := url.Parse(fmt.Sprintf("kernel://%s?%s=%s", ns2.Name, "color", "red"))
require.NoError(t, err)

nseInfo := [count]struct {
nsname string
nsInfo := [count]struct {
ns *registry.NetworkService
labelKey string
labelValue string
}{
{
nsname: ns1.Name,
ns: ns1,
labelKey: "color",
labelValue: "red",
},
{
nsname: ns2.Name,
ns: ns2,
labelKey: "color",
labelValue: "red",
},
{
nsname: ns1.Name,
ns: ns1,
labelKey: "day",
labelValue: "friday",
},
Expand All @@ -165,11 +162,11 @@ func Test_AwareNSEs(t *testing.T) {
for i := 0; i < count; i++ {
nseRegs[i] = &registry.NetworkServiceEndpoint{
Name: fmt.Sprintf("nse-%s", uuid.New().String()),
NetworkServiceNames: []string{nseInfo[i].nsname},
NetworkServiceNames: []string{nsInfo[i].ns.Name},
NetworkServiceLabels: map[string]*registry.NetworkServiceLabels{
nseInfo[i].nsname: {
nsInfo[i].ns.Name: {
Labels: map[string]string{
nseInfo[i].labelKey: nseInfo[i].labelValue,
nsInfo[i].labelKey: nsInfo[i].labelValue,
},
},
},
Expand All @@ -180,16 +177,32 @@ func Test_AwareNSEs(t *testing.T) {
requests[i] = &networkservice.NetworkServiceRequest{
Connection: &networkservice.Connection{
Id: fmt.Sprint(i),
NetworkService: nseInfo[i].nsname,
NetworkService: nsInfo[i].ns.Name,
Context: &networkservice.ConnectionContext{},
Mechanism: &networkservice.Mechanism{Cls: cls.LOCAL, Type: kernelmech.MECHANISM},
Labels: map[string]string{
nseInfo[i].labelKey: nseInfo[i].labelValue,
nsInfo[i].labelKey: nsInfo[i].labelValue,
},
},
}

nsInfo[i].ns.Matches = append(nsInfo[i].ns.Matches,
&registry.Match{
SourceSelector: map[string]string{nsInfo[i].labelKey: nsInfo[i].labelValue},
Routes: []*registry.Destination{
{
DestinationSelector: map[string]string{nsInfo[i].labelKey: nsInfo[i].labelValue},
},
},
},
)
}

_, err = nsRegistryClient.Register(ctx, ns1)
require.NoError(t, err)
_, err = nsRegistryClient.Register(ctx, ns2)
require.NoError(t, err)

nsc := domain.Nodes[0].NewClient(ctx, sandbox.GenerateTestToken,
excludedprefixes.NewClient(excludedprefixes.WithAwarenessGroups(
[][]*url.URL{
Expand Down
10 changes: 1 addition & 9 deletions pkg/networkservice/common/discover/match_selector.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,15 +60,7 @@ func matchEndpoint(clockTime clock.Clock, nsLabels map[string]string, ns *regist
return nseCandidates
}

var candidates []*registry.NetworkServiceEndpoint
for _, nse := range validNetworkServiceEndpoints {
nseLabels := nse.GetNetworkServiceLabels()[ns.Name].GetLabels()
if nseLabels != nil && !matchutils.IsSubset(nsLabels, nseLabels, nsLabels) {
continue
}
candidates = append(candidates, nse)
}
return candidates
return validNetworkServiceEndpoints
}

func validateExpirationTime(clockTime clock.Clock, nses []*registry.NetworkServiceEndpoint) []*registry.NetworkServiceEndpoint {
Expand Down