From f3290e25618ed89cf3a84325ee5b384b86f3c1bd Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sun, 2 Sep 2012 18:10:41 +0100
Subject: [PATCH] move DBIC virtual tables into Virtual:: namespace

---
 Changes                                                   | 6 ++++++
 Netdisco/lib/Netdisco/DB/Result/DevicePort.pm             | 8 ++++----
 Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm             | 4 ++--
 .../lib/Netdisco/DB/Result/{ => Virtual}/ActiveNode.pm    | 2 +-
 .../Netdisco/DB/Result/{ => Virtual}/ActiveNodeWithAge.pm | 4 ++--
 .../DB/Result/{ => Virtual}/DevicePortVlanNative.pm       | 2 +-
 .../DB/Result/{ => Virtual}/DevicePortVlanTagged.pm       | 2 +-
 .../lib/Netdisco/DB/Result/{ => Virtual}/NodeWithAge.pm   | 2 +-
 Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm          | 2 +-
 9 files changed, 19 insertions(+), 13 deletions(-)
 rename Netdisco/lib/Netdisco/DB/Result/{ => Virtual}/ActiveNode.pm (88%)
 rename Netdisco/lib/Netdisco/DB/Result/{ => Virtual}/ActiveNodeWithAge.pm (84%)
 rename Netdisco/lib/Netdisco/DB/Result/{ => Virtual}/DevicePortVlanNative.pm (87%)
 rename Netdisco/lib/Netdisco/DB/Result/{ => Virtual}/DevicePortVlanTagged.pm (87%)
 rename Netdisco/lib/Netdisco/DB/Result/{ => Virtual}/NodeWithAge.pm (92%)

diff --git a/Changes b/Changes
index d524485c..9be70f4e 100644
--- a/Changes
+++ b/Changes
@@ -1,3 +1,9 @@
+0.7 -
+
+  [ENHANCEMENTS]
+
+  * Move DBIC virtual tables into Virtual:: namespace.
+
 0.6 2012-08-28
 
   [NEW FEATURES]
diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm b/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm
index 64e200a7..2df25bb3 100644
--- a/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/DevicePort.pm
@@ -96,7 +96,7 @@ __PACKAGE__->has_many( nodes => 'Netdisco::DB::Result::Node',
   { 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.port' => 'self.port',
@@ -104,7 +104,7 @@ __PACKAGE__->has_many( nodes_with_age => 'Netdisco::DB::Result::NodeWithAge',
   { 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.port' => 'self.port',
@@ -112,7 +112,7 @@ __PACKAGE__->has_many( active_nodes => 'Netdisco::DB::Result::ActiveNode',
   { 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.port' => 'self.port',
@@ -144,7 +144,7 @@ port, where the VLANs are all tagged.
 
 =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.port' => 'self.port',
diff --git a/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm b/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm
index a6372a0a..55f4f3ab 100644
--- a/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/DeviceVlan.pm
@@ -53,7 +53,7 @@ Link relationship for C<tagging_ports>, see below.
 
 =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' },
 );
 
@@ -63,7 +63,7 @@ Link relationship to support C<native_ports>, see below.
 
 =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' },
 );
 
diff --git a/Netdisco/lib/Netdisco/DB/Result/ActiveNode.pm b/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm
similarity index 88%
rename from Netdisco/lib/Netdisco/DB/Result/ActiveNode.pm
rename to Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm
index 9ab87c56..3ff0b141 100644
--- a/Netdisco/lib/Netdisco/DB/Result/ActiveNode.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNode.pm
@@ -1,5 +1,5 @@
 use utf8;
-package Netdisco::DB::Result::ActiveNode;
+package Netdisco::DB::Result::Virtual::ActiveNode;
 
 use strict;
 use warnings;
diff --git a/Netdisco/lib/Netdisco/DB/Result/ActiveNodeWithAge.pm b/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm
similarity index 84%
rename from Netdisco/lib/Netdisco/DB/Result/ActiveNodeWithAge.pm
rename to Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm
index b7cafdc5..38b9f66a 100644
--- a/Netdisco/lib/Netdisco/DB/Result/ActiveNodeWithAge.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/Virtual/ActiveNodeWithAge.pm
@@ -1,10 +1,10 @@
 use utf8;
-package Netdisco::DB::Result::ActiveNodeWithAge;
+package Netdisco::DB::Result::Virtual::ActiveNodeWithAge;
 
 use strict;
 use warnings;
 
-use base 'Netdisco::DB::Result::ActiveNode';
+use base 'Netdisco::DB::Result::Virtual::ActiveNode';
 
 __PACKAGE__->load_components('Helper::Row::SubClass');
 __PACKAGE__->subclass;
diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlanNative.pm b/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm
similarity index 87%
rename from Netdisco/lib/Netdisco/DB/Result/DevicePortVlanNative.pm
rename to Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm
index 337923d8..0b11fc5f 100644
--- a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlanNative.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanNative.pm
@@ -1,5 +1,5 @@
 use utf8;
-package Netdisco::DB::Result::DevicePortVlanNative;
+package Netdisco::DB::Result::Virtual::DevicePortVlanNative;
 
 use strict;
 use warnings;
diff --git a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlanTagged.pm b/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm
similarity index 87%
rename from Netdisco/lib/Netdisco/DB/Result/DevicePortVlanTagged.pm
rename to Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm
index 40627cc3..4fe7c757 100644
--- a/Netdisco/lib/Netdisco/DB/Result/DevicePortVlanTagged.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/Virtual/DevicePortVlanTagged.pm
@@ -1,5 +1,5 @@
 use utf8;
-package Netdisco::DB::Result::DevicePortVlanTagged;
+package Netdisco::DB::Result::Virtual::DevicePortVlanTagged;
 
 use strict;
 use warnings;
diff --git a/Netdisco/lib/Netdisco/DB/Result/NodeWithAge.pm b/Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm
similarity index 92%
rename from Netdisco/lib/Netdisco/DB/Result/NodeWithAge.pm
rename to Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm
index 3759a05e..7d086ccc 100644
--- a/Netdisco/lib/Netdisco/DB/Result/NodeWithAge.pm
+++ b/Netdisco/lib/Netdisco/DB/Result/Virtual/NodeWithAge.pm
@@ -1,5 +1,5 @@
 use utf8;
-package Netdisco::DB::Result::NodeWithAge;
+package Netdisco::DB::Result::Virtual::NodeWithAge;
 
 use strict;
 use warnings;
diff --git a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm b/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm
index 5c3a525a..d2d62175 100644
--- a/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm
+++ b/Netdisco/lib/Netdisco/DB/ResultSet/DevicePort.pm
@@ -121,7 +121,7 @@ sub with_vlan_count {
     ->search({},
       {
         '+columns' => { tagged_vlans_count =>
-          $rs->result_source->schema->resultset('DevicePortVlanTagged')
+          $rs->result_source->schema->resultset('Virtual::DevicePortVlanTagged')
             ->search(
               {
                 'dpvt.ip' => { -ident => 'me.ip' },