Commit 06ce0872 authored by Robert Ricci's avatar Robert Ricci

Fix some typos in Keith's code, and fix a prototype to work with

newer perl versions.
parent f66b9dbf
......@@ -44,6 +44,7 @@ sub doRecreateVlans($);
sub doTrunkEnable($$@);
sub doTrunkDisable($$);
sub doRestorePortStatus($@);
sub doSynchLeader($);
#
# Defaults
......
......@@ -975,7 +975,7 @@ sub switchesWithPortsInVlan($$) {
my @switches = ();
foreach my $devicename (keys %{$self->{DEVICES}}) {
my $device = $self->{DEVICES}{$devicename};
if ($device->vlanHasPorts($vlan_mumber)) {
if ($device->vlanHasPorts($vlan_number)) {
push @switches, $devicename;
}
}
......
......@@ -173,9 +173,9 @@ sub getExperimentTrunks($$) {
my ($pid, $eid) = @_;
my @ports;
my $query = "select distinct r.node_id,v.iface from reserved as r" .
"left join vinterfaces as v on v.node_id=r.node_id" .
"where r.pid='$pid' and r.eid='$eid' and v.type='vlan' and" .
my $query = "select distinct r.node_id,v.iface from reserved as r " .
"left join vinterfaces as v on v.node_id=r.node_id " .
"where r.pid='$pid' and r.eid='$eid' and v.type='vlan' and " .
"v.iface is not NULL";
# $query = "select node_id , iface from trunk_test";
......
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