[cloudstack] branch main updated: vxlan: Fix failure to delete vxlan (#5079)

[we...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/main by this push:
     new 5edcf33  vxlan: Fix failure to delete vxlan (#5079)
5edcf33 is described below

commit 5edcf33ff0c7c7322434f3e6d28eedf0fdcc0a9d
Author: Pearl Dsilva <pe...@gmail.com>
AuthorDate: Fri Jun 25 12:33:54 2021 +0530

    vxlan: Fix failure to delete vxlan (#5079)
---
 .../main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java  | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
index 37a8c76..741aa72 100644
--- a/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
+++ b/plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java
@@ -376,7 +376,9 @@ public class BridgeVifDriver extends VifDriverBase {
             command.add("-v", vNetId);
             command.add("-p", pName);
             command.add("-b", brName);
-            command.add("-d", String.valueOf(deleteBr));
+            if (cmdout != null && !cmdout.contains("vxlan")) {
+                command.add("-d", String.valueOf(deleteBr));
+            }
 
             final String result = command.execute();
             if (result != null) {