Prevent deploying IPv6 network if Zone has no IPv6 DNS configured #4177

GabrielBrascher · 2020-06-24T21:08:39Z

Description

If an IPv6 enabled network is created but the Zone hasn't IPv6 DNS1 or DNS2 configured then dnsmasq inside the Virtual Router does not start.

This PRs adds validation that allows creating an IPv6 network only if the Zone has at least DNS1 or DNS2 configured.

Fixes: #4157

Types of changes

Breaking change (fix or feature that would cause existing functionality to change)
New feature (non-breaking change which adds functionality)
Bug fix (non-breaking change which fixes an issue)
Enhancement (improves an existing feature and functionality)
Cleanup (Code refactoring and cleanup, that may add test cases)

If you have a IPv6 enabled network and you haven't specified the IPv6 DNS 1 and DNS 2 under the zone it causes dnsmasq inside the Virtual Router not to start

Fix logic on checkIp6Parameters

GabrielBrascher · 2020-06-26T12:19:04Z

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -3781,7 +3781,7 @@ public Vlan createVlanAndPublicIpRange(final long zoneId, final long networkId,
            ipv4 = true;
        }

-        if (startIPv6 != null) {
+        if (vlanIp6Cidr != null) {


CloudStack uses SLAAC for managing IPv6 ranges, therefore it is not necessary to have a start/end IPv6 address; on the other hand, IPv6 CIDR is mandatory for IPv6 networks.

That is why I changed this and other pieces of code that had start/end ipv6 address as mandatory.

GabrielBrascher · 2020-06-26T12:22:22Z

server/src/main/java/com/cloud/network/NetworkServiceImpl.java

@@ -1195,7 +1195,7 @@ public Network createGuestNetwork(CreateNetworkCmd cmd) throws InsufficientCapac
        if (startIP != null) {
            ipv4 = true;
        }
-        if (startIPv6 != null) {
+        if (isNotBlank(ip6Cidr) && isNotBlank(ip6Gateway)) {


Due to SLAAC implementation, an IPv6 network needs CIDR and Gateway. With the refactored code a network is "marked" as ipv6 if IPv6 CIDR and Gateway are not null.

GabrielBrascher · 2020-06-26T12:23:18Z

server/src/test/java/com/cloud/network/NetworkModelTest.java

@@ -90,6 +91,11 @@
    private static final long PHYSICAL_NETWORK_1_ID = 1L;
    private static final long PHYSICAL_NETWORK_2_ID = 2L;

+    private static final String IPV6_CIDR = "fd59:16ba:559b:243d::/64";


Nowadays IPv6 networking support only /64 CIDR. Added Unit tests covering this.

GabrielBrascher · 2020-09-24T08:45:57Z

Fixed conflict with the master.

GabrielBrascher · 2020-09-24T08:46:32Z

@blueorangutan package

blueorangutan · 2020-09-24T08:47:18Z

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-09-24T09:20:04Z

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2081

DaanHoogland

code looks good and makes functional sense. are integration tests for this sensible/possible? (not playing down on the importance of the unit tests you created)

server/src/main/java/com/cloud/network/NetworkModelImpl.java

…Utils

GabrielBrascher · 2020-09-28T21:26:13Z

@blueorangutan package

blueorangutan · 2020-09-28T21:27:28Z

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-09-28T21:59:05Z

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2094

DaanHoogland · 2020-10-20T11:20:51Z

@blueorangutan package

blueorangutan · 2020-10-20T11:21:56Z

@DaanHoogland a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-10-20T12:51:20Z

Packaging result: ✖centos7 ✖centos8 ✔debian. JID-2221

DaanHoogland · 2020-10-20T18:26:04Z

@blueorangutan package

Pearl1594

LGTM

server/src/main/java/com/cloud/network/NetworkModelImpl.java

GabrielBrascher · 2020-10-28T15:13:22Z

@DaanHoogland @rhtyd @Pearl1594 @sureshanaparti looking at the codebase for IPv6 there are still a lot of things to improve.

I will leave some of these parts for future PRs as they require testing and so far I made manual tests specifically for the reported issue #4157. This PR is partially improving the IPv6, mostly avoiding some critical deployment failures due to a lack of ipv6 gateway/DNS.

Unfortunately, most of our execution flow regarding IPv6 needs to be refactored, this current PR adds a small contribution on behalf of issue #3569, but mainly focused on fixing #4157.

I can re-run a couple of manual tests just for the sake. For the (near) future, I think that we should have some IPv6 Marvin tests. I can look into contributing with it.

DaanHoogland · 2020-10-28T18:10:45Z

@GabrielBrascher the issue this PR solves is marked for 4.13.2. do you want to have this merged on master anyway?

GabrielBrascher · 2020-10-28T18:43:26Z

@DaanHoogland sounds good. Rebased/cherry-picked respective commits aiming branch 4.13.

GabrielBrascher · 2020-10-28T18:51:38Z

@blueorangutan package

blueorangutan · 2020-10-28T18:52:37Z

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-10-28T19:00:35Z

Packaging result: ✖centos7 ✖centos8 ✖debian. JID-2303

DaanHoogland · 2020-10-28T19:28:07Z

not sure if the ape still knows 4.13 but i think it should
@blueorangutan package

GabrielBrascher · 2020-10-28T19:29:05Z

I am not sure as well. Travis seems to not work. Maybe due to the migration of java 8 to java 11

GabrielBrascher · 2020-10-29T13:19:30Z

@DaanHoogland do you think that it would be better to aim this to 4.15 so we can run tests?

DaanHoogland · 2020-10-29T15:11:46Z

@GabrielBrascher you can go for 4.14 as well (or just master)

GabrielBrascher · 2020-10-29T16:47:14Z

@blueorangutan package

blueorangutan · 2020-10-29T16:48:39Z

@GabrielBrascher a Jenkins job has been kicked to build packages. I'll keep you posted as I make progress.

blueorangutan · 2020-10-29T17:31:31Z

Packaging result: ✔centos7 ✔centos8 ✔debian. JID-2311

DaanHoogland · 2020-10-29T18:22:14Z

@blueorangutan test

blueorangutan · 2020-10-29T18:23:52Z

@DaanHoogland a Trillian-Jenkins test job (centos7 mgmt + kvm-centos7) has been kicked to run smoke tests

blueorangutan · 2020-10-30T04:37:23Z

Trillian test result (tid-3107)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 34725 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4177-t3107-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vm_snapshots.py
Smoke tests completed. 85 look OK, 1 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_03_deploy_and_upgrade_kubernetes_cluster	`Failure`	249.52	test_kubernetes_clusters.py

…ache#4177)

GabrielBrascher added the component:ipv6 label Jun 24, 2020

GabrielBrascher added this to the 4.15.0.0 milestone Jun 24, 2020

GabrielBrascher self-assigned this Jun 24, 2020

Deploy ipv6 network if zone has IPv6 DNS

ce658ac

If you have a IPv6 enabled network and you haven't specified the IPv6 DNS 1 and DNS 2 under the zone it causes dnsmasq inside the Virtual Router not to start

GabrielBrascher force-pushed the validate-ipv6-network branch from 84a0250 to ce658ac Compare June 25, 2020 18:13

GabrielBrascher marked this pull request as ready for review June 25, 2020 18:14

GabrielBrascher added the status:work-in-progress label Jun 26, 2020

Add test case for networkModel.checkIp6Parameters

e060158

Fix logic on checkIp6Parameters

GabrielBrascher force-pushed the validate-ipv6-network branch from 362c064 to e060158 Compare June 26, 2020 05:00

GabrielBrascher changed the title ~~Prevent deploying IPv6 network if Zone has no IPv6 DNS configured~~ [WIP] Prevent deploying IPv6 network if Zone has no IPv6 DNS configured Jun 26, 2020

GabrielBrascher commented Jun 26, 2020

View reviewed changes

GabrielBrascher changed the title ~~[WIP] Prevent deploying IPv6 network if Zone has no IPv6 DNS configured~~ Prevent deploying IPv6 network if Zone has no IPv6 DNS configured Jun 26, 2020

GabrielBrascher removed the status:work-in-progress label Jun 26, 2020

svenvogel added type:bug type:enhancement component:virtual-router labels Jul 6, 2020

Merge branch 'master' into validate-ipv6-network

1898b2f

DaanHoogland reviewed Sep 25, 2020

View reviewed changes

server/src/main/java/com/cloud/network/NetworkModelImpl.java Outdated Show resolved Hide resolved

Use CloudStack StringUtils instead of org.apache.commons.lang3.String…

b66843e

…Utils

Pearl1594 approved these changes Oct 28, 2020

View reviewed changes

sureshanaparti reviewed Oct 28, 2020

View reviewed changes

server/src/main/java/com/cloud/network/NetworkModelImpl.java Outdated Show resolved Hide resolved

Enhance log message on checkIp6Parameters

c52730d

DaanHoogland approved these changes Oct 28, 2020

View reviewed changes

GabrielBrascher force-pushed the validate-ipv6-network branch from c52730d to ee923d8 Compare October 28, 2020 18:42

GabrielBrascher changed the base branch from master to 4.13 October 28, 2020 18:43

GabrielBrascher force-pushed the validate-ipv6-network branch from ee923d8 to c52730d Compare October 29, 2020 16:45

GabrielBrascher changed the base branch from 4.13 to master October 29, 2020 16:46

DaanHoogland merged commit 6f559d2 into apache:master Oct 30, 2020

Pearl1594 pushed a commit to shapeblue/cloudstack that referenced this pull request Nov 4, 2020

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured (ap…

e75e376

…ache#4177)

Pearl1594 pushed a commit to shapeblue/cloudstack that referenced this pull request Nov 4, 2020

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured (ap…

9270205

…ache#4177)

PaulAngus removed the type:enhancement label Nov 8, 2020

DaanHoogland added the Severity:Major label Nov 10, 2020

GabrielBrascher mentioned this pull request Aug 10, 2021

IPv6 code cleanup #3569

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured #4177

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured #4177

GabrielBrascher commented Jun 24, 2020 •

edited by PaulAngus

Loading

GabrielBrascher Jun 26, 2020 •

edited

Loading

GabrielBrascher Jun 26, 2020

GabrielBrascher Jun 26, 2020

GabrielBrascher commented Sep 24, 2020

GabrielBrascher commented Sep 24, 2020

blueorangutan commented Sep 24, 2020

blueorangutan commented Sep 24, 2020

DaanHoogland left a comment

GabrielBrascher commented Sep 28, 2020

blueorangutan commented Sep 28, 2020

blueorangutan commented Sep 28, 2020

DaanHoogland commented Oct 20, 2020

blueorangutan commented Oct 20, 2020

blueorangutan commented Oct 20, 2020

DaanHoogland commented Oct 20, 2020

Pearl1594 left a comment

GabrielBrascher commented Oct 28, 2020

DaanHoogland commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

blueorangutan commented Oct 28, 2020

blueorangutan commented Oct 28, 2020

DaanHoogland commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

GabrielBrascher commented Oct 29, 2020

DaanHoogland commented Oct 29, 2020

GabrielBrascher commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

DaanHoogland commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

blueorangutan commented Oct 30, 2020

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured #4177

Prevent deploying IPv6 network if Zone has no IPv6 DNS configured #4177

Conversation

GabrielBrascher commented Jun 24, 2020 • edited by PaulAngus Loading

Description

Types of changes

GabrielBrascher Jun 26, 2020 • edited Loading

Choose a reason for hiding this comment

GabrielBrascher Jun 26, 2020

Choose a reason for hiding this comment

GabrielBrascher Jun 26, 2020

Choose a reason for hiding this comment

GabrielBrascher commented Sep 24, 2020

GabrielBrascher commented Sep 24, 2020

blueorangutan commented Sep 24, 2020

blueorangutan commented Sep 24, 2020

DaanHoogland left a comment

Choose a reason for hiding this comment

GabrielBrascher commented Sep 28, 2020

blueorangutan commented Sep 28, 2020

blueorangutan commented Sep 28, 2020

DaanHoogland commented Oct 20, 2020

blueorangutan commented Oct 20, 2020

blueorangutan commented Oct 20, 2020

DaanHoogland commented Oct 20, 2020

Pearl1594 left a comment

Choose a reason for hiding this comment

GabrielBrascher commented Oct 28, 2020

DaanHoogland commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

blueorangutan commented Oct 28, 2020

blueorangutan commented Oct 28, 2020

DaanHoogland commented Oct 28, 2020

GabrielBrascher commented Oct 28, 2020

GabrielBrascher commented Oct 29, 2020

DaanHoogland commented Oct 29, 2020

GabrielBrascher commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

DaanHoogland commented Oct 29, 2020

blueorangutan commented Oct 29, 2020

blueorangutan commented Oct 30, 2020

GabrielBrascher commented Jun 24, 2020 •

edited by PaulAngus

Loading

GabrielBrascher Jun 26, 2020 •

edited

Loading