Merge pull request #4 from nopedial/work-flow

Update powerconnect.rb, catch errors in input.rbs and fix typos in ios.rb

2 files changed, 6 insertions, 7 deletions

diff --git a/lib/oxidized/model/ios.rb b/lib/oxidized/model/ios.rb
index 7da5ed2..3fcc7ae 100644
--- a/lib/oxidized/model/ios.rb
+++ b/lib/oxidized/model/ios.rb
@@ -11,7 +11,7 @@ class IOS < Oxidized::Model
   # non-preferred way to handle additional PW prompt
   #expect /^[\w.]+>$/ do |data|
   #  send "enable\n"
-  #  send CFG.passwords[:enable] + "\n"
+  #  send CFG.vars[:enable] + "\n"
   #  data
   #end
 
@@ -42,7 +42,7 @@ class IOS < Oxidized::Model
     # preferred way to handle additional passwords
     #post_login do
     #  send "enable\n"
-    #  send CFG.passwords[:enable] + "\n"
+    #  send CFG.vars[:enable] + "\n"
     #end
     pre_logout 'exit'
   end
diff --git a/lib/oxidized/model/powerconnect.rb b/lib/oxidized/model/powerconnect.rb
index 732245e..0dbd808 100644
--- a/lib/oxidized/model/powerconnect.rb
+++ b/lib/oxidized/model/powerconnect.rb
@@ -1,15 +1,14 @@
 class PowerConnect < Oxidized::Model
 
+  prompt /^([\w\s.@-]+[#>]\s?)$/ # allow spaces in hostname..dell does not limit it.. #
+
   comment  '! '
 
   cmd :all do |cfg|
     cfg.each_line.to_a[1..-3].join
   end
 
-  cmd 'show running-config' do |cfg|
-    cfg = cfg.each_line.to_a[3..-1].join
-    cfg
-  end
+  cmd 'show running-config'
 
   cmd 'show version' do |cfg|
     comment cfg
@@ -20,7 +19,7 @@ class PowerConnect < Oxidized::Model
   end
 
   cfg :telnet do
-    username /^User Name:/
+    username /^User( Name)?:/
     password /^\r?Password:/
   end