Merge ~ltrager/maas:lp1850233 into maas:master

[Lee Trager]

LP: #1850233 - Check for the existing of bond slaves when checking if a bridge is backed by a bond.

[MAAS Lander (maas-lander)]

UNIT TESTS
-b lp1850233 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-tester/6897/console
COMMIT: fa6af0d7f51e06da17509035a5818877acf7a16f

review: Needs Fixing

[Blake Rouse (blake-rouse)]

I still hate that this is all in bash... completely un-testable. But otherwise change seems okay.

review: Approve

[MAAS Lander (maas-lander)]

LANDING
-b lp1850233 lp:~ltrager/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED MERGE
LOG: http://maas-ci-jenkins.internal:8080/job/maas/job/branch-lander/542382/console

diff --git a/src/metadataserver/builtin_scripts/base-connectivity.sh b/src/metadataserver/builtin_scripts/base-connectivity.sh
index 3531be5..51db2b6 100644
--- a/src/metadataserver/builtin_scripts/base-connectivity.sh
+++ b/src/metadataserver/builtin_scripts/base-connectivity.sh
@@ -37,7 +37,7 @@ function test_bond() {
     slaves_path="/sys/devices/virtual/net/$BOND/bonding/slaves"
     slaves=$(cat $slaves_path)
     cmd_failed=0
-    for test_slave in $(echo $slaves); do
+    for test_slave in $slaves; do
         # Remove all other interfaces from the bond
         for remove_slave in $(echo $slaves | grep -v $test_slave); do
             echo "-$remove_slave" > $slaves_path
@@ -61,9 +61,9 @@ function test_interface() {
     if [ -n "$INTERFACE" ] && [ -d /sys/class/net/$INTERFACE/bridge ]; then
         cmd_failed=0
         found_bond=0
-        for i in /sys/devices/virtual/net/$INTERFACE/lower_*/bonding; do
+        for i in $(ls /sys/devices/virtual/net/$INTERFACE/lower_*/bonding/slaves 2>/dev/null); do
             found_bond=1
-            bond=$(basename $(dirname $i) | cut -d '_' -f2)
+            bond=$(echo $i | sed -E 's|.+/lower_([[:alnum:]]+)/.+|\1|')
             echo "$INTERFACE is backed by bond $bond, each slave will be tested individually..."
             echo
             test_bond "$bond" "$URL" "$INTERFACE"