-
Notifications
You must be signed in to change notification settings - Fork 19
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.
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
Add options to the forwarder to use it with an external vpp #530
Merged
denis-tingaikin
merged 2 commits into
networkservicemesh:main
from
glazychev-art:forwarder_opts
Mar 18, 2022
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,113 @@ | ||
| // Copyright (c) 2022 Cisco and/or its affiliates. | ||
| // | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at: | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| // +build linux | ||
|
|
||
| package forwarder | ||
|
|
||
| import ( | ||
| "net/url" | ||
| "time" | ||
|
|
||
| "google.golang.org/grpc" | ||
|
|
||
| "github.com/networkservicemesh/api/pkg/api/networkservice" | ||
| "github.com/networkservicemesh/sdk/pkg/networkservice/common/cleanup" | ||
|
|
||
| "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/vxlan" | ||
| "github.com/networkservicemesh/sdk-vpp/pkg/networkservice/stats" | ||
| ) | ||
|
|
||
| type forwarderOptions struct { | ||
| name string | ||
| authorizeServer networkservice.NetworkServiceServer | ||
| clientURL *url.URL | ||
| dialTimeout time.Duration | ||
| domain2Device map[string]string | ||
| statsOpts []stats.Option | ||
| cleanupOpts []cleanup.Option | ||
| vxlanOpts []vxlan.Option | ||
| dialOpts []grpc.DialOption | ||
| } | ||
|
|
||
| // Option is an option pattern for forwarder chain elements | ||
| type Option func(o *forwarderOptions) | ||
|
|
||
| // WithName - set a forwarder name | ||
| func WithName(name string) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.name = name | ||
| } | ||
| } | ||
|
|
||
| // WithAuthorizeServer sets authorization server chain element | ||
| func WithAuthorizeServer(authorizeServer networkservice.NetworkServiceServer) Option { | ||
| if authorizeServer == nil { | ||
| panic("Authorize server cannot be nil") | ||
| } | ||
| return func(o *forwarderOptions) { | ||
| o.authorizeServer = authorizeServer | ||
| } | ||
| } | ||
|
|
||
| // WithClientURL sets clientURL. | ||
| func WithClientURL(clientURL *url.URL) Option { | ||
| return func(c *forwarderOptions) { | ||
| c.clientURL = clientURL | ||
| } | ||
| } | ||
|
|
||
| // WithDialTimeout sets dial timeout for the client | ||
| func WithDialTimeout(dialTimeout time.Duration) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.dialTimeout = dialTimeout | ||
| } | ||
| } | ||
|
|
||
| // WithVlanDomain2Device sets vlan option | ||
| func WithVlanDomain2Device(domain2Device map[string]string) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.domain2Device = domain2Device | ||
| } | ||
| } | ||
|
|
||
| // WithStatsOptions sets stats options | ||
| func WithStatsOptions(opts ...stats.Option) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.statsOpts = opts | ||
| } | ||
| } | ||
|
|
||
| // WithCleanupOptions sets cleanup options | ||
| func WithCleanupOptions(opts ...cleanup.Option) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.cleanupOpts = opts | ||
| } | ||
| } | ||
|
|
||
| // WithVxlanOptions sets vxlan options | ||
| func WithVxlanOptions(opts ...vxlan.Option) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.vxlanOpts = opts | ||
| } | ||
| } | ||
|
|
||
| // WithDialOptions sets dial options | ||
| func WithDialOptions(opts ...grpc.DialOption) Option { | ||
| return func(o *forwarderOptions) { | ||
| o.dialOpts = opts | ||
| } | ||
| } |
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
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.
Missed default parameters for:
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.
I thought it was the responsibility of each individual chain element. Forwarder just passes options. Otherwise, it will turn out that at each iteration we will set new default parameters:
Name is set, because we want to keep consistency inside the forwarder (used in the
clientandendpointchain).And, do we have a constant for
dialTimeoutorclientURL?@denis-tingaikin Any thoughts?
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.
@glazychev-art option means that the value is not required. I don't think that clientURL== nil and dialTimeout == 0 are good values by default. Also I'm fine to make these values as required.