Commit 15ce9d4f authored by Mike Hibler's avatar Mike Hibler

ExptFirewall only returns true if there is a VLAN-based firewall.

This is the only case tbswap cares about.
parent a3588a06
......@@ -3542,6 +3542,7 @@ sub TBNodeStateWait ($$$$) {
# Determine if there is a firewall for a particular experiment.
# Optionally returns the pname of the firewall node and the VLAN info.
#
# XXX only returns true for experiments with VLAN-based firewalls.
# XXX this will need to change if we support multiple firewalls per experiment.
#
sub TBExptFirewall ($$;$$$) {
......@@ -3556,7 +3557,8 @@ sub TBExptFirewall ($$;$$$) {
if (!defined($fwnodep)) {
$query_result =
DBQueryWarn("SELECT eid FROM firewalls ".
"WHERE pid='$pid' and eid='$eid'");
"WHERE pid='$pid' and eid='$eid' ".
"AND type LIKE '%-vlan'");
if (!$query_result || $query_result->num_rows == 0) {
return 0;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment