lib/oxidized/model/powerconnect.rb in oxidized-0.2.3 vs lib/oxidized/model/powerconnect.rb in oxidized-0.2.4

@@ -12,16 +12,18 @@
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-3].join
   end
 
   cmd 'show version' do |cfg|
-    comment cfg
+    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
+    comment cfg.join("\n") + "\n"
   end
 
   cmd 'show system' do |cfg|
-    cfg = cfg.each_line.take_while { |line| not line.match(/uptime/i) }
-    comment cfg.join "\n"
+    cfg = cfg.split("\n").select { |line| not line[/Up\sTime/] }
+    cfg = cfg[0..-28]<<" "
+    comment cfg.join("\n")
   end
 
   cmd 'show running-config'
 
   cfg :telnet do
@@ -29,11 +31,13 @@
     password /^\r?Password:/
   end
 
   cfg :telnet, :ssh do
     if vars :enable
-      send "enable\n"
-      send vars(:enable) + "\n"
+      post_login do
+        send "enable\n"
+        send vars(:enable) + "\n"
+      end
     end
 
     post_login "terminal length 0"
     pre_logout "logout"