135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

implement ip/host search for node, and vendor column

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-08 15:24:18 +00:00
parent 0008ebeffd
commit daea7243be
6 changed files with 130 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Netdisco/lib/Netdisco/DB/Result/NodeIp.pm
View File

@@ -39,15 +39,25 @@ __PACKAGE__->set_primary_key("mac", "ip");
# Created by DBIx::Class::Schema::Loader v0.07015 @ 2012-01-07 14:20:02
# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:9+CuvuVWH88WxAf6IBij8g
__PACKAGE__->has_many( nodeips => 'Netdisco::DB::Result::NodeIp',
__PACKAGE__->belongs_to( oui => 'Netdisco::DB::Result::Oui',
sub {
my $args = shift;
return {
"$args->{foreign_alias}.oui" =>
{ '=' => \"substring(cast($args->{self_alias}.mac as varchar) for 8)" }
};
}
);
__PACKAGE__->has_many( node_ips => 'Netdisco::DB::Result::NodeIp',
{ 'foreign.mac' => 'self.mac' } );
__PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node',
{ 'foreign.mac' => 'self.mac' } );
sub tidy_nodeips {
sub ip_aliases {
my ($row, $archive) = @_;
return $row->nodeips(
return $row->node_ips(
{
ip => { '!=' => $row->ip },
($archive ? () : (active => 1)),
@@ -64,7 +74,7 @@ sub tidy_nodeips {
);
}
sub tidy_nodes {
sub node_sightings {
my ($row, $archive) = @_;
return $row->nodes(

40
Netdisco/lib/Netdisco/DB/ResultSet/NodeIp.pm
View File

@@ -1,24 +1,46 @@
package Netdisco::DB::ResultSet::NodeIp;
use base 'DBIx::Class::ResultSet';
my $search_attr = {
order_by => {'-desc' => 'time_last'},
columns => [qw/ mac ip dns active oui.company /],
'+select' => [
\"to_char(time_first, 'YYYY-MM-DD HH24:MI')",
\"to_char(time_last, 'YYYY-MM-DD HH24:MI')",
],
'+as' => [qw/ time_first time_last /],
join => 'oui'
};
sub by_ip {
my ($set, $ip, $archive) = @_;
my ($set, $archive, $ip) = @_;
return $set unless $ip;
my $op = '=';
if ('NetAddr::IP::Lite' eq ref $ip) {
$op = '<<=' if $ip->num > 1;
$ip = $ip->cidr;
}
return $set->search(
{
ip => $ip,
ip => { $op => $ip },
($archive ? () : (active => 1)),
},
$search_attr,
);
}
sub by_name {
my ($set, $archive, $name) = @_;
return $set unless $name;
return $set->search(
{
order_by => {'-desc' => 'time_last'},
columns => [qw/ mac ip dns active /],
'+select' => [
\"to_char(time_first, 'YYYY-MM-DD HH24:MI')",
\"to_char(time_last, 'YYYY-MM-DD HH24:MI')",
],
'+as' => [qw/ time_first time_last /],
dns => { '-ilike' => $name },
($archive ? () : (active => 1)),
},
$search_attr,
);
}