On Thu, Jun 16, 2011 at 11:13:24PM -0700, David Tsai wrote:
> A pool configured for secure fail-mode can block dom0 traffic on hosts joining
> the pool or if the host reboots while the controller is unavailable. This
> commit sets default flows on a host under these conditions to allow management
> traffic. Once the connection with the controller is re-established, these
> default flows are replaced by the controller.
>
> tests/interface-reconfigure.at updated by Ben Pfaff.
>
> NIC-376.
Thanks, David. I made the following further refinements to the
testsuite. I'll push this to master in a few minutes.
diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index de74437..90ca127 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -2,7 +2,7 @@ dnl IFR_SETUP
dnl
dnl Creates a directory tree for use with "interface-reconfigure --root-dir".
m4_define([IFR_SETUP],
- [for script in \
+ [[for script in \
interface-reconfigure \
InterfaceReconfigure.py \
InterfaceReconfigureBridge.py \
@@ -40,7 +40,6 @@ EOF
sbin/ip \
sbin/update-issue \
sbin/vconfig \
- usr/bin/ovs-ofctl \
usr/sbin/brctl \
usr/sbin/ovs-vlan-bug-workaround
do
@@ -52,6 +51,7 @@ EOF
chmod +x $utility
done
+ mkdir -p usr/bin
cat > usr/bin/ovs-vsctl <<'EOF'
#! /bin/sh
echo ${0} ${*} >&2
@@ -60,10 +60,11 @@ while test ${#} -ge 4; do
if test X"${1}" = Xget && \
test X"${2}" = Xinterface && \
test X"${4}" = Xofport; then
- case ${3} in
- eth2*) echo 5 ;;
- *) echo -1 ;;
- esac
+ if test X"${3}" = Xeth2; then
+ echo 5
+ else
+ echo -1
+ fi
fi
shift
@@ -71,6 +72,15 @@ done
EOF
chmod +x usr/bin/ovs-vsctl
+ cat > usr/bin/ovs-ofctl <<'EOF'
+#! /bin/sh
+echo ${0} ${*} >&2
+
+# Check that the flow is properly formed.
+ovs-ofctl parse-flow "${3}" >/dev/null
+EOF
+ chmod +x usr/bin/ovs-ofctl
+
mkdir -p etc/sysconfig/network-scripts
configure_netdev () {
mkdir -p sys/class/net/${1}
@@ -669,7 +679,7 @@ EOF
</pool>
</xenserver-network-configuration>
EOF
-])
+]])
m4_define([IFR_RUN], [./interface-reconfigure --root-prefix=$PWD --no-syslog])
_______________________________________________
dev mailing list
[email protected]
http://openvswitch.org/mailman/listinfo/dev
