From e5f157aa214a761034af7b6389c65173b4b23d74 Mon Sep 17 00:00:00 2001 From: "Eric A. Miller" Date: Tue, 3 Jun 2014 19:30:09 -0400 Subject: [PATCH] Add net_mac column to DevicePort, NodeNbt, and NodeWirless Result classes to enable consistent MAC formatting --- Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm | 10 ++++++++++ Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm | 2 ++ Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm | 10 ++++++++++ 3 files changed, 22 insertions(+) diff --git a/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm index 38c65523..dcb40579 100644 --- a/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/DevicePort.pm @@ -7,6 +7,8 @@ package App::Netdisco::DB::Result::DevicePort; use strict; use warnings; +use Net::MAC; + use MIME::Base64 'encode_base64url'; use base 'DBIx::Class::Core'; @@ -335,4 +337,12 @@ in a URL. sub base64url_port { return encode_base64url((shift)->port) } +=head2 net_mac + +Returns the C column instantiated into a L object. + +=cut + +sub net_mac { return Net::MAC->new(mac => (shift)->mac) } + 1; diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm index 971ad10a..7790b9ae 100644 --- a/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeNbt.pm @@ -7,6 +7,8 @@ package App::Netdisco::DB::Result::NodeNbt; use strict; use warnings; +use Net::MAC; + use base 'DBIx::Class::Core'; __PACKAGE__->table("node_nbt"); __PACKAGE__->add_columns( diff --git a/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm b/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm index ef22c0fa..f5d2cf2b 100644 --- a/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm +++ b/Netdisco/lib/App/Netdisco/DB/Result/NodeWireless.pm @@ -7,6 +7,8 @@ package App::Netdisco::DB::Result::NodeWireless; use strict; use warnings; +use Net::MAC; + use base 'DBIx::Class::Core'; __PACKAGE__->table("node_wireless"); __PACKAGE__->add_columns( @@ -60,4 +62,12 @@ __PACKAGE__->belongs_to( node => 'App::Netdisco::DB::Result::Node', { 'foreign.mac' => 'self.mac' }, { join_type => 'LEFT' } ); +=head2 net_mac + +Returns the C column instantiated into a L object. + +=cut + +sub net_mac { return Net::MAC->new(mac => (shift)->mac) } + 1;