Merge branch 'ZSTAC-53341' into '4.6.11'

<fix>[mevoco]: fix ebtables error

See merge request zstackio/zstack-utility!2647

Author: gitlab

kvmagent/kvmagent/plugins/mevoco.py

@@ -519,22 +519,14 @@ def _apply_dns_forward(self, cmd):
         self._restart_dnsmasq(cmd.nameSpace, conf_file_path)
 
     @in_bash
-    def _delete_dhcp(self, bridge, namespace):
+    def _delete_dhcp(self, namespace):
         outer = "outer%s" % ip.get_namespace_id(namespace)
         self._delete_dhcp4(namespace)
         self._delete_dhcp6(namespace)
         bash_r("ps aux | grep -v grep | grep -w dnsmasq | grep -w %s | awk '{printf $2}' | xargs -r kill -9" % namespace)
         bash_r(
             "ip netns | grep -w %s | grep -v grep | awk '{print $1}' | xargs -r ip netns del %s" % (namespace, namespace))
 
-        ret = bash_r('brctl show | grep -w {{bridge}} > /dev/null')
-        if ret != 0:
-            try:
-                ovsctl = ovs.getOvsCtl(with_dpdk=True)
-                if bridge in ovsctl.listBrs():
-                    ovsctl.deleteOuterFromBridge(bridge, outer)
-            except OvsError as err:
-                logger.debug(err)
 
     @in_bash
     def _delete_dhcp6(self, namspace):