powerconnect.rb in oxidized-0.25.0

- old
+ new

@@ -1,7 +1,7 @@
 class PowerConnect < Oxidized::Model
-  prompt /^([\w\s.@-]+[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
+  prompt /^([\w\s.@-]+(\(\S*\))?[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
 
   comment '! '
 
   expect /^\s*--More--\s+.*$/ do |data, re|
     send ' '
@@ -12,10 +12,11 @@
     cfg.each_line.to_a[1..-3].join
   end
 
   cmd :secret do |cfg|
     cfg.gsub! /^(username \S+ password (?:encrypted )?)\S+(.*)/, '\1<hidden>\2'
+    cfg.gsub! /^(tacacs-server key) \S+/, '\\1 <secret hidden>'
     cfg
   end
 
   cmd 'show version' do |cfg|
     if (@stackable.nil?)
@@ -38,12 +39,14 @@
     username /^User( Name)?:/
     password /^\r?Password:/
   end
 
   cfg :telnet, :ssh do
-    if vars :enable
-      post_login do
-        send "enable\n"
+    post_login do
+      if vars(:enable) == true
+        cmd "enable"
+      elsif vars(:enable)
+        cmd "enable", /^[pP]assword:/
         cmd vars(:enable)
       end
     end
 
     post_login "terminal datadump"