Skip to content

Merge ipv6 support #13

Merged
stormi merged 12 commits into10.10.5-8.3from
mrge-ipv6
Jun 13, 2023
Merged

Merge ipv6 support #13
stormi merged 12 commits into10.10.5-8.3from
mrge-ipv6

Conversation

@benjamreis
Copy link
Copy Markdown

@benjamreis benjamreis commented May 11, 2023

No description provided.

@benjamreis benjamreis requested a review from stormi May 11, 2023 12:59
@benjamreis
Copy link
Copy Markdown
Author

benjamreis commented May 11, 2023

xenserver#2

@stormi stormi requested a review from ydirson May 11, 2023 15:36
@stormi stormi changed the title Merge ipv6 Merge ipv6 support May 11, 2023
@stormi
Copy link
Copy Markdown
Member

stormi commented May 11, 2023 •
edited
Loading

Looks good. As discussed, let's not create a merge commit when merging this PR. Fast-forward with git directly instead. Not true anymore

ydirson
ydirson requested changes May 12, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@ydirson ydirson left a comment

Choose a reason for hiding this comment

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

My first pass is limited to backend and netinterface.

As a more general note, I remember we previously talked about writeDebStyleInterface(), which looks like dead code. This PR makes it even more useless by leaving it only supporting IPv4, so I think it should first be removed in a preparatory commit.

Comment thread backend.py
Comment thread backend.py
Comment thread netinterface.py
Comment thread netinterface.py Outdated
Comment thread netinterface.py Outdated
Comment thread netinterface.py Outdated
Comment thread netinterface.py Outdated
Comment thread netinterface.py
Comment thread netinterface.py Outdated
Comment thread netinterface.py
@benjamreis benjamreis force-pushed the mrge-ipv6 branch 8 times, most recently from 2a4fa57 to 8f187a3 Compare June 5, 2023 12:08
@benjamreis benjamreis requested review from stormi and ydirson June 7, 2023 09:10
@stormi
Copy link
Copy Markdown
Member

stormi commented Jun 7, 2023

Looks like all the commits are on top of origin/10.10.5-8.3. Shouldn't there be a merge commit somewhere so that we can then fast-forward this branch to 10.10.5-8.3 as planned initially?
image

ydirson
ydirson reviewed Jun 7, 2023
View reviewed changes
Copy link
Copy Markdown
Collaborator

@ydirson ydirson left a comment

Choose a reason for hiding this comment

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

Lots of little remarks (mostly) targeted to upstreaming branch

Comment thread backend.py
Comment thread netutil.py
Comment thread netinterface.py
Comment thread tui/network.py
Comment thread tui/network.py
Comment thread tui/network.py Outdated
Comment thread tui/network.py
Comment thread netinterface.py Outdated
Comment thread netinterface.py Outdated
Comment thread netutil.py
benjamreis added 8 commits June 8, 2023 10:25
@benjamreis
Write manual_nameservers and domain for IPv6 too
a42c2f2 
Both fields are used for the 2 IP families and were writen in
an IPv4 specific block.

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
NetInterface inherits from Object
a9c8105 
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Add NetInterfaceV6 to init an IPv6 interface
ca7dfab 
Inherits from `NetInterface` to mutualize the code

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
isStatic helpers by IP family
611cb24 
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Use socket.inet_pton to validate IP
f13f185 
Add family specific validator as well

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Take IPv6 addresses into account to determine an interface is up
430ea79 
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Enable IPv6 in the host when it is configured
1c63772 
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Write IPv6 conf files for the installer
24268a2 
Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis benjamreis mentioned this pull request Jun 8, 2023
Closed
benjamreis added 4 commits June 8, 2023 15:26
@benjamreis
Configure IPv6 in TUI
0fa71e2 
Add a screen to choose to configure IPv4, IPv6 or both
Display the interface screen for IPv4 and/or IPv6

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
waitUntilUp also wait for IPv6 if statically configured
9e9c300 
Need to add `ndisc6` to the install.img

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Hide dynamic buttons in tui when in static mode
806cfe0 
Add `isDynamic` helper to `NetInterface`

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@benjamreis
Keep IPv6 enablement/disablement upon upgrades
a469a6b 
Add `etc/sysctl.d/91-net-ipv6.conf` in the restore list

Signed-off-by: BenjiReis <benjamin.reis@vates.fr>
@stormi stormi requested a review from ydirson June 13, 2023 09:51
@stormi
Copy link
Copy Markdown
Member

stormi commented Jun 13, 2023

We merge this current state for the next alpha/beta release of XCP-ng 8.3, and will continue improving the upstream PR to take the last non-blocking comments into account.

@stormi stormi merged commit 248f58b into 10.10.5-8.3 Jun 13, 2023
@benjamreis benjamreis deleted the mrge-ipv6 branch June 14, 2023 09:13
ydirson pushed a commit that referenced this pull request Sep 26, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
869704c 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Sep 27, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
74d58cb 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Sep 28, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
5235df1 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Sep 28, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
b146509 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Sep 29, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
ed464ac 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Dec 15, 2023
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
2d1d468 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Apr 18, 2024
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
d4a0f1b 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Apr 19, 2024
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
343c639 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Apr 19, 2024
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
3ad4988 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Apr 19, 2024
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
321d5b1 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Jul 2, 2024
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
add6c45 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Mar 11, 2025
@stormi @ydirson
Merge pull request #13 from xcp-ng/mrge-ipv6
c464a67 
Merge ipv6 support
ydirson pushed a commit that referenced this pull request Mar 19, 2025
@stormi @ydirson
Merge pull request #13 from ipv6
a5bfb86 
IPv6 support
ydirson added a commit that referenced this pull request Apr 2, 2025
@ydirson
fixup! Merge pull request #13 from ipv6
0cedbac
ydirson added a commit that referenced this pull request Apr 2, 2025
@ydirson
fixup! Merge pull request #13 from ipv6
3cad311
ydirson added a commit that referenced this pull request Apr 2, 2025
@ydirson
fixup! Merge pull request #13 from ipv6
761a65e
ydirson pushed a commit that referenced this pull request Apr 3, 2025
@stormi @ydirson
Merge pull request #13 from ipv6
d536987 
IPv6 support
ydirson pushed a commit that referenced this pull request May 5, 2025
@stormi @ydirson
Merge pull request #13 from ipv6
f4a3d9f 
IPv6 support
ydirson pushed a commit that referenced this pull request May 5, 2025
@stormi @ydirson
Merge pull request #13 from ipv6
2f2e5ac 
IPv6 support
ydirson pushed a commit that referenced this pull request May 5, 2025
@stormi @ydirson
Merge pull request #13 from ipv6
1772cf3 
IPv6 support
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@stormi stormi stormi approved these changes

@ydirson ydirson Awaiting requested review from ydirson

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@benjamreis @stormi @ydirson