From 327a3c5e7fdd9e39799f39d5c4e49bf5e85adca4 Mon Sep 17 00:00:00 2001
From: Oliver Gorwits <oliver@cpan.org>
Date: Sat, 2 Nov 2013 19:20:46 +0000
Subject: [PATCH] Can now set untagged VLAN on trunking and non-trunking ports

---
 Netdisco/Changes                                              | 4 ++++
 Netdisco/Makefile.PL                                          | 2 +-
 .../lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Netdisco/Changes b/Netdisco/Changes
index 2438260c..44022776 100644
--- a/Netdisco/Changes
+++ b/Netdisco/Changes
@@ -1,5 +1,9 @@
 2.019004 -
 
+  [ENHANCEMENTS]
+
+  * Can now set untagged VLAN on trunking and non-trunking ports
+
   [BUG FIXES]
 
   * Set of Port Name (description) fixed to assume OK dialog response
diff --git a/Netdisco/Makefile.PL b/Netdisco/Makefile.PL
index 36ec9f23..6ef4292a 100644
--- a/Netdisco/Makefile.PL
+++ b/Netdisco/Makefile.PL
@@ -35,7 +35,7 @@ requires 'Plack::Middleware::Expires' => 0.03;
 requires 'Role::Tiny' => 1.002005;
 requires 'Socket6' => 0.23;
 requires 'Starman' => 0.4008;
-requires 'SNMP::Info' => 3.08;
+requires 'SNMP::Info' => 3.09;
 requires 'SQL::Translator' => 0.11016;
 requires 'Template' => 2.24;
 requires 'Template::Plugin::CSV' => 0.04;
diff --git a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
index 89f5ad16..76761cae 100644
--- a/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
+++ b/Netdisco/lib/App/Netdisco/Daemon/Worker/Interactive/PortActions.pm
@@ -41,7 +41,7 @@ sub set_vlan {
   return job_error("Cannot alter vlan: $vlan_reconfig_check")
     if $vlan_reconfig_check;
 
-  return _set_port_generic($job, 'vlan');
+  return _set_port_generic($job, 'untagged', 'vlan');
 }
 
 sub _set_port_generic {