From ec4d83da4df78c48e7065a912b724ef389708068 Mon Sep 17 00:00:00 2001
From: Spaceman1984 <49917670+Spaceman1984@users.noreply.github.com>
Date: Tue, 12 Jan 2021 09:53:16 +0200
Subject: [PATCH] vmware: Fixed instance creation failure on dvswitch when
 using vlan id 4095 (#4557)

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 7826bb136a8..c43395d6b20 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 class HypervisorHostHelper {
     }
 
     public static VmwareDistributedVirtualSwitchVlanSpec createDVPortVlanSpec(Integer vlanId, String vlanRange) {
+        if (vlanId != null && 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();