From 3ee563905d2ef8f5361370b5c0ab32b0b69e7068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gabriel=20Beims=20Br=C3=A4scher?= <gabriel@apache.org>
Date: Sat, 5 Jun 2021 13:55:01 -0300
Subject: [PATCH 1/2] kvm: Check for VLAN or VXLAN in
 NetworkDaoImpl.listByPhysicalNetworkPvlan (#5074)

This PR fixes #5071; where it was reported an issue when creating a network with VXLAN.
---
 .../java/com/cloud/network/dao/NetworkDaoImpl.java    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
index 2578a14fc70..faf85db62cd 100644
--- a/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
+++ b/engine/schema/src/main/java/com/cloud/network/dao/NetworkDaoImpl.java
@@ -18,9 +18,12 @@ package com.cloud.network.dao;
 
 import java.net.URI;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
+import java.util.Set;
 
 import javax.annotation.PostConstruct;
 import javax.inject.Inject;
@@ -107,6 +110,9 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne
     Random _rand = new Random(System.currentTimeMillis());
     long _prefix = 0x2;
 
+    private static final Set<String> VLAN_OR_VXLAN = new HashSet<>(Arrays.asList(BroadcastDomainType.Vlan.toString().toLowerCase(),
+                                                                BroadcastDomainType.Vxlan.toString().toLowerCase()));
+
     public NetworkDaoImpl() {
     }
 
@@ -780,8 +786,9 @@ public class NetworkDaoImpl extends GenericDaoBase<NetworkVO, Long>implements Ne
     @Override
     public List<NetworkVO> listByPhysicalNetworkPvlan(long physicalNetworkId, String broadcastUri) {
         final URI searchUri = BroadcastDomainType.fromString(broadcastUri);
-        if (!searchUri.getScheme().equalsIgnoreCase("vlan")) {
-            throw new CloudRuntimeException("VLAN requested but URI is not in the expected format: " + searchUri.toString());
+        if (!VLAN_OR_VXLAN.contains(searchUri.getScheme().toLowerCase())) {
+            throw new CloudRuntimeException(
+                    String.format("Requested URI '%s' is not in the expected format. Expected URI Scheme as 'vlan://VID' or 'vxlan://VID'.", searchUri.toString()));
         }
         final String searchRange = BroadcastDomainType.getValue(searchUri);
         final List<Integer> searchVlans = UriUtils.expandVlanUri(searchRange);

From d0e37457977ca19c01fb1ae256552ad58ea994a8 Mon Sep 17 00:00:00 2001
From: davidjumani <dj.davidjumani1994@gmail.com>
Date: Mon, 7 Jun 2021 15:34:33 +0530
Subject: [PATCH 2/2] ui: Fix error when no ipv6 address (#5081)

---
 ui/src/components/view/DetailsTab.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ui/src/components/view/DetailsTab.vue b/ui/src/components/view/DetailsTab.vue
index 015b44e24d6..563acac947e 100644
--- a/ui/src/components/view/DetailsTab.vue
+++ b/ui/src/components/view/DetailsTab.vue
@@ -50,7 +50,7 @@
         </div>
       </div>
     </a-list-item>
-    <a-list-item slot="renderItem" slot-scope="item" v-else-if="item === 'ip6address' && ipV6Address.length > 0">
+    <a-list-item slot="renderItem" slot-scope="item" v-else-if="item === 'ip6address' && ipV6Address && ipV6Address.length > 0">
       <div>
         <strong>{{ $t('label.' + String(item).toLowerCase()) }}</strong>
         <br/>