[KVM] Enable PVLAN support on L2 networks by davidjumani · Pull Request #4040 · apache/cloudstack

davidjumani · 2020-04-21T11:23:59Z

Description

This is an extention of #3732 for kvm.
This is restricted to ovs > 2.9.2
Since Xen uses ovs 2.6, pvlan is unsupported.
This also fixes issues of vms on the same pvlan unable to communicate if they're on the same host

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)

How Has This Been Tested?

Create L2 network selecting a VLAN ID and secondary VLAN ID as well as the PVLAN type. The connectivity is as expected

DaanHoogland · 2020-04-29T07:44:18Z

+                s_logger.info("Programmed pvlan for vm with mac " + vmMac);
            }
-        } catch (final LibvirtException e) {
+        } catch (final Exception e) {


no pokemon catch-um-all

DaanHoogland · 2020-05-05T06:58:40Z

@blueorangutan test

blueorangutan · 2020-05-05T06:59:29Z

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

DaanHoogland

good code! some questions : why is a test removed and why do we need a separate hypervisor specific script . Can't the script determine the host type and run based on that?

DaanHoogland · 2020-05-05T12:56:41Z


-    @SuppressWarnings("unchecked")
-    @Test
-    public void testPvlanSetupCommandDhcpException() {


why is this test no longer sensible?

Since the old way used to call the libvirt library, it could potentially throw a LibvirtException. Now that it doesn't, theres no need to catch or test whether the exception has occoured

DaanHoogland · 2020-05-05T12:57:50Z

+  exit 2
+}
+
+echo "/usr/share/cloudstack-common/scripts/vm/network/ovs-pvlan-kvm-dhcp-host.sh $@ " >> /tmp/pvlan


or `echo "$0 $@ " >>/tmp/pvlan' ?

Removed! Was there just for logging

DaanHoogland · 2020-05-05T12:58:28Z

+  exit 2
+}
+
+echo "/usr/share/cloudstack-common/scripts/vm/network/ovs-pvlan-kvm-vm.sh $@ " >> /tmp/pvlan


And the reason we need hypervisor-specific code is that on KVM, we need OVS > 2.9.2 whereas, on Xen, it comes bundled with 2.6. I've left the existing functionality on Xen but enhanced KVM to support community pvlans also which uses features only available in OVS > 2.9.2. Having two separate codes makes it easier to separate out and debug any issues

blueorangutan · 2020-05-05T17:24:37Z

Trillian test result (tid-1504)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 35558 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4040-t1504-kvm-centos7.zip
Smoke tests completed. 83 look OK, 0 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File

blueorangutan · 2020-08-17T09:23:21Z

Packaging result: ✔centos7 ✔debian. JID-1768

davidjumani · 2020-08-17T13:03:23Z

@blueorangutan package

blueorangutan · 2020-08-17T13:03:56Z

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

blueorangutan · 2020-08-17T13:47:27Z

Packaging result: ✔centos7 ✔debian. JID-1771

davidjumani · 2020-08-17T14:02:04Z

@blueorangutan test

blueorangutan · 2020-08-17T14:02:56Z

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

blueorangutan · 2020-08-18T03:38:18Z

Trillian test result (tid-2479)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 46930 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4040-t2479-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_router_nics.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 82 look OK, 3 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_deploy_kubernetes_cluster	`Error`	0.09	test_kubernetes_clusters.py
test_02_deploy_kubernetes_ha_cluster	`Error`	0.04	test_kubernetes_clusters.py
test_04_deploy_and_upgrade_kubernetes_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_05_deploy_and_upgrade_kubernetes_ha_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_06_deploy_and_invalid_upgrade_kubernetes_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_07_deploy_and_scale_kubernetes_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_01_create_redundant_VPC_2tiers_4VMs_4IPs_4PF_ACL	`Error`	895.88	test_vpc_redundant.py
test_04_rvpc_network_garbage_collector_nics	`Error`	3876.57	test_vpc_redundant.py
test_hostha_kvm_host_fencing	`Error`	168.57	test_hostha_kvm.py

davidjumani · 2020-08-19T13:48:31Z

@blueorangutan package

blueorangutan · 2020-08-19T13:49:10Z

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

blueorangutan · 2020-08-19T14:25:35Z

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

davidjumani · 2020-08-19T15:47:54Z

@blueorangutan package

blueorangutan · 2020-08-19T15:49:10Z

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

blueorangutan · 2020-08-19T16:23:51Z

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

davidjumani · 2020-08-19T16:26:24Z

@blueorangutan test

blueorangutan · 2020-08-19T16:27:05Z

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

blueorangutan · 2020-08-20T06:11:15Z

Trillian test result (tid-2518)
Environment: kvm-centos7 (x2), Advanced Networking with Mgmt server 7
Total time taken: 47422 seconds
Marvin logs: https://github.com/blueorangutan/acs-prs/releases/download/trillian/pr4040-t2518-kvm-centos7.zip
Intermittent failure detected: /marvin/tests/smoke/test_kubernetes_clusters.py
Intermittent failure detected: /marvin/tests/smoke/test_vpc_redundant.py
Intermittent failure detected: /marvin/tests/smoke/test_hostha_kvm.py
Smoke tests completed. 83 look OK, 2 have error(s)
Only failed tests results shown below:

Test	Result	Time (s)	Test File
test_01_deploy_kubernetes_cluster	`Error`	0.06	test_kubernetes_clusters.py
test_02_deploy_kubernetes_ha_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_04_deploy_and_upgrade_kubernetes_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_05_deploy_and_upgrade_kubernetes_ha_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_06_deploy_and_invalid_upgrade_kubernetes_cluster	`Error`	0.04	test_kubernetes_clusters.py
test_07_deploy_and_scale_kubernetes_cluster	`Error`	0.03	test_kubernetes_clusters.py
test_hostha_kvm_host_fencing	`Error`	171.26	test_hostha_kvm.py

davidjumani force-pushed the l2-pvlan-kvm-xen branch 4 times, most recently from 9251cf5 to c14dbf6 Compare April 24, 2020 11:20

DaanHoogland reviewed Apr 29, 2020

View reviewed changes

davidjumani force-pushed the l2-pvlan-kvm-xen branch 4 times, most recently from 3ebb743 to 83ac172 Compare May 4, 2020 11:31

davidjumani changed the title ~~Adding l2 pvlan support for vms on kvm and xen~~ Adding l2 pvlan support for vms on kvm May 5, 2020

davidjumani changed the title ~~Adding l2 pvlan support for vms on kvm~~ Adding l2 pvlan support for kvm May 5, 2020

davidjumani changed the title ~~Adding l2 pvlan support for kvm~~ [KVM] Enable PVLAN support on L2 networks May 5, 2020

davidjumani marked this pull request as ready for review May 5, 2020 05:42

apache deleted a comment from blueorangutan May 5, 2020

apache deleted a comment from nvazquez May 5, 2020

apache deleted a comment from blueorangutan May 5, 2020

apache deleted a comment from davidjumani May 5, 2020

apache deleted a comment from blueorangutan May 5, 2020

DaanHoogland reviewed May 5, 2020

View reviewed changes

davidjumani force-pushed the l2-pvlan-kvm-xen branch from 83ac172 to 076d2d7 Compare May 5, 2020 13:06

DaanHoogland approved these changes May 5, 2020

View reviewed changes

svenvogel added the type:bug label May 7, 2020

davidjumani added 4 commits August 17, 2020 14:06

Adding l2 pvlan for kvm

fcda7d1

Fixing shared network pvlan

506645b

Fixing smoke tests to run only if kvm and ovs

910d9f7

Fixing vlan allowed to be created with existing pvlan id

2cc200d

davidjumani force-pushed the l2-pvlan-kvm-xen branch from d7cec39 to 2cc200d Compare August 17, 2020 08:37

davidjumani added 2 commits August 17, 2020 14:11

Adding pvlan rules when nic added or removed

bb5086b

Handle null

5c022f1

Migrating pvlan ovs rules for L2

2c61448

Cleanup rules migration

8c41853

davidjumani changed the title ~~[WIP] [KVM] Enable PVLAN support on L2 networks~~ [KVM] Enable PVLAN support on L2 networks Aug 20, 2020

yadvr merged commit 3872bf1 into apache:master Aug 20, 2020

GabrielBrascher mentioned this pull request Jun 3, 2021

Error when 'createNetwork' with VXLAN: "VLAN requested but URI is not in the expected format" #5071

Closed

DK101010 mentioned this pull request Jul 8, 2021

adapt condition to use the correct letter for pvlan types #5194

Merged

12 tasks

mib1185 mentioned this pull request Jul 13, 2021

Addition to #5194 - update of broadcast_uri for all existing pvlan networks is necessary during upgrade to 4.15.x #5202

Closed

Conversation

davidjumani commented Apr 21, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Description

Types of changes

How Has This Been Tested?

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

DaanHoogland commented May 5, 2020

Uh oh!

blueorangutan commented May 5, 2020

Uh oh!

DaanHoogland left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

davidjumani May 5, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

blueorangutan commented May 5, 2020

Uh oh!

blueorangutan commented Aug 17, 2020

Uh oh!

davidjumani commented Aug 17, 2020

Uh oh!

blueorangutan commented Aug 17, 2020

Uh oh!

blueorangutan commented Aug 17, 2020

Uh oh!

davidjumani commented Aug 17, 2020

Uh oh!

blueorangutan commented Aug 17, 2020

Uh oh!

blueorangutan commented Aug 18, 2020

Uh oh!

davidjumani commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 19, 2020

Uh oh!

davidjumani commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 19, 2020

Uh oh!

davidjumani commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 19, 2020

Uh oh!

blueorangutan commented Aug 20, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

davidjumani commented Apr 21, 2020 •

edited

Loading

davidjumani May 5, 2020 •

edited

Loading