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

Add cidr chain element #1193

Merged
merged 2 commits into from
Dec 16, 2021
Merged

Add cidr chain element #1193

merged 2 commits into from
Dec 16, 2021

Conversation

glazychev-art
Copy link
Contributor

Signed-off-by: Artem Glazychev artem.glazychev@xored.com

Description

This chain element extracts prefix from some global prefix and writes it to ExtraPrefixes - Link

Issue link

networkservicemesh/cmd-nse-vl3-vpp#1

How Has This Been Tested?

  • Added unit testing to cover
  • Tested manually
  • Tested by integration testing
  • Have not tested

Types of changes

  • Bug fix
  • New functionallity
  • Documentation
  • Refactoring
  • CI

@glazychev-art
Add cidr chain element
7578f98 
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
denis-tingaikin
denis-tingaikin reviewed Dec 12, 2021
View reviewed changes
pkg/networkservice/common/cidr/cidr_test.go Outdated
Comment on lines 75 to 141
prefixes := []string{"192.168.0.0/16"}
server := newServer(prefixes, nil)

request := newRequest()
client1 := newClient(24, networkservice.IpFamily_IPV4, server)
conn1, err := client1.Request(context.Background(), request)
require.NoError(t, err)
validateConn(t, conn1, "192.168.0.0/24", "192.168.0.0/16")

// refresh
conn1, err = client1.Request(context.Background(), request)
require.NoError(t, err)
validateConn(t, conn1, "192.168.0.0/24", "192.168.0.0/16")

client2 := newClient(24, networkservice.IpFamily_IPV4, server)
conn2, err := client2.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn2, "192.168.1.0/24", "192.168.0.0/16")

_, err = client1.Close(context.Background(), conn1)
require.NoError(t, err)

client3 := newClient(24, networkservice.IpFamily_IPV4, server)
conn3, err := client3.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn3, "192.168.0.0/24", "192.168.0.0/16")

client4 := newClient(24, networkservice.IpFamily_IPV4, server)
conn4, err := client4.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn4, "192.168.2.0/24", "192.168.0.0/16")
}

//nolint:dupl
func TestIPv6(t *testing.T) {
prefixes := []string{"2001:db8::/96"}
server := newServer(prefixes, nil)

request := newRequest()
client1 := newClient(112, networkservice.IpFamily_IPV6, server)
conn1, err := client1.Request(context.Background(), request)
require.NoError(t, err)
validateConn(t, conn1, "2001:db8::/112", "2001:db8::/96")

// refresh
conn1, err = client1.Request(context.Background(), request)
require.NoError(t, err)
validateConn(t, conn1, "2001:db8::/112", "2001:db8::/96")

client2 := newClient(112, networkservice.IpFamily_IPV6, server)
conn2, err := client2.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn2, "2001:db8::1:0/112", "2001:db8::/96")

_, err = client1.Close(context.Background(), conn1)
require.NoError(t, err)

client3 := newClient(112, networkservice.IpFamily_IPV6, server)
conn3, err := client3.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn3, "2001:db8::/112", "2001:db8::/96")

client4 := newClient(112, networkservice.IpFamily_IPV6, server)
conn4, err := client4.Request(context.Background(), newRequest())
require.NoError(t, err)
validateConn(t, conn4, "2001:db8::2:0/112", "2001:db8::/96")
}
Copy link
Member

Choose a reason for hiding this comment

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

This looks as code dup.

Please consider to use test-cases go pattern.

Moreover try to use newClient, validateConn, newServer inline.

denis-tingaikin
denis-tingaikin approved these changes Dec 12, 2021
View reviewed changes
Copy link
Member

@denis-tingaikin denis-tingaikin left a comment

Choose a reason for hiding this comment

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

Logically looks good.

@edwarnicke Could you have a look?

@glazychev-art
Remove test code duplication
567deb3 
Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>
@edwarnicke edwarnicke merged commit 9eaf694 into networkservicemesh:main Dec 16, 2021
nsmbot pushed a commit to networkservicemesh/cmd-nse-vfio that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
1ee0626 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-registry-memory that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
eaca824 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-registry-proxy-dns that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
45407df 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/sdk-k8s that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
895eb11 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsmgr that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
4fbfa18 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/sdk-kernel that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
67fe18a 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsc-init that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
44767b2 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-nsmgr-proxy that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
35ac471 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
nsmbot pushed a commit to networkservicemesh/cmd-admission-webhook-k8s that referenced this pull request Dec 16, 2021
Update go.mod and go.sum to latest version from networkservicemesh/sd…
09a4960 
…k@main

PR link: networkservicemesh/sdk#1193

Commit: 9eaf694
Author: Artem Glazychev
Date: 2021-12-17 00:27:18 +0700
Message:
  - Add cidr chain element (#1193)
* Add cidr chain element

Signed-off-by: Artem Glazychev <artem.glazychev@xored.com>

* Remove test code duplication

Signed-off-by: NSMBot <nsmbot@networkservicmesh.io>
This was referenced Dec 16, 2021
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@denis-tingaikin denis-tingaikin denis-tingaikin approved these changes

@edwarnicke edwarnicke Awaiting requested review from edwarnicke

@Mixaster995 Mixaster995 Awaiting requested review from Mixaster995

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@glazychev-art @denis-tingaikin @edwarnicke