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

Change to use PacketIn2/Controller2 #4768

Merged
merged 3 commits into from
May 17, 2023
Merged

Change to use PacketIn2/Controller2 #4768

merged 3 commits into from
May 17, 2023

Conversation

GraysonWu
Copy link
Contributor

@GraysonWu GraysonWu commented Mar 28, 2023 •
edited
Loading

This commit replaces the use of packetIn and controller with
packetIn2 and controller2, respectively. It also replaces the use of
the 'reason' with the 'userdata' to distribute packetIn2 to the
handler. Additionally, it replaces the use of 'customreason'
with 'userdata' to indicate what operations are needed for the
handler when there is a chance that multiple operations are required
for a single packetIn2.

Furthermore, this commit introduces a change to use 'pause'+resume
for FQDN policy.

This commit upgrades ofnet to v0.7.1 and libOpenflow to v0.10.1, where
the packetIn2/controller2 support was added.

Signed-off-by: graysonwu wgrayson@vmware.com

@GraysonWu GraysonWu force-pushed the packetin2 branch 4 times, most recently from 66109c9 to b755b34 Compare March 29, 2023 17:17
@GraysonWu GraysonWu changed the title [WIP]Change to use PacketIn2/Controller2 Change to use PacketIn2/Controller2 Mar 29, 2023
@GraysonWu
Copy link
Contributor Author

Will update go.mod after antrea-io/ofnet#49 merged.

wenyingd
wenyingd reviewed Apr 6, 2023
View reviewed changes
pkg/agent/controller/networkpolicy/audit_logging_test.go Show resolved Hide resolved
pkg/agent/controller/networkpolicy/packetin.go Outdated Show resolved Hide resolved
pkg/agent/controller/networkpolicy/packetin.go Show resolved Hide resolved
pkg/agent/controller/traceflow/packetin_test.go Show resolved Hide resolved
pkg/agent/multicast/mcast_controller_test.go Show resolved Hide resolved
pkg/agent/openflow/client.go Show resolved Hide resolved
pkg/agent/openflow/pipeline.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/pipeline.go Outdated Show resolved Hide resolved
@GraysonWu GraysonWu force-pushed the packetin2 branch 2 times, most recently from c870b0e to fa12102 Compare April 6, 2023 20:25
wenyingd
wenyingd reviewed Apr 10, 2023
View reviewed changes
pkg/agent/controller/networkpolicy/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
@GraysonWu GraysonWu force-pushed the packetin2 branch 2 times, most recently from 45eccb6 to 384e74e Compare April 11, 2023 17:15
@GraysonWu
Copy link
Contributor Author

/test-all

wenyingd
wenyingd reviewed Apr 12, 2023
View reviewed changes
Copy link
Contributor

@wenyingd wenyingd left a comment

Choose a reason for hiding this comment

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

Code change looks good to me, please pay attention on the UT coverage of this change.

@GraysonWu GraysonWu force-pushed the packetin2 branch 10 times, most recently from 65ba7a1 to 9ad64c6 Compare April 20, 2023 05:37
@GraysonWu
Copy link
Contributor Author

/test-all

wenyingd
wenyingd reviewed Apr 23, 2023
View reviewed changes
pkg/agent/openflow/packetin_test.go Outdated Show resolved Hide resolved
pkg/agent/openflow/pipeline.go Show resolved Hide resolved
pkg/ovs/openflow/ofctrl_bridge_test.go Outdated Show resolved Hide resolved
luolanzone
luolanzone reviewed May 12, 2023
View reviewed changes
Copy link
Contributor

@luolanzone luolanzone left a comment

Choose a reason for hiding this comment

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

LGTM overall, one nit.

go.mod Show resolved Hide resolved
tnqn
tnqn reviewed May 12, 2023
View reviewed changes
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM overall

pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/pipeline.go Show resolved Hide resolved
pkg/ovs/openflow/ofctrl_action.go Show resolved Hide resolved
pkg/ovs/openflow/ofctrl_bridge.go Outdated Show resolved Hide resolved
jianjuns
jianjuns reviewed May 12, 2023
View reviewed changes
Copy link
Contributor

@jianjuns jianjuns left a comment

Choose a reason for hiding this comment

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

In the commit message, do not use "this PR", but "this commit".

Please pay attention to basic grammar mistakes.

pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/agent/openflow/packetin.go Outdated Show resolved Hide resolved
pkg/ovs/openflow/ofctrl_action.go Outdated Show resolved Hide resolved
@GraysonWu GraysonWu force-pushed the packetin2 branch 2 times, most recently from 86ceb8c to df8fa95 Compare May 13, 2023 00:06
@GraysonWu GraysonWu requested a review from tnqn May 13, 2023 00:06
hongliangl
hongliangl reviewed May 15, 2023
View reviewed changes
pkg/agent/openflow/fields.go Outdated Show resolved Hide resolved
pkg/agent/openflow/pipeline.go Outdated Show resolved Hide resolved
pkg/agent/openflow/fields.go Outdated Show resolved Hide resolved
@GraysonWu GraysonWu force-pushed the packetin2 branch 2 times, most recently from 060eb54 to 68c2f1c Compare May 15, 2023 16:45
@GraysonWu GraysonWu requested review from hongliangl and tnqn May 15, 2023 17:14
@GraysonWu
Copy link
Contributor Author

/test-all

