diff options
| author | ytti <saku@ytti.fi> | 2016-07-09 22:59:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-09 22:59:13 +0300 |
| commit | 9e3f61aef032dfa1ee1233ceada437c00bdc697a (patch) | |
| tree | a0264f8b071a8c73f8a0cc5ec33fd57c68d65fa0 /lib/oxidized/model/junos.rb | |
| parent | c87e45c620ad6707dbf6361c05baa528c41afbb4 (diff) | |
| parent | f279bd5bbf8b9d28213d49685e3576cfc14eb6f6 (diff) | |
Merge pull request #491 from nickhilliard/master
strip trailing lines in junos model if ssh_no_exec enabled
Diffstat (limited to 'lib/oxidized/model/junos.rb')
| -rw-r--r-- | lib/oxidized/model/junos.rb | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/oxidized/model/junos.rb b/lib/oxidized/model/junos.rb index 6392709..a4fee6a 100644 --- a/lib/oxidized/model/junos.rb +++ b/lib/oxidized/model/junos.rb @@ -7,8 +7,7 @@ class JunOS < Oxidized::Model end cmd :all do |cfg| - # we don't need screen-scraping in ssh due to exec - cfg = cfg.lines.to_a[1..-2].join if telnet || !vars(:ssh_no_exec) + cfg = cfg.lines.to_a[1..-2].join if screenscrape cfg.lines.map { |line| line.rstrip }.join("\n") + "\n" end |