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

move DBIC virtual tables into Virtual:: namespace

Browse Source
This commit is contained in:
Oliver Gorwits
2012-09-02 18:10:41 +01:00
parent fe120bb127
commit f3290e2561
9 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Changes
View File

@@ -1,3 +1,9 @@
0.7 -
[ENHANCEMENTS]
* Move DBIC virtual tables into Virtual:: namespace.
0.6 2012-08-28 0.6 2012-08-28
[NEW FEATURES] [NEW FEATURES]

8
Netdisco/lib/Netdisco/DB/Result/DevicePort.pm
View File

@@ -96,7 +96,7 @@ __PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node',
{ join_type => 'LEFT' }, { join_type => 'LEFT' },
); );
__PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::NodeWithAge', __PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::Virtual::NodeWithAge',
{ {
'foreign.switch' => 'self.ip', 'foreign.switch' => 'self.ip',
'foreign.port' => 'self.port', 'foreign.port' => 'self.port',
@@ -104,7 +104,7 @@ __PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::NodeWithAge',
{ join_type => 'LEFT' }, { join_type => 'LEFT' },
); );
__PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::ActiveNode', __PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::Virtual::ActiveNode',
{ {
'foreign.switch' => 'self.ip', 'foreign.switch' => 'self.ip',
'foreign.port' => 'self.port', 'foreign.port' => 'self.port',
@@ -112,7 +112,7 @@ __PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::ActiveNode',
{ join_type => 'LEFT' }, { join_type => 'LEFT' },
); );
__PACKAGE__->has_many( active_nodes_with_age => 'Netdisco::DB::Result::ActiveNodeWithAge', __PACKAGE__->has_many( active_nodes_with_age => 'Netdisco::DB::Result::Virtual::ActiveNodeWithAge',
{ {
'foreign.switch' => 'self.ip', 'foreign.switch' => 'self.ip',
'foreign.port' => 'self.port', 'foreign.port' => 'self.port',
@@ -144,7 +144,7 @@ port, where the VLANs are all tagged.
=cut =cut
__PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::DevicePortVlanTagged', __PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::Virtual::DevicePortVlanTagged',
{ {
'foreign.ip' => 'self.ip', 'foreign.ip' => 'self.ip',
'foreign.port' => 'self.port', 'foreign.port' => 'self.port',

4
Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm
View File

@@ -53,7 +53,7 @@ Link relationship for C<tagging_ports>, see below.
=cut =cut
__PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::DevicePortVlanTagged', __PACKAGE__->has_many( port_vlans_tagged => 'Netdisco::DB::Result::Virtual::DevicePortVlanTagged',
{ 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' }, { 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' },
); );
@@ -63,7 +63,7 @@ Link relationship to support C<native_ports>, see below.
=cut =cut
__PACKAGE__->has_many( port_vlans_native => 'Netdisco::DB::Result::DevicePortVlanNative', __PACKAGE__->has_many( port_vlans_native => 'Netdisco::DB::Result::Virtual::DevicePortVlanNative',
{ 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' }, { 'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan' },
); );

2
Netdisco/lib/Netdisco/DB/Result/ActiveNode.pm → Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm
View File

@@ -1,5 +1,5 @@
use utf8; use utf8;
package Netdisco::DB::Result::ActiveNode; package Netdisco::DB::Result::Virtual::ActiveNode;
use strict; use strict;
use warnings; use warnings;

4
Netdisco/lib/Netdisco/DB/Result/ActiveNodeWithAge.pm → Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm
View File

@@ -1,10 +1,10 @@
use utf8; use utf8;
package Netdisco::DB::Result::ActiveNodeWithAge; package Netdisco::DB::Result::Virtual::ActiveNodeWithAge;
use strict; use strict;
use warnings; use warnings;
use base 'Netdisco::DB::Result::ActiveNode'; use base 'Netdisco::DB::Result::Virtual::ActiveNode';
__PACKAGE__->load_components('Helper::Row::SubClass'); __PACKAGE__->load_components('Helper::Row::SubClass');
__PACKAGE__->subclass; __PACKAGE__->subclass;

2
Netdisco/lib/Netdisco/DB/Result/DevicePortVlanNative.pm → Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm
View File

@@ -1,5 +1,5 @@
use utf8; use utf8;
package Netdisco::DB::Result::DevicePortVlanNative; package Netdisco::DB::Result::Virtual::DevicePortVlanNative;
use strict; use strict;
use warnings; use warnings;

2
Netdisco/lib/Netdisco/DB/Result/DevicePortVlanTagged.pm → Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm
View File

@@ -1,5 +1,5 @@
use utf8; use utf8;
package Netdisco::DB::Result::DevicePortVlanTagged; package Netdisco::DB::Result::Virtual::DevicePortVlanTagged;
use strict; use strict;
use warnings; use warnings;

2
Netdisco/lib/Netdisco/DB/Result/NodeWithAge.pm → Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm
View File

@@ -1,5 +1,5 @@
use utf8; use utf8;
package Netdisco::DB::Result::NodeWithAge; package Netdisco::DB::Result::Virtual::NodeWithAge;
use strict; use strict;
use warnings; use warnings;

2
Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm
View File

@@ -121,7 +121,7 @@ sub with_vlan_count {
->search({}, ->search({},
{ {
'+columns' => { tagged_vlans_count => '+columns' => { tagged_vlans_count =>
$rs->result_source->schema->resultset('DevicePortVlanTagged') $rs->result_source->schema->resultset('Virtual::DevicePortVlanTagged')
->search( ->search(
{ {
'dpvt.ip' => { -ident => 'me.ip' }, 'dpvt.ip' => { -ident => 'me.ip' },