diff options
author | ytti <saku@ytti.fi> | 2016-01-04 18:50:54 +0200 |
---|---|---|
committer | ytti <saku@ytti.fi> | 2016-01-04 18:50:54 +0200 |
commit | 0eeba91b426c8b4a6335a88da9c65ba38e5fac15 (patch) | |
tree | 02ba46c4f7d43b5721f3eb7de38599e0e019e5cf /lib/oxidized/model/junos.rb | |
parent | f112dfa0c604ae1c990f6411a002806924c00bf3 (diff) | |
parent | e41f7b429901eb38ad785ad1fc2527dd41f35959 (diff) |
Merge pull request #250 from Shopify/master0.10.0
refactoring, test coverage and github hook
Diffstat (limited to 'lib/oxidized/model/junos.rb')
-rw-r--r-- | lib/oxidized/model/junos.rb | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb index 0e921d2..bb56481 100644 --- a/lib/oxidized/model/junos.rb +++ b/lib/oxidized/model/junos.rb @@ -3,7 +3,7 @@ class JunOS < Oxidized::Model comment '# ' def telnet - @input.class.to_s.match /Telnet/ + @input.class.to_s.match(/Telnet/) end cmd :all do |cfg| @@ -12,16 +12,16 @@ class JunOS < Oxidized::Model cfg.lines.map { |line| line.rstrip }.join("\n") + "\n" end - cmd :secret do |cfg| - cfg.gsub! /encrypted-password (\S+).*/, '<secret removed>' - cfg.gsub! /community (\S+) {/, 'community <hidden> {' + cmd :secret do |cfg| + cfg.gsub!(/encrypted-password (\S+).*/, '<secret removed>') + cfg.gsub!(/community (\S+) {/, 'community <hidden> {') cfg end cmd 'show configuration | display omit' cmd 'show version' do |cfg| - @model = $1 if cfg.match /^Model: (\S+)/ + @model = $1 if cfg.match(/^Model: (\S+)/) comment cfg end @@ -34,13 +34,11 @@ class JunOS < Oxidized::Model out end - cmd 'show chassis hardware' do |cfg| - comment cfg - end + cmd('show chassis hardware') { |cfg| comment cfg } cfg :telnet do - username /^login:/ - password /^Password:/ + username(/^login:/) + password(/^Password:/) end cfg :ssh do |