Merge branch 'shixin-ZSTAC-56388' into 'master'

<fix>[deip]: fix code error when apply flat eip

See merge request zstackio/zstack-utility!3276

Author: gitlab

kvmagent/kvmagent/plugins/deip.py

@@ -250,7 +250,7 @@ def add_bridge_fdb_entry_for_pri_idev():
         # deleting the orphan link and recreate it
         def delete_orphan_outer_dev(inner_dev, outer_dev):
             mac = iproute.IpNetnsShell(NS_NAME).get_mac(inner_dev)
-            if mac is not None:
+            if mac is None:
                 iproute.delete_link_no_error(outer_dev)
 
         def create_dev_if_needed(outer_dev, outer_dev_desc, inner_dev, inner_dev_desc):
@@ -516,7 +516,7 @@ def add_filter_to_prevent_namespace_arp_request():
             add_filter_to_prevent_namespace_arp_request()
 
             # ping VIP gateway
-            bash_r('eval {{NS}} arping -q -A -w 2.5 -c 3 -I {{PUB_IDEV}} {{VIP}} > /dev/null')
+            bash_r('eval {{NS}} arping -q -A -w 2 -c 3 -I {{PUB_IDEV}} {{VIP}} > /dev/null')
             set_gateway_arp_if_needed()
             set_eip_rules()
             set_default_route_if_needed("ip")