Commit a10de38e authored by Mike Hibler's avatar Mike Hibler

Fix getTrunkHash to return switch+card+port info in the traditional format.

Also, a little more debug in switchmac.
parent c4e94b9d
......@@ -1606,7 +1606,8 @@ sub getTrunkHash() {
foreach my $switch1 (keys %trunks) {
foreach my $switch2 (keys %{$trunks{$switch1}}) {
foreach my $port (@{$trunks{$switch1}{$switch2}}) {
my $portstr = "$switch1/$port";
# XXX backward compat
my $portstr = "$switch1/".$port->card().".".$port->port();
$trunkhash{$portstr} = 1;
}
}
......
......@@ -156,6 +156,7 @@ if (@test_switches > 0) {
# Get trunk ports so that we can skip MACs learned on them
#
my %trunks = getTrunkHash();
DEBUG "found trunk ports: ", join(' ', keys(%trunks)), "\n";
if (@control_switches > 0) {
if ($control_switches[0] eq "none") {
......
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