[Fusioninventory-commit] [fusinv/fusioninventory-agent-task-snmpquery] bb0567: this is function, not a method

[Guillaume Rousse]

  Branch: refs/heads/master
  Home:   https://github.com/fusinv/fusioninventory-agent-task-snmpquery
  Commit: bb0567fbf8f6ea013adab1ceb32868b7708cad74
      https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/bb0567fbf8f6ea013adab1ceb32868b7708cad74
  Author: Guillaume Rousse <guillomovitch at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M lib/FusionInventory/Agent/Task/NetInventory.pm

  Log Message:
  -----------
  this is function, not a method


diff --git a/lib/FusionInventory/Agent/Task/NetInventory.pm b/lib/FusionInventory/Agent/Task/NetInventory.pm
index d9109c3..da6f007 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory.pm
@@ -733,7 +733,7 @@ sub _setNetworkingProperties {
             foreach my $entry (@mac_dispatch_table) {
                 next unless $comments =~ $entry->{match};
 
-                $self->runFunction(
+                runFunction(
                     module   => $entry->{module},
                     function => $entry->{function},
                     params   => {


================================================================
  Commit: 36d98ebcf0da7c8e3bce3b79bb549be4c9ca5e8c
      https://github.com/fusinv/fusioninventory-agent-task-snmpquery/commit/36d98ebcf0da7c8e3bce3b79bb549be4c9ca5e8c
  Author: Guillaume Rousse <guillomovitch at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 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/Nortel.pm
    M lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
    M t/cisco.t
    M t/procurve.t

  Log Message:
  -----------
  fix internal structure to match expected output


diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
index bf658ce..424d886 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/3Com.pm
@@ -27,8 +27,8 @@ sub setConnectedDevicesMacAddress {
 
         # create a new connection with this mac address
         push
-            @{$port->{CONNECTIONS}->{CONNECTION}},
-            { MAC => $mac };
+            @{$port->{CONNECTIONS}->{CONNECTION}->{MAC}},
+            $mac;
     }
 }
 
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
index d3ec5c0..eb37a80 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/AlliedTelesis.pm
@@ -39,8 +39,8 @@ sub setConnectedDevicesMacAddress {
 
         # create a new connection with this mac address
         push
-            @{$port->{CONNECTIONS}->{CONNECTION}},
-            { MAC => $mac };
+            @{$port->{CONNECTIONS}->{CONNECTION}->{MAC}},
+            $mac;
     }
 }
 
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
index 944afaa..4bd383a 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Cisco.pm
@@ -46,8 +46,8 @@ sub setConnectedDevicesMacAddress {
 
         # create a new connection with this mac address
         push
-            @{$port->{CONNECTIONS}->{CONNECTION}},
-            { MAC => $mac };
+            @{$port->{CONNECTIONS}->{CONNECTION}->{MAC}},
+            $mac;
     }
 }
 
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
index 6cae4d3..e0711a4 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Nortel.pm
@@ -41,8 +41,8 @@ sub setConnectedDevicesMacAddress {
 
         # create a new connection with this mac address
         push
-            @{$port->{CONNECTIONS}->{CONNECTION}},
-            { MAC => $mac };
+            @{$port->{CONNECTIONS}->{CONNECTION}->{MAC}},
+            $mac;
     }
 }
 
diff --git a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
index 5743d7f..862fb5c 100644
--- a/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
+++ b/lib/FusionInventory/Agent/Task/NetInventory/Manufacturer/Procurve.pm
@@ -42,8 +42,8 @@ sub setConnectedDevicesMacAddress {
 
         # create a new connection with this mac address
         push
-            @{$port->{CONNECTIONS}->{CONNECTION}},
-            { MAC => $mac };
+            @{$port->{CONNECTIONS}->{CONNECTION}->{MAC}},
+            $mac;
     }
 }
 
diff --git a/t/cisco.t b/t/cisco.t
index d08c7cb..19e3e41 100755
--- a/t/cisco.t
+++ b/t/cisco.t
@@ -20,9 +20,9 @@ my @devices_mac_addresses_tests = (
         {
             0 => {
                 CONNECTIONS => {
-                    CONNECTION => [
-                        { MAC => '00:1C:F6:C5:64:19' }
-                    ]
+                    CONNECTION => {
+                        MAC => [ '00:1C:F6:C5:64:19' ]
+                    }
                 },
                 MAC => 'X',
             }
diff --git a/t/procurve.t b/t/procurve.t
index 5b776fa..c988d03 100755
--- a/t/procurve.t
+++ b/t/procurve.t
@@ -20,9 +20,9 @@ my @devices_mac_addresses_tests = (
         {
             52 => {
                 CONNECTIONS => {
-                    CONNECTION => [
-                        { MAC => '00:00:74:D2:09:6A' }
-                    ]
+                    CONNECTION => {
+                        MAC => [ '00:00:74:D2:09:6A' ]
+                    }
                 },
                 MAC => 'X',
             }


================================================================
Compare: https://github.com/fusinv/fusioninventory-agent-task-snmpquery/compare/d354123...36d98eb