local vm_uuid=$(xenstore-read "$vm/uuid" 2>/dev/null)
fi
if [ -n "${vm_uuid}" ] ; then
- set_vif_external_id "vm-uuid" "${vm_uuid}"
+ set_vif_external_id "xs-vm-uuid" "${vm_uuid}"
fi
local vif_uuid=$(xenstore-read "${PRIVATE}/vif-uuid" 2>/dev/null)
vif_uuid=$(xe vif-list --minimal vm-uuid="${vm_uuid}" device=$DEVID)
fi
if [ -n "${vif_uuid}" ] ; then
- set_vif_external_id "vif-uuid" "${vif_uuid}"
+ set_vif_external_id "xs-vif-uuid" "${vif_uuid}"
fi
local vif_details=
net_uuid=$(xe vif-param-get uuid="${vif_uuid}" param-name=network-uuid)
fi
if [ -n "${net_uuid}" ] ; then
- set_vif_external_id "network-uuid" "${net_uuid}"
+ set_vif_external_id "xs-network-uuid" "${net_uuid}"
fi
local address=$(xenstore-read "/local/domain/$DOMID/device/vif/$DEVID/mac" 2>/dev/null)
if [ -n "${address}" ] ; then
- set_vif_external_id "vif-mac" "${address}"
+ set_vif_external_id "attached-mac" "${address}"
fi
if $xs550; then
# configuration variable, but vNetManager can tolerate that.
local bridge=$1
if [ -n "${net_uuid}" ] ; then
- logger -t scripts-vif "${bridge} network-uuids ${net_uuid}"
- echo "-- br-set-external-id $bridge network-uuids ${net_uuid}"
+ logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}"
+ echo "-- br-set-external-id $bridge xs-network-uuids ${net_uuid}"
fi
fi
}
local vif_details=$(handle_vswitch_vif_details $bridge)
fi
- $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details
+ $vsctl --timeout=30 -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details
;;
esac
# If ovs-brcompatd is running, it might already have deleted the
# port. Use --if-exists to suppress the error that would otherwise
# arise in that case.
- $vsctl -- --if-exists del-port $dev
+ $vsctl --timeout=30 -- --if-exists del-port $dev
;;
esac
}