fix code in L3/Extreme to pass tests and be more correct
This commit is contained in:
@@ -465,15 +465,15 @@ sub i_vlan_membership {
|
|||||||
|
|
||||||
# Some devices support Q-Bridge, if so short circuit and return it
|
# Some devices support Q-Bridge, if so short circuit and return it
|
||||||
my $q_bridge = $extreme->SUPER::i_vlan_membership($partial);
|
my $q_bridge = $extreme->SUPER::i_vlan_membership($partial);
|
||||||
return $q_bridge if (keys $q_bridge);
|
return $q_bridge if (ref {} eq ref $q_bridge and scalar keys %$q_bridge);
|
||||||
|
|
||||||
# Next we try extremeVlanOpaqueTable
|
# Next we try extremeVlanOpaqueTable
|
||||||
my $xos = $extreme->_xos_i_vlan_membership($partial);
|
my $xos = $extreme->_xos_i_vlan_membership($partial);
|
||||||
return $xos if (keys $xos);
|
return $xos if (ref {} eq ref $xos and scalar keys %$xos);
|
||||||
|
|
||||||
# Try older ifStack method
|
# Try older ifStack method
|
||||||
my $extremeware = $extreme->_extremeware_i_vlan_membership($partial);
|
my $extremeware = $extreme->_extremeware_i_vlan_membership($partial);
|
||||||
return $extremeware if (keys $extremeware);
|
return $extremeware if (ref {} eq ref $extremeware and scalar keys %$extremeware);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
^Makefile$
|
^Makefile$
|
||||||
^blib/
|
^blib/
|
||||||
^MakeMaker-\d
|
^MakeMaker-\d
|
||||||
|
pm_to_blib
|
||||||
|
|
||||||
# Temp, old and emacs backup files.
|
# Temp, old and emacs backup files.
|
||||||
~$
|
~$
|
||||||
|
|||||||
Reference in New Issue
Block a user