#882 option to display vlan names instead of numbers in device ports table

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

@@ -203,6 +203,26 @@ __PACKAGE__->might_have(
     }
 );
 
+=head2 native_vlan
+
+Returns the row from the C<device_vlan> table corresponding to the native
+vlan of this port.
+
+=cut
+
+__PACKAGE__->belongs_to(
+    native_vlan => 'App::Netdisco::DB::Result::DeviceVlan',
+    sub {
+        my $args = shift;
+        return {
+            "$args->{foreign_alias}.ip" =>
+              { '-ident' => "$args->{self_alias}.ip" },
+            "$args->{self_alias}.vlan" =>
+              { '=' => \"cast($args->{foreign_alias}.vlan as text)" }
+        };
+    },
+);
+
 =head2 agg_master
 
 Returns another row from the C<device_port> table if this port is slave

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

@@ -60,14 +60,14 @@ __PACKAGE__->belongs_to( port => 'App::Netdisco::DB::Result::DevicePort', {
     'foreign.ip' => 'self.ip', 'foreign.port' => 'self.port',
 });
 
-=head2 vlan
+=head2 vlan_entry
 
 Returns the entry from the C<device_vlan> table describing this VLAN in
 detail, typically in order that the C<name> can be retrieved.
 
 =cut
 
-__PACKAGE__->belongs_to( vlan => 'App::Netdisco::DB::Result::DeviceVlan', {
+__PACKAGE__->belongs_to( vlan_entry => 'App::Netdisco::DB::Result::DeviceVlan', {
     'foreign.ip' => 'self.ip', 'foreign.vlan' => 'self.vlan',
 });