@GraysonWu
Copy link
Contributor Author

/test-conformance

@GraysonWu
Refactor to use packetIn2/controller2
4574725 
This commit replaces the use of packetIn and controller with
packetIn2 and controller2, respectively. It also replaces the use of
the 'reason' with the 'userdata' to distribute packetIn2 to the
handler. Additionally, it replaces the use of 'customreason'
with 'userdata' to indicate what operations are needed for the
handler, when there is a chance that multiple operations are required
for a single packetIn2.

Furthermore, this commit introduces a change to use 'pause'+`resume`
for FQDN policy.

This commit upgrades ofnet to v0.7.1 and libOpenflow to v0.10.1, where
the packetIn2/controller2 support were added.

Signed-off-by: graysonwu <wgrayson@vmware.com>
@GraysonWu
Address comments
56212eb 
Signed-off-by: graysonwu <wgrayson@vmware.com>
@GraysonWu
Address comments 2
4005406 
Signed-off-by: graysonwu <wgrayson@vmware.com>
@GraysonWu
Copy link
Contributor Author

/test-all

@GraysonWu
Copy link
Contributor Author

/test-e2e

tnqn
tnqn approved these changes May 16, 2023
View reviewed changes
Copy link
Member

@tnqn tnqn left a comment

Choose a reason for hiding this comment

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

LGTM

@tnqn tnqn added the action/release-note Indicates a PR that should be included in release notes. label May 17, 2023
@tnqn tnqn merged commit 7f459d7 into antrea-io:main May 17, 2023
ceclinux pushed a commit to ceclinux/antrea that referenced this pull request May 17, 2023
@GraysonWu @ceclinux
Change to use PacketIn2/Controller2 (antrea-io#4768)
4c82138 
This commit replaces the use of packetIn and controller with
packetIn2 and controller2, respectively. It also replaces the use of
the 'reason' with the 'userdata' to distribute packetIn2 to the
handler. Additionally, it replaces the use of 'customreason'
with 'userdata' to indicate what operations are needed for the
handler, when there is a chance that multiple operations are required
for a single packetIn2.

Furthermore, this commit introduces a change to use 'pause'+`resume`
for FQDN policy.

This commit upgrades ofnet to v0.7.1 and libOpenflow to v0.10.1, where
the packetIn2/controller2 support were added.

Signed-off-by: graysonwu <wgrayson@vmware.com>
ceclinux pushed a commit to ceclinux/antrea that referenced this pull request May 17, 2023
@GraysonWu @ceclinux
Change to use PacketIn2/Controller2 (antrea-io#4768)
1abf784 
This commit replaces the use of packetIn and controller with
packetIn2 and controller2, respectively. It also replaces the use of
the 'reason' with the 'userdata' to distribute packetIn2 to the
handler. Additionally, it replaces the use of 'customreason'
with 'userdata' to indicate what operations are needed for the
handler, when there is a chance that multiple operations are required
for a single packetIn2.

Furthermore, this commit introduces a change to use 'pause'+`resume`
for FQDN policy.

This commit upgrades ofnet to v0.7.1 and libOpenflow to v0.10.1, where
the packetIn2/controller2 support were added.

Signed-off-by: graysonwu <wgrayson@vmware.com>
ceclinux added a commit to ceclinux/antrea that referenced this pull request May 18, 2023
@ceclinux
Revert "Change to use PacketIn2/Controller2 (antrea-io#4768)"
654a8ae 
This reverts commit 7f459d7.
ceclinux added a commit to ceclinux/antrea that referenced this pull request May 18, 2023
@ceclinux
Revert "Change to use PacketIn2/Controller2 (antrea-io#4768)"
950b677 
This reverts commit 7f459d7.
ceclinux pushed a commit to ceclinux/antrea that referenced this pull request Jun 5, 2023
@GraysonWu @ceclinux
Change to use PacketIn2/Controller2 (antrea-io#4768)
d906c30 
This commit replaces the use of packetIn and controller with
packetIn2 and controller2, respectively. It also replaces the use of
the 'reason' with the 'userdata' to distribute packetIn2 to the
handler. Additionally, it replaces the use of 'customreason'
with 'userdata' to indicate what operations are needed for the
handler, when there is a chance that multiple operations are required
for a single packetIn2.

Furthermore, this commit introduces a change to use 'pause'+`resume`
for FQDN policy.

This commit upgrades ofnet to v0.7.1 and libOpenflow to v0.10.1, where
the packetIn2/controller2 support were added.

Signed-off-by: graysonwu <wgrayson@vmware.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jianjuns jianjuns jianjuns left review comments

@luolanzone luolanzone luolanzone left review comments

@tnqn tnqn tnqn approved these changes

@wenyingd wenyingd wenyingd left review comments

@ceclinux ceclinux Awaiting requested review from ceclinux

@hongliangl hongliangl Awaiting requested review from hongliangl

Assignees
No one assigned
Labels
action/release-note Indicates a PR that should be included in release notes. area/ovs/openflow Issues or PRs related to Open vSwitch Open Flow. kind/cleanup Categorizes issue or PR as related to cleaning up code, process, or technical debt.
Projects
None yet
Milestone
Antrea v1.12 release
Development

Successfully merging this pull request may close these issues.
7 participants
@GraysonWu @wenyingd @tnqn @jianjuns @hongliangl @luolanzone @vicky-liu