[Fusioninventory-commit] [fusinv/fusioninventory-agent-task-snmpquery] d2bdcb: code cleanup
Guillaume Rousse
guillomovitch at gmail.com
Fri May 4 08:02:15 UTC 2012
Branch: refs/heads/master
Home: https://github.com/fusinv/fusioninventory-agent-task-snmpquery
Commit: d2bdcbd088ac8691f0560825267da6237c14abda
https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/d2bdcbd088ac8691f0560825267da6237c14abda
Author: Guillaume Rousse <guillomovitch at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
Log Message:
-----------
code cleanup
- drop useless local variable dot1dTpFdbPort
- keep variable names consistent
- keep oid concatenation consistent
- don't test variable definition after concatenation
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
index 3176816..8b777ad 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
@@ -15,18 +15,19 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
next unless $mac;
- my $suffix = $oid;
- $suffix =~ s/$walks->{dot1dTpFdbAddress}->{OID}//;
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
+ # get port key
+ my $portKey_part = $oid;
+ $portKey_part =~ s/$walks->{dot1dTpFdbAddress}->{OID}\.//;
+ next unless $portKey_part;
+ my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $portKey_part;
- my $portKey = $dot1dTpFdbPort . $suffix;
+ # get interface key from port key
my $ifKey_part = $results->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
+ my $ifKey = $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- my $ifIndex =
- $results->{dot1dBasePortIfIndex}->{
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part
- };
+ # get interface index
+ my $ifIndex = $results->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
my $port = $ports->{$ifIndex};
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
index eb37a80..5b0bc04 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
@@ -13,18 +13,19 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
next unless $mac;
- my $suffix = $oid;
- $suffix =~ s/$walks->{dot1dTpFdbAddress}->{OID}//;
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
+ # get port key
+ my $portKey_part = $oid;
+ $portKey_part =~ s/$walks->{dot1dTpFdbAddress}->{OID}\.//;
+ next unless $portKey_part;
+ my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $portKey_part;
- my $portKey = $dot1dTpFdbPort . $suffix;
+ # get interface key from port key
my $ifKey_part = $results->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
+ my $ifKey = $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- my $ifIndex =
- $results->{dot1dBasePortIfIndex}->{
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part
- };
+ # get interface index
+ my $ifIndex = $results->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
my $port = $ports->{$ifIndex};
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
index 5753105..1d2781d 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
@@ -17,19 +17,21 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $mac) = each %{$results->{VLAN}->{$vlan_id}->{dot1dTpFdbAddress}}) {
next unless $mac;
- my $suffix = $oid;
- $suffix =~ s/$walks->{dot1dTpFdbAddress}->{OID}//;
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
-
- my $portKey = $dot1dTpFdbPort . $suffix;
+ # get port key
+ my $portKey_part = $oid;
+ $portKey_part =~ s/$walks->{dot1dTpFdbAddress}->{OID}\.//;
+ next unless $portKey_part;
+ my $portKey =
+ $walks->{dot1dTpFdbPort}->{OID} . '.' . $portKey_part;
+
+ # get interface key from port key
my $ifKey_part =
$results->{VLAN}->{$vlan_id}->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
-
my $ifKey =
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- next unless defined $ifKey;
+ $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
+ # get interface index
my $ifIndex =
$results->{VLAN}->{$vlan_id}->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
index 9801267..243dad2 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
@@ -22,16 +22,16 @@ sub setConnectedDevicesMacAddress {
getElement($oid, -2),
getElement($oid, -1));
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
+ # get port key
+ my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $suffix;
- my $portKey = $dot1dTpFdbPort . '.' . $suffix;
+ # get interface key from port key
my $ifKey_part = $results->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
+ my $ifKey = $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- my $ifIndex =
- $results->{dot1dBasePortIfIndex}->{
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part
- };
+ # get interface index
+ my $ifIndex = $results->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
my $port = $ports->{$ifIndex};
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
index e0711a4..c71d667 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
@@ -15,18 +15,19 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
next unless $mac;
- my $suffix = $oid;
- $suffix =~ s/$walks->{dot1dTpFdbAddress}->{OID}//;
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
+ # get port key
+ my $portKey_part = $oid;
+ $portKey_part =~ s/$walks->{dot1dTpFdbAddress}->{OID}\.//;
+ next unless $portKey_part;
+ my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $portKey_part;
- my $portKey = $dot1dTpFdbPort . $suffix;
+ # get interface key from port key
my $ifKey_part = $results->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
+ my $ifKey = $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- my $ifIndex =
- $results->{dot1dBasePortIfIndex}->{
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part
- };
+ # get interface index
+ my $ifIndex = $results->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
my $port = $ports->{$ifIndex};
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
index 9e3b4a7..738cac0 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
@@ -16,18 +16,19 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
next unless $mac;
- my $suffix = $oid;
- $suffix =~ s/$walks->{dot1dTpFdbAddress}->{OID}//;
- my $dot1dTpFdbPort = $walks->{dot1dTpFdbPort}->{OID};
+ # get port key
+ my $portKey_part = $oid;
+ $portKey_part =~ s/$walks->{dot1dTpFdbAddress}->{OID}\.//;
+ next unless $portKey_part;
+ my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $portKey_part;
- my $portKey = $dot1dTpFdbPort . $suffix;
+ # get interface key from port key
my $ifKey_part = $results->{dot1dTpFdbPort}->{$portKey};
next unless defined $ifKey_part;
+ my $ifKey = $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part;
- my $ifIndex =
- $results->{dot1dBasePortIfIndex}->{
- $walks->{dot1dBasePortIfIndex}->{OID} . '.' . $ifKey_part
- };
+ # get interface index
+ my $ifIndex = $results->{dot1dBasePortIfIndex}->{$ifKey};
next unless defined $ifIndex;
my $port = $ports->{$ifIndex};
================================================================
Commit: ce4653d2c51706f346091ce7b999406963f34730
https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/ce4653d2c51706f346091ce7b999406963f34730
Author: Guillaume Rousse <guillomovitch at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
Log Message:
-----------
cosmetics: fix indentation
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
index 243dad2..cb0aa2c 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
@@ -15,12 +15,16 @@ sub setConnectedDevicesMacAddress {
while (my ($oid, $suffix) = each %{$results->{dot1dTpFdbAddress}}) {
- my $mac = sprintf("%02x:%02x:%02x:%02x:%02x:%02x", getElement($oid, -6),
- getElement($oid, -5),
- getElement($oid, -4),
- getElement($oid, -3),
- getElement($oid, -2),
- getElement($oid, -1));
+ my $mac =
+ sprintf(
+ "%02x:%02x:%02x:%02x:%02x:%02x",
+ getElement($oid, -6),
+ getElement($oid, -5),
+ getElement($oid, -4),
+ getElement($oid, -3),
+ getElement($oid, -2),
+ getElement($oid, -1)
+ );
# get port key
my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $suffix;
================================================================
Commit: 2ca8494867e792a5996a9ef48ef00fcd0f5949e1
https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/2ca8494867e792a5996a9ef48ef00fcd0f5949e1
Author: Guillaume Rousse <guillomovitch at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
Log Message:
-----------
no need to test mac definition twice
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
index 8b777ad..8113f52 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
@@ -13,6 +13,7 @@ sub setConnectedDevicesMacAddress {
my $walks = $params{walks};
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
+ $mac = alt2canonical($mac);
next unless $mac;
# get port key
@@ -32,11 +33,6 @@ sub setConnectedDevicesMacAddress {
my $port = $ports->{$ifIndex};
- $mac = alt2canonical($mac);
-
- # This mac is empty
- next unless $mac;
-
# this is port own mac address
next if $port->{MAC} && $port->{MAC} eq $mac;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
index 5b0bc04..146ed0b 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
@@ -11,6 +11,7 @@ sub setConnectedDevicesMacAddress {
my $walks = $params{walks};
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
+ $mac = alt2canonical($mac);
next unless $mac;
# get port key
@@ -33,8 +34,6 @@ sub setConnectedDevicesMacAddress {
# this device has already been processed through CDP/LLDP
next if $port->{CONNECTIONS}->{CDP};
- $mac = alt2canonical($mac);
-
# this is port own mac address
next if $port->{MAC} eq $mac;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
index 1d2781d..ebe94c6 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
@@ -15,6 +15,7 @@ sub setConnectedDevicesMacAddress {
my $vlan_id = $params{vlan_id};
while (my ($oid, $mac) = each %{$results->{VLAN}->{$vlan_id}->{dot1dTpFdbAddress}}) {
+ $mac = alt2canonical($mac);
next unless $mac;
# get port key
@@ -41,11 +42,6 @@ sub setConnectedDevicesMacAddress {
# this device has already been processed through CDP/LLDP
next if $port->{CONNECTIONS}->{CDP};
- # This mac is empty
- next unless $mac;
-
- $mac = alt2canonical($mac);
-
# this is port own mac address
next if $port->{MAC} eq $mac;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
index cb0aa2c..39e5157 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Juniper.pm
@@ -14,7 +14,6 @@ sub setConnectedDevicesMacAddress {
my $walks = $params{walks};
while (my ($oid, $suffix) = each %{$results->{dot1dTpFdbAddress}}) {
-
my $mac =
sprintf(
"%02x:%02x:%02x:%02x:%02x:%02x",
@@ -25,6 +24,7 @@ sub setConnectedDevicesMacAddress {
getElement($oid, -2),
getElement($oid, -1)
);
+ next unless $mac;
# get port key
my $portKey = $walks->{dot1dTpFdbPort}->{OID} . '.' . $suffix;
@@ -43,9 +43,6 @@ sub setConnectedDevicesMacAddress {
# this device has already been processed through CDP/LLDP
next if $port->{CONNECTIONS}->{CDP};
- # This mac is empty
- next unless $mac;
-
# this is port own mac address
next if $port->{MAC} eq $mac;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
index c71d667..bdf2671 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
@@ -13,6 +13,7 @@ sub setConnectedDevicesMacAddress {
my $walks = $params{walks};
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
+ $mac = alt2canonical($mac);
next unless $mac;
# get port key
@@ -35,8 +36,6 @@ sub setConnectedDevicesMacAddress {
# this device has already been processed through CDP/LLDP
next if $port->{CONNECTIONS}->{CDP};
- $mac = alt2canonical($mac);
-
# this is port own mac address
next if $port->{MAC} eq $mac;
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
index 738cac0..8756814 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
@@ -14,6 +14,7 @@ sub setConnectedDevicesMacAddress {
my $walks = $params{walks};
while (my ($oid, $mac) = each %{$results->{dot1dTpFdbAddress}}) {
+ $mac = alt2canonical($mac);
next unless $mac;
# get port key
@@ -36,11 +37,6 @@ sub setConnectedDevicesMacAddress {
# this device has already been processed through CDP/LLDP
next if $port->{CONNECTIONS}->{CDP};
- # This mac is empty
- next unless $mac;
-
- $mac = alt2canonical($mac);
-
# this is port own mac address
next if $port->{MAC} eq $mac;
================================================================
Commit: 8ff5ef31d61cd3879d8a49f6647fa58ad6343093
https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/8ff5ef31d61cd3879d8a49f6647fa58ad6343093
Author: Guillaume Rousse <guillomovitch at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M lib/FusionInventory/Agent/Task/NetInventory.pm
Log Message:
-----------
Merge remote-tracking branch 'forge/master'
diff --git a/lib/FusionInventory/Agent/Task/NetInventory.pm b/lib/FusionInventory/Agent/Task/NetInventory.pm
index 6c3b2e1..d264e0e 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory.pm
@@ -648,13 +648,13 @@ sub _setNetworkingProperties {
$snmp->walk($variable->{OID});
}
- _setConnectedDevicesMacAddress(
+ _setConnectedDevicesMacAddresses(
$comments, $results, $ports, $walks, $vlan_id
);
}
} else {
# set connected devices mac addresses only once
- _setConnectedDevicesMacAddress($comments, $results, $ports, $walks);
+ _setConnectedDevicesMacAddresses($comments, $results, $ports, $walks);
}
# hardware-specific hacks
================================================================
Compare: https://github.com/fusinv/fusioninventory-agent-task-snmpquery/compare/9474dda...8ff5ef3
More information about the Fusioninventory-commit
mailing list