Changeset 270

Timestamp:

Sep 15, 2017, 10:25:07 PM (7 years ago)

Author:

g7moreau

Message:

• Rename switch_port -> switch_port_id

File:

• trunk/klask (modified) (7 diffs)

trunk/klask

@@ -491 +491 @@
    my %ret;
    $ret{'switch_description'} = 'unknow';
-   $ret{'switch_port'} = '0';
+   $ret{'switch_port_id'} = '0';
 
    return %ret if $mac_address eq 'unknow';;
@@ -547 +547 @@
       $ret{'switch_hostname'}    = $sw->{'hostname'};
       $ret{'switch_description'} = $sw->{'description'};
-      $ret{'switch_port'}        = $swport_num;
+      $ret{'switch_port_id'}     = $swport_num;
       $ret{'switch_port_hr'}     = $swport_hr; # human readable
 
@@ -850 +850 @@
    for my $ip (keys %{$computerdb}) {
 
+      # Rename switch_port -> switch_port_id (2017/09/15)
+      if (not exists $computerdb->{$ip}{'switch_port_id' and exists $computerdb->{$ip}{'switch_port'}}) {
+         $computerdb->{$ip}{'switch_port_id'} = $computerdb->{$ip}{'switch_port'} if defined $computerdb->{$ip}{'switch_port'};
+         }
+      delete $computerdb->{$ip}{'switch_port'} if exists $computerdb->{$ip}{'switch_port'};
+
       next LOOP_ON_IP_ADDRESS if exists $computerdb->{$ip}{'switch_port_hr'} and defined $computerdb->{$ip}{'switch_port_hr'};
 
-      $computerdb->{$ip}{'switch_port_hr'} = $computerdb->{$ip}{'switch_port'};
+      $computerdb->{$ip}{'switch_port_hr'} = $computerdb->{$ip}{'switch_port_id'};
       }
 
@@ -1159 +1165 @@
                switch_hostname    => $where{'switch_hostname'},
                switch_description => $where{'switch_description'},
-               switch_port        => $where{'switch_port'},
+               switch_port_id     => $where{'switch_port_id'},
                switch_port_hr     => $where{'switch_port_hr'},
                timestamp          => $timestamp,
@@ -1175 +1181 @@
                switch_hostname    => $where{'switch_hostname'},
                switch_description => $where{'switch_description'},
-               switch_port        => $where{'switch_port'},
+               switch_port_id     => $where{'switch_port_id'},
                switch_port_hr     => $where{'switch_port_hr'},
                timestamp          => $resol_arp{'timestamp'},
@@ -1488 +1494 @@
       my $switch_hostname = $computerdb->{$ip}{'switch_hostname'} || $computerdb->{$ip}{'switch_description'} || 'unkown';
       chomp $switch_hostname;
-      my $switch_hostname_sort = sprintf '%s %3s' ,$switch_hostname, $computerdb->{$ip}{'switch_port_hr'};
+      my $switch_hostname_sort = sprintf '%s %06i' ,$switch_hostname, $computerdb->{$ip}{'switch_port_id'}; # Take switch index
 
       my $ip_sort = sprintf '%03i%03i%03i%03i', split m/ \. /xms, $ip;
@@ -1731 +1737 @@
       next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{'hostname_fq'} eq ($computerdb->{$ip}{'switch_hostname'} || $computerdb->{$ip}{'switch_description'}); # switch on himself !
       next LOOP_ON_IP_ADDRESS if ($computerdb->{$ip}{'switch_hostname'} || $computerdb->{$ip}{'switch_description'}) eq 'unknow';
-      next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{'switch_port'} eq '0';
+      next LOOP_ON_IP_ADDRESS if $computerdb->{$ip}{'switch_port_id'} eq '0';
 
       my $ip_timestamp   = $computerdb->{$ip}{'timestamp'};