Merge branch '4.13' into 4.14

Daan Hoogland · Daan Hoogland · commit db3c12d6cf37 · 2020-11-13T13:24:39.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
@@ -2532,7 +2532,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
`@@ -2532,7 +2532,7 @@ protected URI encodeVlanIdIntoBroadcastUri(String vlanId, PhysicalNetwork pNtwk)`
`2532`	`2532`	`throw new InvalidParameterValueException(String.format("Failed to encode VLAN/VXLAN %s into a Broadcast URI. Physical Network cannot be null.", vlanId));`
`2533`	`2533`	`}`
`2534`	`2534`
`2535`		`- if(StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {`
	`2535`	`+ if(!pNtwk.getIsolationMethods().isEmpty() && StringUtils.isNotBlank(pNtwk.getIsolationMethods().get(0))) {`
`2536`	`2536`	`String isolationMethod = pNtwk.getIsolationMethods().get(0).toLowerCase();`
`2537`	`2537`	`String vxlan = BroadcastDomainType.Vxlan.toString().toLowerCase();`
`2538`	`2538`	`if(isolationMethod.equals(vxlan)) {`