Merge branch '4.14'

Daan Hoogland · Daan Hoogland · commit 79e46f50cabf · 2020-11-13T13:25:07.000Z
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
@@ -2671,7 +2671,7 @@ protected URI encodeVlanIdIntoBroadcastUri(String vlanId, PhysicalNetwork pNtwk)
             throw new InvalidParameterValueException(String.format("Failed to encode VLAN/VXLAN %s into a Broadcast URI. Physical Network cannot be null.", vlanId));
         }
 
-        if(StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {
+        if(!pNtwk.getIsolationMethods().isEmpty() && StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {
             String isolationMethod = pNtwk.getIsolationMethods().get(0).toLowerCase();
             String vxlan = BroadcastDomainType.Vxlan.toString().toLowerCase();
             if(isolationMethod.equals(vxlan)) {

Original file line number	Diff line number	Diff line change
`@@ -2671,7 +2671,7 @@ protected URI encodeVlanIdIntoBroadcastUri(String vlanId, PhysicalNetwork pNtwk)`
`2671`	`2671`	`throw new InvalidParameterValueException(String.format("Failed to encode VLAN/VXLAN %s into a Broadcast URI. Physical Network cannot be null.", vlanId));`
`2672`	`2672`	`}`
`2673`	`2673`
`2674`		`- if(StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {`
	`2674`	`+ if(!pNtwk.getIsolationMethods().isEmpty() && StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {`
`2675`	`2675`	`String isolationMethod = pNtwk.getIsolationMethods().get(0).toLowerCase();`
`2676`	`2676`	`String vxlan = BroadcastDomainType.Vxlan.toString().toLowerCase();`
`2677`	`2677`	`if(isolationMethod.equals(vxlan)) {`