Changeset 228

Timestamp:

Mar 5, 2017, 9:52:02 AM (8 years ago)

Author:

g7moreau

Message:

• Add a new format for MAC address and work on search-mac-on-switch

File:

• trunk/klask (modified) (2 diffs)

trunk/klask

@@ -428 +428 @@
    my $mac_address = shift;
 
-   # D07E-28D1-7AB8 or d07e28-d17ab8
-   if ($mac_address =~ m{^ (?: [0-9A-Fa-f]{4} -){2} [0-9A-Fa-f]{4} $}xms
-      or $mac_address =~ m{^ [0-9A-Fa-f]{6} - [0-9A-Fa-f]{6} $}xms) {
+   # D07E-28D1-7AB8 or D07E.28D1.7AB8 or d07e28-d17ab8
+   if ($mac_address =~ m{^ (?: [0-9A-Fa-f]{4} [-\.]){2} [0-9A-Fa-f]{4} $}xms
+      or $mac_address =~ m{^ [0-9A-Fa-f]{6} - [0-9A-Fa-f]{6} $}xms
+      ) {
       $mac_address =~ s/-//g;
       return join q{:}, unpack('(A2)*', uc($mac_address));
@@ -2226 +2227 @@
 
    $mac_address = normalize_mac_address($mac_address);
-   $switch_name = join(',', map {$_->{hostname}} @SWITCH_LIST ) if $switch_name eq q{*};
+   $switch_name = join(',', map {$_->{hostname}} @SWITCH_LIST ) if $switch_name eq q{*} or $switch_name eq q{all};
 
    for my $sw_name (split /,/, $switch_name) {