Merge remote-tracking branch 'ytti/master'

Conflicts:
	lib/oxidized/model/ironware.rb

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/oxidized/model/ironware.rb b/lib/oxidized/model/ironware.rb
index 870d45a..2975651 100644
--- a/lib/oxidized/model/ironware.rb
+++ b/lib/oxidized/model/ironware.rb
@@ -19,11 +19,6 @@ class IronWare < Oxidized::Model
     cfg.each_line.to_a[1..-2].join
   end
 
-  cmd 'show running-config' do |cfg|
-    arr = cfg.each_line.to_a
-    arr[3..-1].join unless arr.length < 3
-  end
-
   cmd 'show version' do |cfg|
     cfg.gsub! /(^((.*)[Ss]ystem uptime(.*))$)/, '' #remove unwanted line system uptime
     cfg.gsub! /[Uu]p\s?[Tt]ime is .*/,''
@@ -55,9 +50,15 @@ class IronWare < Oxidized::Model
   end
   
   cmd 'show module' do |cfg|
+    cfg.gsub! /^((Invalid input)|(Type \?)).*$/, '' # some ironware devices are fixed config
     comment cfg
   end
 
+  cmd 'show running-config' do |cfg|
+    arr = cfg.each_line.to_a
+    arr[3..-1].join unless arr.length < 3
+  end
+
   cfg :telnet do
     # match expected prompts on both older and newer
     # versions of IronWare