Antctl cnp anp support #1301

GraysonWu · 2020-09-25T00:11:30Z

Make antctl get netpol support ACNP and ANP. Fix issue #927.
After support ACNP and ANP, some name and namespace based functions no longer work. Here add a struct called NetworkPolicyQueryFilter which can be used to query NetworkPolicies and easy to extend in the future. The logic of the filter matching is that if a NetworkPolicy can match all provided attributes of a filter then they are matched.
Add type -T [np acnp anp] option to antctl get netpol.
Add more info into result of antctl get netpol like sourceType, Prioriy, TierPriority.

vmwclabot · 2020-09-25T00:11:34Z

@GraysonWu, you must sign our contributor license agreement before your changes are merged. Click here to sign the agreement. If you are a VMware employee, read this for further instruction.

antrea-bot · 2020-09-25T00:11:43Z

Thanks for your PR.
Unit tests and code linters are run automatically every time the PR is updated.
E2e, conformance and network policy tests can only be triggered by a member of the vmware-tanzu organization. Regular contributors to the project should join the org.

The following commands are available:

/test-e2e: to trigger e2e tests.
/skip-e2e: to skip e2e tests.
/test-conformance: to trigger conformance tests.
/skip-conformance: to skip conformance tests.
/test-whole-conformance: to trigger all conformance tests on linux.
/skip-whole-conformance: to skip all conformance tests on linux.
/test-networkpolicy: to trigger networkpolicy tests.
/skip-networkpolicy: to skip networkpolicy tests.
/test-windows-conformance: to trigger windows conformance tests.
/skip-windows-conformance: to skip windows conformance tests.
/test-windows-networkpolicy: to trigger windows networkpolicy tests.
/skip-windows-networkpolicy: to skip windows networkpolicy tests.
/test-hw-offload: to trigger ovs hardware offload test.
/skip-hw-offload: to skip ovs hardware offload test.
/test-all: to trigger all tests (except whole conformance).
/skip-all: to skip all tests (except whole conformance).

codecov-commenter · 2020-09-25T00:15:28Z

Codecov Report

Merging #1301 into master will increase coverage by 10.15%.
The diff coverage is 58.82%.

@@             Coverage Diff             @@
##           master    #1301       +/-   ##
===========================================
+ Coverage   54.47%   64.63%   +10.15%     
===========================================
  Files         119      157       +38     
  Lines       11240    12627     +1387     
===========================================
+ Hits         6123     8161     +2038     
+ Misses       4526     3620      -906     
- Partials      591      846      +255

Flag	Coverage Δ
#integration-tests	`44.80% <ø> (ø)`
#kind-e2e-tests	`50.66% <38.23%> (?)`
#unit-tests	`42.18% <68.75%> (-0.01%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/antctl/antctl.go	`100.00% <ø> (ø)`
pkg/querier/querier.go	`57.14% <ø> (+57.14%)`	⬆️
pkg/support/dump.go	`62.36% <0.00%> (ø)`
.../agent/apiserver/handlers/networkpolicy/handler.go	`56.52% <52.94%> (ø)`
pkg/agent/controller/networkpolicy/cache.go	`84.46% <66.66%> (+5.12%)`	⬆️
...ntroller/networkpolicy/networkpolicy_controller.go	`72.33% <66.66%> (+11.06%)`	⬆️
pkg/agent/apiserver/handlers/ovsflows/handler.go	`78.94% <100.00%> (+3.94%)`	⬆️
pkg/apiserver/handlers/endpoint/handler.go	`58.82% <0.00%> (-11.77%)`	⬇️
pkg/agent/util/sysctl/sysctl_linux.go	`0.00% <0.00%> (ø)`
pkg/apis/networking/v1beta1/conversion.go	`30.00% <0.00%> (ø)`
... and 104 more

pkg/agent/apiserver/handlers/networkpolicy/handler.go

Dyanngg · 2020-09-25T00:44:16Z

pkg/agent/controller/networkpolicy/cache.go

 // getNetworkPolicy looks up and returns the cached NetworkPolicy.
 // nil is returned if the specified NetworkPolicy is not found.
