summaryrefslogtreecommitdiff
path: root/lib/oxidized/model
diff options
context:
space:
mode:
authorSamer Abdel-Hafez <samer@m247.com>2013-05-01 12:45:11 +0100
committerSamer Abdel-Hafez <samer@m247.com>2013-05-01 12:45:11 +0100
commit17a9fb3d013912eea2a1e834bc0480b677592d71 (patch)
tree8ce10918fa67cd0e66b173c581481be3809df6b1 /lib/oxidized/model
parentc252a589b6b0274a17bfe40db3fd57ebeea3beb8 (diff)
add latest changes
Diffstat (limited to 'lib/oxidized/model')
-rw-r--r--lib/oxidized/model/ios.rb4
-rw-r--r--lib/oxidized/model/powerconnect.rb9
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