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.

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

[Windows] Add enhancement in the script Clean-AntreaNetwork.ps1 #2550

Merged
merged 1 commit into from
Aug 25, 2021

Conversation

wenyingd
Copy link
Contributor

@wenyingd wenyingd commented Aug 6, 2021

[Windows] Add enhancement in the script Clean-AntreaNetwork.ps1

  1. Reset ovs-vswitchd service if it is broken.
  2. Remove NetworkAdapterBinding on the physical network adapter if exists,
    to ensure Windows IP address to come back.

Signed-off-by: wenyingd wenyingd@vmware.com

@wenyingd wenyingd requested a review from lzhecheng August 6, 2021 02:51
@codecov-commenter
Copy link

codecov-commenter commented Aug 6, 2021

Codecov Report

Merging #2550 (b2e4a9f) into main (2626ad0) will increase coverage by 0.04%.
The diff coverage is n/a.

Impacted file tree graph

@@            Coverage Diff             @@
##             main    #2550      +/-   ##
==========================================
+ Coverage   60.70%   60.74%   +0.04%     
==========================================
  Files         286      286              
  Lines       23096    23096              
==========================================
+ Hits        14020    14030      +10     
+ Misses       7598     7591       -7     
+ Partials     1478     1475       -3     
Flag Coverage Δ
kind-e2e-tests 47.76% <ø> (-0.02%) ⬇️
unit-tests 41.42% <ø> (+0.01%) ⬆️

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

Impacted Files Coverage Δ
...gent/controller/noderoute/node_route_controller.go 57.60% <0.00%> (-0.33%) ⬇️
pkg/agent/route/route_linux.go 44.68% <0.00%> (+0.26%) ⬆️
pkg/controller/networkpolicy/status_controller.go 77.12% <0.00%> (+3.92%) ⬆️
pkg/apiserver/handlers/endpoint/handler.go 70.58% <0.00%> (+11.76%) ⬆️
pkg/ipfix/ipfix_process.go 100.00% <0.00%> (+18.18%) ⬆️

@wenyingd wenyingd force-pushed the windows_bug_2808103 branch 3 times, most recently from 4326a7e to 14ef49f Compare August 16, 2021 13:20
@wenyingd
Copy link
Contributor Author

/skip-all

@wenyingd
Copy link
Contributor Author

/skip-ipv6-all
/skip-ipv6-only-all
/skip-hw-offload

@wenyingd
Copy link
Contributor Author

/test-ipv6-e2e
/test-ipv6-only-e2e

@wenyingd
Copy link
Contributor Author

/skip-all
/skip-ipv6-all
/skip-ipv6-only-all

@wenyingd wenyingd requested a review from jianjuns August 20, 2021 13:55
hack/windows/Clean-AntreaNetwork.ps1 Outdated Show resolved Hide resolved
hack/windows/Clean-AntreaNetwork.ps1 Outdated Show resolved Hide resolved
hack/windows/Clean-AntreaNetwork.ps1 Show resolved Hide resolved
@wenyingd wenyingd force-pushed the windows_bug_2808103 branch 2 times, most recently from b40b59b to fa12d03 Compare August 23, 2021 01:31
@wenyingd wenyingd requested a review from jianjuns August 23, 2021 02:48
@wenyingd
Copy link
Contributor Author

/skip-all
/skip-ipv6-all
/skip-ipv6-only-all

hack/windows/Clean-AntreaNetwork.ps1 Outdated Show resolved Hide resolved
hack/windows/Clean-AntreaNetwork.ps1 Outdated Show resolved Hide resolved
stop-service ovsdb-server

# $OVSInstallDir is where OVS is installed. It is the path argument when using Install-OVS.ps1.
$OVSInstallDir="C:\openvswitch"
Copy link
Contributor

Choose a reason for hiding this comment

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

Better to define these paths at the beginning of the file, so users can find them easier?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Sure, updated.

@wenyingd
Copy link
Contributor Author

/skip-ipv6-all
/skip-ipv6-only-all
/skip-hw-offload

@wenyingd
Copy link
Contributor Author

/skip-all

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.

LGTM.

tnqn
tnqn previously approved these changes Aug 25, 2021
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

Remove Hyper-V binding on the network adapter which is used as OVS uplink,
otherwise the adapter is not possible to recover IP address after HNSNetwork
cleanup.

Signed-off-by: wenyingd <wenyingd@vmware.com>
@wenyingd
Copy link
Contributor Author

/skip-all
/skip-ipv6-all
/skip-ipv6-only-all

@wenyingd
Copy link
Contributor Author

/skip-hw-offload

Copy link
Contributor

@lzhecheng lzhecheng left a comment

Choose a reason for hiding this comment

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

LGTM

@wenyingd wenyingd requested a review from tnqn August 25, 2021 04:35
@tnqn tnqn merged commit 1829d3a into antrea-io:main Aug 25, 2021
@wenyingd wenyingd deleted the windows_bug_2808103 branch October 8, 2021 14:06
antoninbas pushed a commit that referenced this pull request Oct 20, 2022
…#2550)

Remove Hyper-V binding on the network adapter which is used as OVS uplink,
otherwise the adapter is not possible to recover IP address after HNSNetwork
cleanup.

Signed-off-by: wenyingd <wenyingd@vmware.com>
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants