From 5edcf33ff0c7c7322434f3e6d28eedf0fdcc0a9d Mon Sep 17 00:00:00 2001 From: Pearl Dsilva Date: Fri, 25 Jun 2021 12:33:54 +0530 Subject: [PATCH] vxlan: Fix failure to delete vxlan (#5079) --- .../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 37a8c762e0e..741aa72172e 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) {