Changeset 160

Timestamp:

Jun 8, 2016, 11:05:40 PM (8 years ago)

Author:

g7moreau

Message:

• Add Bridge short name
• Error betwwen port number and port short name...

File:

• trunk/klask (modified) (4 diffs)

trunk/klask

@@ -665 +665 @@
    my $sw_port_hr  = shift;
 
-   $sw_port_hr =~ s/Ten-GigabitEthernet/Te/;
-   $sw_port_hr =~ s/GigabitEthernet/Gi/;
+   $sw_port_hr =~ s/^Bridge-Aggregation/Br/;
+   $sw_port_hr =~ s/^Ten-GigabitEthernet/Te/;
+   $sw_port_hr =~ s/^GigabitEthernet/Gi/;
 
    return $sw_port_hr;
@@ -2071 +2072 @@
 
          $db_switch_link_with{ $db_switch_ip_hostnamefq{$ip} } ||= {};
-         $db_switch_link_with{ $db_switch_ip_hostnamefq{$ip} }->{ $switch->{hostname} } = $switch->{port};
+         $db_switch_link_with{ $db_switch_ip_hostnamefq{$ip} }->{ $switch->{hostname} } = $switch->{port_hr};
          print "VERBOSE_7: +++++\n" if $verbose;
          }
@@ -2084 +2085 @@
          for my $connect (keys %{$db_switch_link_with{$sw}}) {
 
-            my $port = $db_switch_link_with{$sw}->{$connect};
-
-            $db_switch_connected_on_port{"$connect:$port"} ||= {};
-            $db_switch_connected_on_port{"$connect:$port"}->{$sw}++; # Just to define the key
+            my $port_hr = $db_switch_link_with{$sw}->{$connect};
+
+            $db_switch_connected_on_port{"$connect:$port_hr"} ||= {};
+            $db_switch_connected_on_port{"$connect:$port_hr"}->{$sw}++; # Just to define the key
             }
          }
@@ -2127 +2128 @@
       for my $connect (keys %{$db_switch_link_with{$sw}}) {
 
-         my $port = $db_switch_link_with{$sw}->{$connect};
-
-         $db_switch_connected_on_port{"$connect:$port"} ||= {};
-         $db_switch_connected_on_port{"$connect:$port"}->{$sw} = $port;
+         my $port_hr = $db_switch_link_with{$sw}->{$connect};
+
+         $db_switch_connected_on_port{"$connect:$port_hr"} ||= {};
+         $db_switch_connected_on_port{"$connect:$port_hr"}->{$sw} = $port_hr;
 
          $db_switch_parent{$sw} = {switch => $connect, port => $port};