Skip to content

Commit

Permalink
tests: Fix lxc-user-nic path
Browse files Browse the repository at this point in the history
Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
  • Loading branch information
stgraber committed Jan 24, 2014
1 parent e6c6d62 commit 8cb8e49
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
1 change: 1 addition & 0 deletions configure.ac
Expand Up @@ -696,6 +696,7 @@ AC_CONFIG_FILES([
src/lua-lxc/Makefile
src/tests/Makefile
src/tests/lxc-test-usernic
])
AC_CONFIG_COMMANDS([default],[[]],[[]])
AC_OUTPUT
Expand Down
15 changes: 8 additions & 7 deletions src/tests/lxc-test-usernic → src/tests/lxc-test-usernic.in
Expand Up @@ -22,6 +22,7 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA

DONE=0
LXC_USER_NIC="@LIBEXECDIR@/lxc/lxc-user-nic"

cleanup() {
(
Expand Down Expand Up @@ -95,7 +96,7 @@ run_cmd "lxc-start -n b1 -d"
p1=$(run_cmd "lxc-info -n b1 -p -H")

# Assign one veth, should fail as no allowed entries yet
if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx1"; then
if run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx1"; then
echo "FAIL: able to create nic with no entries"
exit 1
fi
Expand All @@ -106,24 +107,24 @@ sed -i '/^usernic-user/d' /etc/lxc/lxc-usernet
echo "usernic-user veth usernic-br0 2" >> /etc/lxc/lxc-usernet

# Assign one veth to second bridge, should fail
if run_cmd "lxc-user-nic $p1 veth usernic-br1 xx1"; then
if run_cmd "$LXC_USER_NIC $p1 veth usernic-br1 xx1"; then
echo "FAIL: able to create nic with no entries"
exit 1
fi

# Assign two veths, should succeed
if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx2"; then
if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx2"; then
echo "FAIL: unable to create first nic"
exit 1
fi

if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx3"; then
if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx3"; then
echo "FAIL: unable to create second nic"
exit 1
fi

# Assign one more veth, should fail.
if run_cmd "lxc-user-nic $p1 veth usernic-br0 xx4"; then
if run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx4"; then
echo "FAIL: able to create third nic"
exit 1
fi
Expand All @@ -133,7 +134,7 @@ run_cmd "lxc-stop -n b1 -k"
run_cmd "lxc-start -n b1 -d"
p1=$(run_cmd "lxc-info -n b1 -p -H")

if ! run_cmd "lxc-user-nic $p1 veth usernic-br0 xx5"; then
if ! run_cmd "$LXC_USER_NIC $p1 veth usernic-br0 xx5"; then
echo "FAIL: unable to create nic after destroying the old"
cleanup 1
fi
Expand All @@ -146,7 +147,7 @@ lxc-start -n usernic-c1 -d
p2=$(lxc-info -n usernic-c1 -p -H)

# assign veth to it - should fail
if run_cmd "lxc-user-nic $p2 veth usernic-br0 xx6"; then
if run_cmd "$LXC_USER_NIC $p2 veth usernic-br0 xx6"; then
echo "FAIL: able to attach nic to root-owned container"
cleanup 1
fi
Expand Down

0 comments on commit 8cb8e49

Please sign in to comment.