Merge pull request xapi-project#6 from robhoes/tap

CA-217840: Only call setup-pvs-proxy-rules on vif (not tap) events
robhoes · Aug 17, 2016 · 156fa0b · 156fa0b
2 parents d4e91bb + 5e31481
commit 156fa0b
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/scripts/vif-real b/scripts/vif-real
@@ -191,8 +191,10 @@ add_to_bridge()
         ;;
     esac
 
-    local setup_pvs_proxy_rules=$(xenstore-read "${PRIVATE}/setup-pvs-proxy-rules" 2>/dev/null)
-    $setup_pvs_proxy_rules add "$PRIVATE" || logger -t scripts-vif "Failed to $setup_pvs_proxy_rules add $PRIVATE"
+    if [ "${TYPE}" = "vif" ] ; then
+        local setup_pvs_proxy_rules=$(xenstore-read "${PRIVATE}/setup-pvs-proxy-rules" 2>/dev/null)
+        $setup_pvs_proxy_rules add "$PRIVATE" || logger -t scripts-vif "Failed to $setup_pvs_proxy_rules add $PRIVATE"
+	fi
 
     local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)
     $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID filter         || logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID filter"
@@ -202,8 +204,10 @@ remove_from_bridge()
 {
     ${IP} link set "${dev}" down || logger -t scripts-vif "Failed to ip link set ${dev} down"
 
-    local setup_pvs_proxy_rules=$(xenstore-read "${PRIVATE}/setup-pvs-proxy-rules" 2>/dev/null)
-    /usr/libexec/xenopsd/setup-pvs-proxy-rules remove "$PRIVATE" || logger -t scripts-vif "Failed to $setup_pvs_proxy_rules remove $PRIVATE"
+    if [ "${TYPE}" = "vif" ] ; then
+        local setup_pvs_proxy_rules=$(xenstore-read "${PRIVATE}/setup-pvs-proxy-rules" 2>/dev/null)
+        /usr/libexec/xenopsd/setup-pvs-proxy-rules remove "$PRIVATE" || logger -t scripts-vif "Failed to $setup_pvs_proxy_rules remove $PRIVATE"
+    fi
 
     local setup_vif_rules=$(xenstore-read "${PRIVATE}/setup-vif-rules" 2>/dev/null)
     $setup_vif_rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID clear          || logger -t scripts-vif "Failed to setup-vif-rules $XENOPSD_BACKEND ${dev} $DOMUUID $DEVID clear"