-func (c *ruleCache) getNetworkPolicy(npName, npNamespace string) *v1beta1.NetworkPolicy {
+func (c *ruleCache) getNetworkPolicy(npFilter v1beta1.NetworkPolicyQueryFilter) *v1beta1.NetworkPolicy {


why do we return the first netpol matched in this case rather than returning the list of all matches?

There are two functions: getNetworkPolicy and getNetworkPolicies.
According to my understanding, previously, before supporting CNP and ANP, getNetworkPolicy is used to get a single NP with name and namespace. getNetworkPolicies is used to get a list of NP in one namespace or all namespace.
After supporting CNP and ANP, with NetworkPolicyQueryFilter introduced, I want to keep the functionality of these two functions. getNetworkPolicies still return a list of NP that match the filter. getNetworkPolicy should accept a NetworkPolicyQueryFilter with attributes that can locate only one NP and return this NP.
BTW I'm totally ok to remove function getNetworkPolicy since it can be covered by getNetworkPolicies now. If users want a single NP, they can pass a proper filter into getNetworkPolicies can get the first element of the returned list.

pkg/apis/controlplane/v1beta1/types.go

pkg/agent/apiserver/handlers/networkpolicy/handler.go

codecov-io · 2020-10-06T21:03:28Z

Codecov Report

Merging #1301 into master will decrease coverage by 10.11%.
The diff coverage is 68.75%.

@@             Coverage Diff             @@
##           master    #1301       +/-   ##
===========================================
- Coverage   64.40%   54.28%   -10.12%     
===========================================
  Files         159      120       -39     
  Lines       12681    11281     -1400     
===========================================
- Hits         8167     6124     -2043     
- Misses       3660     4563      +903     
+ Partials      854      594      -260

Flag	Coverage Δ
#integration-tests	`44.87% <ø> (+0.03%)`	⬆️
#kind-e2e-tests	`?`
#unit-tests	`42.02% <68.75%> (-0.06%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
pkg/antctl/antctl.go	`100.00% <ø> (ø)`
pkg/querier/querier.go	`0.00% <ø> (-57.15%)`	⬇️
pkg/agent/controller/networkpolicy/cache.go	`79.81% <66.66%> (-5.18%)`	⬇️
...ntroller/networkpolicy/networkpolicy_controller.go	`57.77% <66.66%> (-9.26%)`	⬇️
pkg/agent/apiserver/handlers/ovsflows/handler.go	`75.00% <100.00%> (-3.95%)`	⬇️
pkg/agent/agent_linux.go	`0.00% <0.00%> (-100.00%)`	⬇️
pkg/agent/proxy/types/groupcounter.go	`0.00% <0.00%> (-95.00%)`	⬇️
pkg/controller/networkpolicy/tier.go	`0.00% <0.00%> (-90.00%)`	⬇️
pkg/apis/controlplane/register.go	`0.00% <0.00%> (-85.72%)`	⬇️
pkg/agent/proxy/types/types.go	`0.00% <0.00%> (-84.62%)`	⬇️
... and 104 more

pkg/agent/controller/networkpolicy/cache.go

pkg/agent/controller/networkpolicy/networkpolicy_controller.go

pkg/antctl/antctl.go

pkg/querier/querier.go

tnqn

LGTM overall, some minor comments

pkg/antctl/antctl.go

pkg/antctl/command_definition_test.go

pkg/agent/apiserver/handlers/networkpolicy/handler.go

tnqn

two minor comments, otherwise LGTM

pkg/agent/apiserver/handlers/networkpolicy/handler.go

After support CNP and ANP, some name and namespace based functions no longer work. Here add a struct called NetworkPolicyQueryFilter which can be used to query NetworkPolicies and easy to extend in future. The logic of the filter match is that if a NetworkPolicy can match all provided attributes of a filter then they are matched. Also add more info into result of antctl get netpol like sourceType, Prioriy, TierPriority. codegen and fix UT revert changes on this file, accidently submit it change response while no resource are found fix e2e test Add aliases to -r --reference option Update pkg/agent/apiserver/handlers/networkpolicy/handler.go Simplify the process of `func NewFilterFromURLQuery` Co-authored-by: Dyanngg <[email protected]>

From pkg/apis/controlplane/v1beta1/types.go To pkg/querier/querier.go

Change NetworkPolicyQueryFilter in map or argument from struct to pointer Change -r reference to -T type

tnqn

LGTM

tnqn · 2020-10-22T04:12:27Z

/test-all

Dyanngg reviewed Sep 25, 2020

View reviewed changes

GraysonWu force-pushed the antctl-cnp-anp branch 4 times, most recently from 5d5a68b to a7c300b Compare September 29, 2020 18:45

Dyanngg requested review from abhiraut, tnqn and antoninbas September 29, 2020 20:33

antoninbas reviewed Sep 30, 2020

View reviewed changes

pkg/apis/controlplane/v1beta1/types.go Outdated Show resolved Hide resolved

GraysonWu force-pushed the antctl-cnp-anp branch 5 times, most recently from a133bb6 to 9a7eba6 Compare October 2, 2020 22:39

Dyanngg reviewed Oct 6, 2020

View reviewed changes

pkg/agent/apiserver/handlers/networkpolicy/handler.go Outdated Show resolved Hide resolved

GraysonWu force-pushed the antctl-cnp-anp branch 3 times, most recently from 3f2fc88 to fd4b1c6 Compare October 6, 2020 20:26

GraysonWu force-pushed the antctl-cnp-anp branch from fd4b1c6 to 5f3926e Compare October 6, 2020 21:16

tnqn reviewed Oct 13, 2020

View reviewed changes

GraysonWu force-pushed the antctl-cnp-anp branch 4 times, most recently from e0819c0 to c5c3c7a Compare October 15, 2020 21:19

tnqn reviewed Oct 16, 2020

View reviewed changes

pkg/antctl/antctl.go Outdated Show resolved Hide resolved

pkg/antctl/command_definition_test.go Outdated Show resolved Hide resolved

pkg/agent/apiserver/handlers/networkpolicy/handler.go Outdated Show resolved Hide resolved

GraysonWu force-pushed the antctl-cnp-anp branch from c5c3c7a to fdc094f Compare October 16, 2020 19:03

GraysonWu force-pushed the antctl-cnp-anp branch 3 times, most recently from cdf8ef2 to b3119c6 Compare October 16, 2020 19:20

tnqn reviewed Oct 21, 2020

View reviewed changes

pkg/agent/apiserver/handlers/networkpolicy/handler.go Outdated Show resolved Hide resolved

pkg/agent/apiserver/handlers/networkpolicy/handler.go Outdated Show resolved Hide resolved

GraysonWu and others added 3 commits October 21, 2020 12:46

Move NetworkPolicyQueryFilter

1ee9163

From pkg/apis/controlplane/v1beta1/types.go To pkg/querier/querier.go

Change struct to pointer

9e15805

Change NetworkPolicyQueryFilter in map or argument from struct to pointer Change -r reference to -T type

GraysonWu force-pushed the antctl-cnp-anp branch from b3119c6 to 9e15805 Compare October 21, 2020 19:56

tnqn approved these changes Oct 22, 2020

View reviewed changes

Dyanngg approved these changes Oct 22, 2020

View reviewed changes

Dyanngg merged commit 2f4f6d5 into antrea-io:master Oct 22, 2020

Dyanngg mentioned this pull request Oct 30, 2020

API change: controlplane v1beta2 #1467

Merged

abhiraut mentioned this pull request Jan 5, 2021

[Antctl]: Support commands to query AntreaPolicy types (CNP/ANP) #927

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Antctl cnp anp support #1301

Antctl cnp anp support #1301

GraysonWu commented Sep 25, 2020 •

edited

Loading

vmwclabot commented Sep 25, 2020

antrea-bot commented Sep 25, 2020

codecov-commenter commented Sep 25, 2020 •

edited

Loading

Dyanngg Sep 25, 2020

GraysonWu Sep 25, 2020

codecov-io commented Oct 6, 2020 •

edited

Loading

tnqn left a comment

tnqn left a comment

tnqn left a comment

tnqn commented Oct 22, 2020

Antctl cnp anp support #1301

Antctl cnp anp support #1301

Conversation

GraysonWu commented Sep 25, 2020 • edited Loading

vmwclabot commented Sep 25, 2020

antrea-bot commented Sep 25, 2020

codecov-commenter commented Sep 25, 2020 • edited Loading

Codecov Report

Dyanngg Sep 25, 2020

Choose a reason for hiding this comment

GraysonWu Sep 25, 2020

Choose a reason for hiding this comment

codecov-io commented Oct 6, 2020 • edited Loading

Codecov Report

tnqn left a comment

Choose a reason for hiding this comment

tnqn left a comment

Choose a reason for hiding this comment

tnqn left a comment

Choose a reason for hiding this comment

tnqn commented Oct 22, 2020

GraysonWu commented Sep 25, 2020 •

edited

Loading

codecov-commenter commented Sep 25, 2020 •

edited

Loading

codecov-io commented Oct 6, 2020 •

edited

Loading