From 0e2f9ae147eb345e71379007c4096902d785e6d3 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Tue, 22 Dec 2020 12:10:48 +0200 Subject: [PATCH 1/2] Fixed instance creation failure on dvswitch when using vlan id 4095 --- .../com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 7826bb136a81..35d8104fb00e 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1073,6 +1073,10 @@ public static VMwareDVSPvlanConfigSpec createDVPortPvlanConfigSpec(int vlanId, i } public static VmwareDistributedVirtualSwitchVlanSpec createDVPortVlanSpec(Integer vlanId, String vlanRange) { + if (vlanId == 4095){ + vlanId = null; + vlanRange = "0-4094"; + } if (vlanId == null && vlanRange != null && !vlanRange.isEmpty()) { s_logger.debug("Creating dvSwitch port vlan-trunk spec with range: " + vlanRange); VmwareDistributedVirtualSwitchTrunkVlanSpec trunkVlanSpec = new VmwareDistributedVirtualSwitchTrunkVlanSpec(); From 1b48ee2d470ae4a95e9adca68bbb9de59024b2f6 Mon Sep 17 00:00:00 2001 From: Darrin Husselmann Date: Tue, 22 Dec 2020 13:13:25 +0200 Subject: [PATCH 2/2] Null pointer --- .../com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java index 35d8104fb00e..c43395d6b20e 100644 --- a/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java +++ b/vmware-base/src/main/java/com/cloud/hypervisor/vmware/mo/HypervisorHostHelper.java @@ -1073,7 +1073,7 @@ public static VMwareDVSPvlanConfigSpec createDVPortPvlanConfigSpec(int vlanId, i } public static VmwareDistributedVirtualSwitchVlanSpec createDVPortVlanSpec(Integer vlanId, String vlanRange) { - if (vlanId == 4095){ + if (vlanId != null && vlanId == 4095){ vlanId = null; vlanRange = "0-4094"; }