-
Notifications
You must be signed in to change notification settings - Fork 17
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
nft: Add support named counters and handlers. #58
Open
bunert
wants to merge
3
commits into
networkplumbing:main
Choose a base branch
from
bunert:bunert/handle-and-counter-support
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * This file is part of the go-nft project | ||
| * | ||
| * 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. | ||
| * | ||
| * Copyright 2023 Anapaya Systems | ||
| * | ||
| */ | ||
|
|
||
| package config | ||
|
|
||
| import ( | ||
| "github.com/networkplumbing/go-nft/nft/schema" | ||
| ) | ||
|
|
||
| // AddCounter appends the given named counter to the nftable config. | ||
| // The rule is added without an explicit action (`add`). | ||
| // Adding multiple times the same named counter has no affect when the config is applied. | ||
| func (c *Config) AddCounter(counter *schema.NamedCounter) { | ||
| nftable := schema.Nftable{Counter: counter} | ||
| c.Nftables = append(c.Nftables, nftable) | ||
| } | ||
|
|
||
| // DeleteCounter appends a given rule to the nftable config with the `delete` action. | ||
| // Attempting to delete a non-existing named counter, results with a failure when the config is applied. | ||
| func (c *Config) DeleteCounter(counter *schema.NamedCounter) { | ||
| nftable := schema.Nftable{Delete: &schema.Objects{Counter: counter}} | ||
| c.Nftables = append(c.Nftables, nftable) | ||
| } | ||
|
|
||
| // LookupCounter searches the configuration for a matching counter and returns it. | ||
| // The counter is matched first by the table. | ||
| // Mutating the returned counter will result in mutating the configuration. | ||
| func (c *Config) LookupCounter(toFind *schema.NamedCounter) *schema.NamedCounter { | ||
| for _, nftable := range c.Nftables { | ||
| if counter := nftable.Counter; counter != nil { | ||
| match := counter.Table == toFind.Table && counter.Family == toFind.Family && counter.Name == toFind.Name | ||
| if match { | ||
| return counter | ||
| } | ||
| } | ||
| } | ||
| return nil | ||
| } |
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,97 @@ | ||
| /* | ||
| * This file is part of the go-nft project | ||
| * | ||
| * 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. | ||
| * | ||
| * Copyright 2023 Anapaya Systems | ||
| * | ||
| */ | ||
|
|
||
| package config_test | ||
|
|
||
| import ( | ||
| "fmt" | ||
| "testing" | ||
|
|
||
| assert "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/networkplumbing/go-nft/nft" | ||
| "github.com/networkplumbing/go-nft/nft/schema" | ||
| ) | ||
|
|
||
| type CounterAction string | ||
|
|
||
| // Counter Actions | ||
| const ( | ||
| CounterADD CounterAction = "add" | ||
| CounterDELETE CounterAction = "delete" | ||
| ) | ||
|
|
||
| type counterActionFunc func(*nft.Config, *schema.NamedCounter) | ||
|
|
||
| const counterName = "test-counter" | ||
|
|
||
| func TestCounter(t *testing.T) { | ||
| testCounterActions(t) | ||
| testCounterLookup(t) | ||
| } | ||
|
|
||
| func testCounterActions(t *testing.T) { | ||
| actions := map[CounterAction]counterActionFunc{ | ||
| CounterADD: func(c *nft.Config, t *schema.NamedCounter) { c.AddCounter(t) }, | ||
| CounterDELETE: func(c *nft.Config, t *schema.NamedCounter) { c.DeleteCounter(t) }, | ||
| } | ||
| table := nft.NewTable(tableName, nft.FamilyIP) | ||
| counter := nft.NewCounter(table, counterName) | ||
|
|
||
| for action, actionFunc := range actions { | ||
| testName := fmt.Sprintf("%s counter", string(action)) | ||
|
|
||
| t.Run(testName, func(t *testing.T) { | ||
| config := nft.NewConfig() | ||
| actionFunc(config, counter) | ||
|
|
||
| serializedConfig, err := config.ToJSON() | ||
| assert.NoError(t, err) | ||
|
|
||
| counterArgs := fmt.Sprintf(`"family":%q,"table":%q,"name":%q`, table.Family, table.Name, counterName) | ||
| var expected []byte | ||
| if action == CounterADD { | ||
| expected = []byte(fmt.Sprintf(`{"nftables":[{"counter":{%s}}]}`, counterArgs)) | ||
| } else { | ||
| expected = []byte(fmt.Sprintf(`{"nftables":[{%q:{"counter":{%s}}}]}`, action, counterArgs)) | ||
| } | ||
|
|
||
| assert.Equal(t, string(expected), string(serializedConfig)) | ||
| }) | ||
| } | ||
| } | ||
|
|
||
| func testCounterLookup(t *testing.T) { | ||
| config := nft.NewConfig() | ||
| table_inet := nft.NewTable("table-inet", nft.FamilyINET) | ||
| config.AddTable(table_inet) | ||
|
|
||
| counter := nft.NewCounter(table_inet, "test-counter") | ||
| config.AddCounter(counter) | ||
|
|
||
| t.Run("Lookup an existing named counter", func(t *testing.T) { | ||
| c := config.LookupCounter(counter) | ||
| assert.Equal(t, counter, c) | ||
| }) | ||
|
|
||
| t.Run("Lookup a missing named counter", func(t *testing.T) { | ||
| c := nft.NewCounter(table_inet, "counter-na") | ||
| assert.Nil(t, config.LookupCounter(c)) | ||
| }) | ||
| } |
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
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.
The rename was intentional [1] to use the more common
assertword but behave like the testifyrequiresemantics.This is the convention through the project and I would prefer to keep it.
I guess it is a bag I carry from other testing frameworks and different languages.
[1] 5d1c9c8