From fdb9c0b54ff355ade3507c363cfa6641c02b4f2b Mon Sep 17 00:00:00 2001
From: Lorenzo Colitti <lorenzo@google.com>
Date: Fri, 16 Oct 2015 12:57:39 +0900
Subject: [PATCH] Make host network access optional.

This isn't required to run the tests, so it's an unnecessary
burden - it needs uml_utilities installed, needs root access,
and doesn't even perform a full network setup.

Change-Id: I8b0c3783290526909de9fe7d40ecaf7399891ba8
---
 tests/net_test/run_net_test.sh | 55 +++++++++++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 22 deletions(-)

diff --git a/tests/net_test/run_net_test.sh b/tests/net_test/run_net_test.sh
index ddd24555..85dc1222 100755
--- a/tests/net_test/run_net_test.sh
+++ b/tests/net_test/run_net_test.sh
@@ -18,8 +18,17 @@ OPTIONS="$OPTIONS DEVTMPFS DEVTMPFS_MOUNT"
 # These two break the flo kernel due to differences in -Werror on recent GCC.
 DISABLE_OPTIONS=" CONFIG_REISERFS_FS CONFIG_ANDROID_PMEM"
 
-# How many tap interfaces to create.
-NUMTAPINTERFACES=2
+# How many TAP interfaces to create to provide the VM with real network access
+# via the host. This requires privileges (e.g., root access) on the host.
+#
+# This is not needed to run the tests, but can be used, for example, to allow
+# the VM to update system packages, or to write tests that need access to a
+# real network. The VM does not set up networking by default, but it contains a
+# DHCP client and has the ability to use IPv6 autoconfiguration. This script
+# does not perform any host-level setup beyond configuring tap interfaces;
+# configuring IPv4 NAT and/or IPv6 router advertisements or ND proxying must
+# be done separately.
+NUMTAPINTERFACES=0
 
 # The root filesystem disk image we'll use.
 ROOTFS=net_test.rootfs.20150203
@@ -49,26 +58,28 @@ fi
 echo "Using $ROOTFS"
 cd -
 
-# Create NUMTAPINTERFACES tap interfaces on the host, and prepare UML command
-# line params to use them. The interfaces are called <user>TAP0, <user>TAP1,
-# ..., on the host, and eth0, eth1, ..., in the VM.
-user=${USER:0:10}
-tapinterfaces=
-netconfig=
-for id in $(seq 0 $(( NUMTAPINTERFACES - 1 )) ); do
-  tap=${user}TAP$id
-  tapinterfaces="$tapinterfaces $tap"
-  mac=$(printf fe:fd:00:00:00:%02x $id)
-  netconfig="$netconfig eth$id=tuntap,$tap,$mac"
-done
-
-for tap in $tapinterfaces; do
-  if ! ip link list $tap > /dev/null; then
-    echo "Creating tap interface $tap" >&2
-    sudo tunctl -u $USER -t $tap
-    sudo ip link set $tap up
-  fi
-done
+# If network access was requested, create NUMTAPINTERFACES tap interfaces on
+# the host, and prepare UML command line params to use them. The interfaces are
+# called <user>TAP0, <user>TAP1, on the host, and eth0, eth1, ..., in the VM.
+if (( $NUMTAPINTERFACES > 0 )); then
+  user=${USER:0:10}
+  tapinterfaces=
+  netconfig=
+  for id in $(seq 0 $(( NUMTAPINTERFACES - 1 )) ); do
+    tap=${user}TAP$id
+    tapinterfaces="$tapinterfaces $tap"
+    mac=$(printf fe:fd:00:00:00:%02x $id)
+    netconfig="$netconfig eth$id=tuntap,$tap,$mac"
+  done
+
+  for tap in $tapinterfaces; do
+    if ! ip link list $tap > /dev/null; then
+      echo "Creating tap interface $tap" >&2
+      sudo tunctl -u $USER -t $tap
+      sudo ip link set $tap up
+    fi
+  done
+fi
 
 if [ -z "$KERNEL_BINARY" ]; then
   # Exporting ARCH=um SUBARCH=x86_64 doesn't seem to work, as it "sometimes"
-- 
2.11.0