select MAC Address display format on Node and Device Port search

Netdisco/Changes

@@ -5,6 +5,7 @@
   * Finally we have a discover/refresh daemon job :)
   * Also... a Scheduler which removes need for crontab installation
   * The netdisco-do script can run a one-off discover for a device
+  * Can select MAC Address display format on Node and Device Port search
 
   [ENHANCEMENTS]
 

Netdisco/lib/App/Netdisco/DB/Result/Node.pm

@@ -7,6 +7,8 @@ package App::Netdisco::DB::Result::Node;
 use strict;
 use warnings;
 
+use Net::MAC;
+
 use base 'DBIx::Class::Core';
 __PACKAGE__->table("node");
 __PACKAGE__->add_columns(
@@ -134,4 +136,12 @@ between the date stamp and time stamp. That is:
 
 sub time_last_stamp  { return (shift)->get_column('time_last_stamp')  }
 
+=head2 net_mac
+
+Returns the C<mac> column instantiated into a L<Net::MAC> object.
+
+=cut
+
+sub net_mac { return Net::MAC->new(mac => (shift)->mac) }
+
 1;

Netdisco/lib/App/Netdisco/DB/Result/NodeIp.pm

@@ -7,6 +7,8 @@ package App::Netdisco::DB::Result::NodeIp;
 use strict;
 use warnings;
 
+use Net::MAC;
+
 use base 'DBIx::Class::Core';
 __PACKAGE__->table("node_ip");
 __PACKAGE__->add_columns(
@@ -206,4 +208,12 @@ between the date stamp and time stamp. That is:
 
 sub time_last_stamp  { return (shift)->get_column('time_last_stamp')  }
 
+=head2 net_mac
+
+Returns the C<mac> column instantiated into a L<Net::MAC> object.
+
+=cut
+
+sub net_mac { return Net::MAC->new(mac => (shift)->mac) }
+
 1;

Netdisco/lib/App/Netdisco/Web/Device.pm

@@ -51,6 +51,7 @@ hook 'before' => sub {
   if (not param('tab') or param('tab') ne 'ports') {
       params->{'age_num'} = 3;
       params->{'age_unit'} = 'months';
+      params->{'mac_format'} = 'IEEE';
   }
 };
 
@@ -62,8 +63,13 @@ hook 'before_template' => sub {
     tab => 'ports',
     age_num => 3,
     age_unit => 'months',
+    mac_format => 'IEEE',
   });
 
+  # for Net::MAC method
+  $tokens->{mac_format_call} = 'as_'. params->{'mac_format'}
+    if params->{'mac_format'};
+
   foreach my $col (@{ var('port_columns') }) {
       next unless $col->{default} eq 'on';
       $tokens->{device_ports}->query_param($col->{name}, 'checked');

Netdisco/share/public/css/netdisco.css

@@ -252,6 +252,19 @@ td {
   width: 95px;
 }
 
+/* set the MAC format drop-down width */
+#nd_mac_format {
+  margin-top: 4px;
+  width: 154px;
+}
+
+/* set the MAC format drop-down width */
+#nd_node_mac_format {
+  margin-left: -2px;
+  margin-top: 4px;
+  width: 165px;
+}
+
 /* sidebar submit button width and spacing from Node Props */
 .sidebar button {
   margin-top: 9px;

Netdisco/share/views/ajax/device/ports.tt

@@ -196,7 +196,8 @@
         [% FOREACH node IN row.$nodes %]
           [% '<br/>' IF row.remote_ip OR NOT loop.first %]
           [% '<span class="label label-warning">A</span> &nbsp;' IF NOT node.active %]
-          <a href="[% search_node %]&q=[% node.mac | uri %]">[% node.mac | html_entity %]</a>
+          <a href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
+            [% node.net_mac.$mac_format_call | html_entity %]</a>
           [% ' (' _ node.time_last_age _ ')' IF params.n_age %]
           [% IF params.n_ip %]
             [% FOREACH ip IN node.ips %]

Netdisco/share/views/ajax/search/node_by_ip.tt

@@ -17,7 +17,8 @@
     [% WHILE (row = macs.next) %]
     <tr>
       <td><a class="nd_linkcell"
-        href="[% search_node %]&q=[% row.mac | uri %]">[% row.mac | html_entity %]</a></td>
+        href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
+          [% row.net_mac.$mac_format_call | html_entity %]</a></td>
       [% IF params.vendor %]
       <td>[% row.oui.company | html_entity %]</td>
       [% END %]

Netdisco/share/views/ajax/search/node_by_mac.tt

@@ -20,7 +20,8 @@
       <td>
         [% IF first_row %]
         <a class="nd_linkcell"
-          href="[% search_node %]&q=[% row.mac | uri %]">[% row.mac | html_entity %]</a>
+          href="[% search_node %]&q=[% row.net_mac.$mac_format_call | uri %]">
+            [% row.net_mac.$mac_format_call | html_entity %]</a>
         [% ELSE %]
         &nbsp;
         [% END %]
@@ -51,7 +52,8 @@
       <td>
         [% IF first_row %]
         <a class="nd_linkcell"
-          href="[% search_node %]&q=[% node.mac | uri %]">[% node.mac | html_entity %]</a>
+          href="[% search_node %]&q=[% node.net_mac.$mac_format_call | uri %]">
+            [% node.net_mac.$mac_format_call | html_entity %]</a>
         [% ELSE %]
         &nbsp;
         [% END %]

Netdisco/share/views/sidebar/device/ports.tt

@@ -76,7 +76,7 @@
               <div id="nd_portprops" class="collapse">
                 <ul class="inputs-list unstyled">
                   <li>
-                    Mark as Free if Down for:<br/>
+                    <em>Mark as Free if Down for:</em><br/>
                     <select id="nd_days_select" name="age_num">
                       [% FOREACH count IN [1..32] %]
                       <option[% ' selected="selected"' IF params.age_num == count %]>[% count %]</option>
@@ -105,6 +105,14 @@
                 </label></span>
               <div id="nd_nodeprops" class="collapse">
                 <ul class="inputs-list unstyled">
+                  <li>
+                    <em>MAC address format:</em><br/>
+                    <select id="nd_mac_format" name="mac_format">
+                      [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
+                      <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
+                      [% END %]
+                    </select>
+                  </li>
                   [% FOREACH item IN vars.connected_properties %]
                   <li>
                     <label class="checkbox">

Netdisco/share/views/sidebar/search/node.tt

@@ -38,4 +38,12 @@
                 <span class="nd_searchcheckbox uneditable-input">Partial Name</span>
               </label>
             </div>
+            <div class="clearfix">
+              <em>MAC address format:</em><br/>
+              <select id="nd_node_mac_format" name="mac_format">
+                [% FOREACH format IN [ 'IEEE', 'Cisco', 'Microsoft', 'Sun' ] %]
+                <option[% ' selected="selected"' IF params.mac_format == format %]>[% format %]</option>
+                [% END %]
+              </select>
+            </div>
             <button id="[% tab.id %]_submit" type="submit" class="btn btn-info">Search Again</button>