Work towards removing brctl
cover Work towards removing brctl
Start updating scripts for network functionality
The scripts for networking in Xen have a mixture of formatting, tab spacing, space spacing inconsistencies.
We also have issues where CentOS 8 does not have brctl - being replaced with ip / bridge commands.
This series starts cleaning up whitespace and formatting, as well as starts adding conditionals for using brctl (if present) but using ip if /usr/sbin/brctl is not installed.
Steven Haigh (2):
Tidy up whitespace and formatting in file to be consistent. Use ip for bridge related functions where brctl is not present
tools/hotplug/Linux/colo-proxy-setup | 30 +++-- tools/hotplug/Linux/vif-bridge | 19 ++- tools/hotplug/Linux/vif2 | 12 +- tools/hotplug/Linux/xen-network-common.sh | 151 +++++++++++----------- 4 files changed, 121 insertions(+), 91 deletions(-)
Signature · 7 lines
2.24.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 1/2 Tidy up whitespace and formatting in file to be consistent.
Signed-off-by Steven Haigh <[email protected]>
--- tools/hotplug/Linux/xen-network-common.sh | 144 +++++++++++----------- 1 file changed, 70 insertions(+), 74 deletions(-)
tools/hotplug/Linux/xen-network-common.sh +70 -74
@@ -26,118 +26,114 @@ # that the virtual device will take once the physical device has # been renamed. -if ! which ifup >/dev/null 2>/dev/null -then - preiftransfer() - { - true - } - ifup() - { - false - } - ifdown() - { - false - } +if ! which ifup >/dev/null 2>/dev/null; then + preiftransfer() + { + true + } + ifup() + { + false + } + ifdown() + { + false + } else - preiftransfer() - { - true - } + preiftransfer() + { + true + } fi first_file() { - t="$1" - shift - for file in $@ - do - if [ "$t" "$file" ] - then - echo "$file" - return - fi - done + t="$1" + shift + for file in $@; do + if [ "$t" "$file" ]; then + echo "$file" + return + fi + done } find_dhcpd_conf_file() { - first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf + first_file -f /etc/dhcp3/dhcpd.conf /etc/dhcpd.conf } find_dhcpd_init_file() { - first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd} + first_file -x /etc/init.d/{dhcp3-server,dhcp,dhcpd} } find_dhcpd_arg_file() { - first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3-server + first_file -f /etc/sysconfig/dhcpd /etc/defaults/dhcp /etc/default/dhcp3-server } # configure interfaces which act as pure bridge ports: _setup_bridge_port() { - local dev="$1" - local virtual="$2" - - # take interface down ... - ip link set dev ${dev} down - - if [ $virtual -ne 0 ] ; then - # Initialise a dummy MAC address. We choose the numerically - # largest non-broadcast address to prevent the address getting - # stolen by an Ethernet bridge for STP purposes. - # (FE:FF:FF:FF:FF:FF) - ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true - fi - - # ... and configure it - ip address flush dev ${dev} + local dev="$1" + local virtual="$2" + + # take interface down ... + ip link set dev ${dev} down + + if [ $virtual -ne 0 ]; then + # Initialise a dummy MAC address. We choose the numerically + # largest non-broadcast address to prevent the address getting + # stolen by an Ethernet bridge for STP purposes. + # (FE:FF:FF:FF:FF:FF) + ip link set dev ${dev} address fe:ff:ff:ff:ff:ff || true + fi + + # ... and configure it + ip address flush dev ${dev} } setup_physical_bridge_port() { - _setup_bridge_port $1 0 + _setup_bridge_port $1 0 } setup_virtual_bridge_port() { - _setup_bridge_port $1 1 + _setup_bridge_port $1 1 } # Usage: create_bridge bridge create_bridge () { - local bridge=$1 - - # Don't create the bridge if it already exists. - if [ ! -e "/sys/class/net/${bridge}/bridge" ]; then - brctl addbr ${bridge} - brctl stp ${bridge} off - brctl setfd ${bridge} 0 - fi + local bridge=$1 + + # Don't create the bridge if it already exists. + if [ ! -e "/sys/class/net/${bridge}/bridge" ]; then + brctl addbr ${bridge} + brctl stp ${bridge} off + brctl setfd ${bridge} 0 + fi } # Usage: add_to_bridge bridge dev add_to_bridge () { - local bridge=$1 - local dev=$2 - - # Don't add $dev to $bridge if it's already on a bridge. - if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then - ip link set dev ${dev} up || true - return - fi - brctl addif ${bridge} ${dev} - ip link set dev ${dev} up + local bridge=$1 + local dev=$2 + + # Don't add $dev to $bridge if it's already on a bridge. + if [ -e "/sys/class/net/${bridge}/brif/${dev}" ]; then + ip link set dev ${dev} up || true + return + fi + brctl addif ${bridge} ${dev} + ip link set dev ${dev} up } # Usage: set_mtu bridge dev set_mtu () { - local bridge=$1 - local dev=$2 - mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" - if [ -n "$mtu" ] && [ "$mtu" -gt 0 ] - then - ip link set dev ${dev} mtu $mtu || : - fi + local bridge=$1 + local dev=$2 + mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`" + if [ -n "$mtu" ] && [ "$mtu" -gt 0 ]; then + ip link set dev ${dev} mtu $mtu || : + fi }
Signature · 7 lines
2.24.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
PATCH 2/2 Use ip for bridge related functions where brctl is not present
In reply to Steven HaighSigned-off-by Steven Haigh <[email protected]>
--- tools/hotplug/Linux/colo-proxy-setup | 30 +++++++++++++++++------ tools/hotplug/Linux/vif-bridge | 19 ++++++++------ tools/hotplug/Linux/vif2 | 12 +++++++-- tools/hotplug/Linux/xen-network-common.sh | 15 +++++++++--- 4 files changed, 55 insertions(+), 21 deletions(-)
tools/hotplug/Linux/colo-proxy-setup +22 -8
@@ -76,10 +76,17 @@ function teardown_primary() function setup_secondary() { - do_without_error brctl delif $bridge $vifname - do_without_error brctl addbr $forwardbr - do_without_error brctl addif $forwardbr $vifname - do_without_error brctl addif $forwardbr $forwarddev + if [ -x "/usr/bin/brctl" ]; then + do_without_error brctl delif $bridge $vifname + do_without_error brctl addbr $forwardbr + do_without_error brctl addif $forwardbr $vifname + do_without_error brctl addif $forwardbr $forwarddev + else + do_without_error ip link set $vifname nomaster + do_without_error ip link add name $forwardbr type bridge + do_without_error ip link set $vifname master $forwardbr + do_without_error ip link set $forwarddev master $forwardbr + fi do_without_error ip link set dev $forwardbr up do_without_error modprobe xt_SECCOLO
@@ -91,10 +98,17 @@ function setup_secondary() function teardown_secondary() { - do_without_error brctl delif $forwardbr $forwarddev - do_without_error brctl delif $forwardbr $vifname - do_without_error brctl delbr $forwardbr - do_without_error brctl addif $bridge $vifname + if [ -x "/usr/bin/brctl" ]; then + do_without_error brctl delif $forwardbr $forwarddev + do_without_error brctl delif $forwardbr $vifname + do_without_error brctl delbr $forwardbr + do_without_error brctl addif $bridge $vifname + else + do_without_error ip link set $forwarddev nomaster + do_without_error ip link set $vifname nomaster + do_without_error ip link delete $forwardbr type bridge + do_without_error ip link set $vifname master $bridge + fi do_without_error iptables -t mangle -D PREROUTING -m physdev --physdev-in \ $vifname -j SECCOLO --index $index
tools/hotplug/Linux/vif-bridge +12 -7
@@ -31,12 +31,13 @@ dir=$(dirname "$0") bridge=${bridge:-} bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge") -if [ -z "$bridge" ] -then - bridge=$(brctl show | awk 'NR==2{print$1}') - - if [ -z "$bridge" ] - then +if [ -z "$bridge" ]; then + if [ -x "/usr/sbin/brctl" ]; then + bridge=$(brctl show | awk 'NR==2{print$1}') + else + bridge=$(bridge link | cut -d" " -f7) + fi + if [ -z "$bridge" ]; then fatal "Could not find bridge, and none was specified" fi else
@@ -82,7 +83,11 @@ case "$command" in ;; offline) - do_without_error brctl delif "$bridge" "$dev" + if [ -x "/usr/sbin/brctl"]; then + do_without_error brctl delif "$bridge" "$dev" + else + do_without_error ip link set "$dev" nomaster + fi do_without_error ifconfig "$dev" down ;;
tools/hotplug/Linux/vif2 +10 -2
@@ -7,13 +7,21 @@ dir=$(dirname "$0") bridge=$(xenstore_read_default "$XENBUS_PATH/bridge" "$bridge") if [ -z "$bridge" ] then - nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1)) + if [ -x "/usr/sbin/brctl" ]; then + nr_bridges=$(($(brctl show | cut -f 1 | grep -v "^$" | wc -l) - 1)) + else + nr_bridges=$(bridge link | wc -l) + fi if [ "$nr_bridges" != 1 ] then fatal "no bridge specified, and don't know which one to use ($nr_bridges found)" fi - bridge=$(brctl show | cut -d " + if [ -x "/usr/sbin/brctl" ]; then + bridge=$(brctl show | cut -d " " -f 2 | cut -f 1) + else + bridge=$(bridge link | cut -d" " -f6) + fi fi command="$1"
tools/hotplug/Linux/xen-network-common.sh +11 -4
@@ -108,9 +108,12 @@ create_bridge () { # Don't create the bridge if it already exists. if [ ! -e "/sys/class/net/${bridge}/bridge" ]; then - brctl addbr ${bridge} - brctl stp ${bridge} off - brctl setfd ${bridge} 0 + if [ -x "/usr/sbin/brctl" ]; then + brctl addbr ${bridge} + brctl stp ${bridge} off + brctl setfd ${bridge} 0 + else + ip link add name ${bridge} type bridge stp_state 0 forward_delay 0 fi }
@@ -124,7 +127,11 @@ add_to_bridge () { ip link set dev ${dev} up || true return fi - brctl addif ${bridge} ${dev} + if [ -x "/usr/sbin/brctl" ]; then + brctl addif ${bridge} ${dev} + else + ip link set ${dev} master ${bridge} + fi ip link set dev ${dev} up }
Signature · 7 lines
2.24.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel