From f279bd5bbf8b9d28213d49685e3576cfc14eb6f6 Mon Sep 17 00:00:00 2001 From: Nick Hilliard Date: Fri, 8 Jul 2016 10:39:59 +0100 Subject: implement new screenscrape method in model --- lib/oxidized/model/junos.rb | 3 +-- lib/oxidized/model/model.rb | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'lib') 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 diff --git a/lib/oxidized/model/model.rb b/lib/oxidized/model/model.rb index 4a15a45..a2a71cb 100644 --- a/lib/oxidized/model/model.rb +++ b/lib/oxidized/model/model.rb @@ -154,6 +154,10 @@ module Oxidized data end + def screenscrape + @input.class.to_s.match(/Telnet/) || vars(:ssh_no_exec) + end + private def process_cmd_output output, name -- cgit v1.2.1