oxidized 0.34.3 → 0.35.0

data/docs/Creating-Models.md

@@ -8,6 +8,10 @@ This methodology allows local site changes to be preserved during Oxidized versi
 
 ## Index
 - [Creating a new model](#creating-a-new-model)
+- [Typical Tasks and Solutions](#typical-tasks-and-solutions)
+  - [Handling 'enable' mode](#handling-enable-mode)
+  - [Remove ANSI escape codes](#remove-ansi-escape-codes)
+  - [Conditional commands](#conditional-commands)
 - [Extending an existing model with a new command](#extending-an-existing-model-with-a-new-command)
 - [Create unit tests for the model](#create-unit-tests-for-the-model)
 - [Advanced features](#advanced-features)
@@ -54,7 +58,9 @@ The API documentation contains a list of [methods](https://github.com/ytti/oxidi
 
 A more fleshed out example can be found in the `IOS` and `JunOS` models.
 
-### Common task: mechanism for handling 'enable' mode
+## Typical Tasks and Solutions
+
+### Handling 'enable' mode
 The following code snippet demonstrates how to handle sending the 'enable'
 command and an enable password.
 
@@ -74,31 +80,91 @@ need to enable privileged mode, either without providing a password (by setting
     end
   end
 ```
-Note: remove `:telnet, ` if your device does not support telnet.
-
-### Common Task: remove ANSI escape codes
-> :warning: This common task is experimental.
-> If it does not work for you, please open an issue so that we can adapt the
-> code snippet.
+Note: Remove `:telnet, ` if your device does not support telnet.
 
-Some devices produce ANSI escape codes to enhance the appearance of output.
+### Remove ANSI Escape Codes
+Some devices produce [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands)
+to enhance the appearance of their output.
 However, this can make prompt matching difficult and some of these ANSI escape
 codes might end up in the resulting configuration.
 
-You can remove most [ANSI escape codes](https://en.wikipedia.org/wiki/ANSI_escape_code#Control_Sequence_Introducer_commands) using the following Ruby
-code in your model:
+You can remove most ANSI escape codes by inserting the following line in your
+model:
+```ruby
+  clean :escape_codes
 ```
-  # Remove ANSI escape codes
-  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
-    data.gsub re, ''
+
+When using clean `:escape_codes`, you don't have to worry about escape codes 
+in your prompt regexp, as they will be removed before the prompt detection runs.
+
+If it doesn't work for your model, please open an issue and provide a
+[device simulation file](/docs/DeviceSimulation.md) so that we can adapt the
+code.
+
+### Conditional commands
+Some times, you have to run commands depending on the output of the device or
+a configured variable. For this, there are at least three solutions.
+
+#### Nested `cmd`
+You can nest `cmd` inside [`cmd` blocks](Ruby-API.md#cmd), the following example
+is taken from [nxos.rb](/lib/oxidized/model/nxos.rb):
+```ruby
+  cmd 'show inventory all' do |cfg|
+    if cfg.include? "% Invalid parameter detected at '^' marker."
+      # 'show inventory all' isn't supported on older versions (See Issue #3657)
+      cfg = cmd 'show inventory'
+    end
+    comment cfg
+  end
+```
+
+#### pre/post blocks
+After all the [`cmd` blocks](Ruby-API.md#cmd) have been run, the [`pre`
+and `post` blocks](Ruby-API.md#pre--post) are run. The following example is
+taken from [junos.rb](/lib/oxidized/model/junos.rb):
+```ruby
+  post do
+    out = String.new
+    case @model
+    when 'mx960'
+      out << cmd('show chassis fabric reachability') { |cfg| comment cfg }
+    when /^(ex22|ex3[34]|ex4|ex8|qfx)/
+      out << cmd('show virtual-chassis') { |cfg| comment cfg }
+    when /^srx/
+      out << cmd('show chassis cluster status') do |cfg|
+        cfg.lines.count <= 1 && cfg.include?("error:") ? String.new : comment(cfg)
+      end
+    end
+    out
+  end
+```
+
+In [pre/post blocks](Ruby-API.md#pre--post), you can also use dynamic generated
+commands, for example in [eatonnetwok.rb](/lib/oxidized/model/eatonnetwork.rb):
+```ruby
+  post do
+    cmd "save_configuration -p #{@node.auth[:password]}"
+  end
+```
+
+#### Conditional `cmd`
+The `cmd "string"` method for accepts a lambda function via the `:if` argument
+to execute the command only when the lambda evaluates to true.
+The lambda function is evaluated at runtime in the instance context.
+
+```ruby
+  cmd 'conditional command', if: lambda {
+    # Use lambda when multiple lines are needed
+    vars("condition")
+  } do |cfg|
+    @run_second_command = "go"
+    comment cfg
+  end
+
+  cmd 'second command', if: -> { @run_second_command == "go" } do |cfg|
+    comment cfg
   end
 ```
-Explanation of the Regular Expression:
-- `\e\[`   : Control Sequence Introducer (CSI), which starts with "ESC [".
-- `[0-?]*` : "Parameter" bytes (range 0x30–0x3F, corresponding to ASCII `0–9:;<=>?`).
-- `[ -\/]*`: "Intermediate" bytes (range 0x20–0x2F, corresponding to ASCII ` !"#$%&'()*+,-./`).
-- `[@-~]`  : The "final" byte (range 0x40–0x7E, corresponding to ASCII ``@A–Z[\]^_`a–z{|}~).[``).
-- `\r?`    : Some ESC codes include a carriage return, which we do not want in the resulting config.
 
 ## Extending an existing model with a new command
 

data/docs/Ruby-API.md

@@ -2,6 +2,34 @@
 
 The following objects exist in Oxidized.
 
+## Index
+- [Input](#input)
+  - [http](#http)
+- [Output](#output)
+- [Source](#source)
+- [Model](#model)
+  - [At the top level](#at-the-top-level)
+    - [cfg](#cfg)
+    - [cmd](#cmd)
+    - [comment](#comment)
+    - [prompt](#prompt)
+    - [expect](#expect)
+    - [pre / post](#pre--post)
+  - [At the second level](#at-the-second-level)
+    - [comment](#comment-1)
+    - [password](#password)
+    - [post_login](#post_login)
+    - [pre_logout](#pre_logout)
+    - [send](#send)
+    - [cmd](#cmd-1)
+  - [Monkey patching](#monkey-patching)
+    - [clear: true](#clear-true)
+    - [prepend: true](#prepend-true)
+  - [Refinements - String Convenience Methods](#refinements)
+    - [cut_tail](#cut_tail)
+    - [cut_head](#cut_head)
+    - [cut_both](#cut_both)
+
 ## Input
 
 * gets config from nodes
@@ -91,8 +119,28 @@ string.
 Execution order is `:all`, `:secret`, and lastly the command specific block, if
 given.
 
+The `cmd "string"` method for accepts a lambda function via the `:if` argument
+to execute the command only when the lambda evaluates to true.
+The lambda function is evaluated at runtime in the instance context.
+See [Conditional `cmd`](Creating-Models.md#conditional-cmd) for details.
+
 Supports [monkey patching](#monkey-patching).
 
+#### pre / post
+After all `cmd` have been run, the blocks defined in pre and post are called. The
+output of pre will be prepended to the output of the model, The output of post
+will be appended.
+
+```ruby
+  pre do
+    "Prepended output after cmd blocks have been run\n"
+  end
+
+  post do
+    "Appended output after cmd blocks have been run\n"
+  end
+```
+
 #### `comment`
 
 Called with a single string containing the string to prepend for comments in
@@ -161,6 +209,10 @@ Supports [monkey patching](#monkey-patching).
 Usually used inside `expect` or blocks passed to `post_login`/`pre_logout`.
 Takes a single parameter: a string to be sent to the device.
 
+#### `cmd`
+You can nest a `cmd` block inside first level blocks. It will be executed at
+runtime.
+
 ### Monkey patching
 
 Several model blocks accept behavior-modifying arguments that make monkey

data/docs/Supported-OS-Types.md

@@ -35,7 +35,7 @@
 |                    |FastIron                      |[fastiron](/lib/oxidized/model/fastiron.rb)
 |                    |IronWare                      |[ironware](/lib/oxidized/model/ironware.rb)
 |                    |NOS (Network Operating System)|[nos](/lib/oxidized/model/nos.rb)
-|                    |Vyatta                        |[vyatta](/lib/oxidized/model/vyatta.rb)
+|                    |Vyatta                        |[vyatta](/lib/oxidized/model/vyatta.rb)          |                 | Also used for Vyos <= 1.2.x, for newer versions use the VyOS model
 |                    |6910                          |[br6910](/lib/oxidized/model/br6910.rb)
 |                    |SLX-OS                        |[slxos](/lib/oxidized/model/slxos.rb)
 |Calix               |AXOS                          |[axos](/lib/oxidized/model/axos.rb)
@@ -146,6 +146,7 @@
 |OPNsense            |                              |[opnsense](/lib/oxidized/model/opnsense.rb)
 |Palo Alto           |PanOS API                     |[panos_api](/lib/oxidized/model/panos_api.rb)    |                 |[PanOS_API](Model-Notes/PanOS_API.md)
 |                    |PanOS                         |[panos](/lib/oxidized/model/panos.rb)
+|[Perle](https://www.perle.com)|IOLAN Console Servers|[perle](/lib/oxidized/model/perle.rb)           |@robertcheramy
 |PLANET SG/SGS Switches|                            |[planet](/lib/oxidized/model/planet.rb)
 |pfSense             |                              |[pfsense](/lib/oxidized/model/pfsense.rb)
 |Pure Storage        |PurityOS                      |[purityos](/lib/oxidized/model/purityos.rb)
@@ -180,6 +181,8 @@
 |VMWare              |NSX Edge (configuration)      |[nsxconfig](/lib/oxidized/model/nsxconfig.rb)
 |                    |NSX Edge (firewall rules)     |[nsxfirewall](/lib/oxidized/model/nsxfirewall.rb)
 |                    |NSX Distributed Firewall      |[nsxdfw](/lib/oxidized/model/nsxdfw.rb)
+|VYOS Networks       |VYOS                          |[vyos](/lib/oxidized/model/vyos.rb)
+|                 |Fork of Vyatta, tracking the supported versions (>= 1.4.x)
 |Watchguard          |Fireware OS                   |[firewareos](/lib/oxidized/model/firewareos.rb)
 |Westell             |Westell 8178G, Westell 8266G  |[weos](/lib/oxidized/model/weos.rb)
 |Yadro               |KornfeldOS                    |[kornfeldos](/lib/oxidized/model/kornfeldos.rb) 

data/extra/oxidized.runit

@@ -2,4 +2,4 @@
 [ ! -d /home/oxidized/.config/oxidized ] && mkdir -p /home/oxidized/.config/oxidized
 [ -f /home/oxidized/.config/oxidized/pid ] && rm /home/oxidized/.config/oxidized/pid
 chown -R oxidized:oxidized /home/oxidized/.config/oxidized
-exec setuser oxidized oxidized
+exec gosu oxidized oxidized

data/lib/oxidized/core.rb

@@ -40,7 +40,8 @@ module Oxidized
           '"extensions.oxidized-web" and remove "rest" from the configuration'
         )
         configuration = Oxidized.config.rest
-      elsif Oxidized.config.extensions['oxidized-web'].load?
+      elsif Oxidized.config.extensions &&
+            Oxidized.config.extensions['oxidized-web']&.load?
         # This comment stops rubocop complaining about Style/IfUnlessModifier
         configuration = Oxidized.config.extensions['oxidized-web']
       end

data/lib/oxidized/input/http.rb

@@ -48,8 +48,7 @@ module Oxidized
     private
 
     def get_http(path)
-      schema = @secure ? "https://" : "http://"
-      uri = URI("#{schema}#{@node.ip}#{path}")
+      uri = get_uri(path)
 
       logger.debug "Making request to: #{uri}"
 
@@ -93,5 +92,13 @@ module Oxidized
     def disconnect
       @log.close if Oxidized.config.input.debug?
     end
+
+    def get_uri(path)
+      path = URI.parse(path)
+      uri_class = @secure ? URI::HTTPS : URI::HTTP
+      uri_class.build(host:  @node.ip,
+                      path:  path.path,
+                      query: path.query)
+    end
   end
 end

data/lib/oxidized/input/scp.rb

@@ -34,7 +34,7 @@ module Oxidized
         verify_host_key:                 secure ? :always : :never,
         append_all_supported_algorithms: true,
         password:                        @node.auth[:password],
-        timeout:                         Oxidized.config.timeout,
+        timeout:                         @node.timeout,
         port:                            (vars(:ssh_port) || 22).to_i,
         forward_agent:                   false
       }
@@ -53,7 +53,7 @@ module Oxidized
 
     def cmd(file)
       logger.debug "SCP: #{file} @ #{@node.name}"
-      Timeout.timeout(Oxidized.config.timeout) do
+      Timeout.timeout(@node.timeout) do
         @ssh.scp.download!(file)
       end
     end
@@ -69,7 +69,7 @@ module Oxidized
     private
 
     def disconnect
-      Timeout.timeout(Oxidized.config.timeout) do
+      Timeout.timeout(@node.timeout) do
         @ssh.close
       end
     rescue Timeout::Error

data/lib/oxidized/input/ssh.rb

@@ -79,7 +79,7 @@ module Oxidized
     def disconnect
       disconnect_cli
       # if disconnect does not disconnect us, give up after timeout
-      Timeout.timeout(Oxidized.config.timeout) { @ssh.loop }
+      Timeout.timeout(@node.timeout) { @ssh.loop }
     rescue Errno::ECONNRESET, Net::SSH::Disconnect, IOError => e
       logger.debug 'The other side closed the connection while ' \
                    "disconnecting, raising #{e.class} with #{e.message}"
@@ -127,7 +127,7 @@ module Oxidized
     def expect(*regexps)
       regexps = [regexps].flatten
       logger.debug "Expecting #{regexps.inspect} at #{node.name}"
-      Timeout.timeout(Oxidized.config.timeout) do
+      Timeout.timeout(@node.timeout) do
         @ssh.loop(0.1) do
           sleep 0.1
           match = regexps.find { |regexp| @output.match regexp }
@@ -146,7 +146,7 @@ module Oxidized
         verify_host_key:                 secure ? :always : :never,
         append_all_supported_algorithms: true,
         password:                        @node.auth[:password],
-        timeout:                         Oxidized.config.timeout,
+        timeout:                         @node.timeout,
         port:                            (vars(:ssh_port) || 22).to_i,
         forward_agent:                   false
       }

data/lib/oxidized/input/telnet.rb

@@ -9,7 +9,7 @@ module Oxidized
 
     def connect(node) # rubocop:disable Naming/PredicateMethod
       @node    = node
-      @timeout = Oxidized.config.timeout
+      @timeout = @node.timeout
       @node.model.cfg['telnet'].each { |cb| instance_exec(&cb) }
       @log = File.open(Oxidized::Config::LOG + "/#{@node.ip}-telnet", 'w') if Oxidized.config.input.debug?
       port = vars(:telnet_port) || 23
@@ -84,7 +84,7 @@ module Net
       @log     = @options["Log"]
 
       expects  = [options[:expect]].flatten
-      time_out = options[:timeout] || @options["Timeout"] || Oxidized.config.timeout?
+      time_out = options[:timeout] || @options["Timeout"]
 
       Timeout.timeout(time_out) do
         line = ""

data/lib/oxidized/model/adva.rb

@@ -44,7 +44,7 @@ class ADVA < Oxidized::Model
 
     cmd 'show ports' do |cfg|
       cfg.each_line do |line|
-        port = line.match(/\|((access|network)[^\|]+)\|/)
+        port = line.match(/\|((access|network)[^|]+)\|/)
         ports << port if port
       end
     end

data/lib/oxidized/model/airfiber.rb

@@ -3,7 +3,7 @@ class Airfiber < Oxidized::Model
 
   # Ubiquiti Airfiber (tested with Airfiber 11FX)
 
-  prompt /^AF[\w\.-]+#/i
+  prompt /^AF[\w.-]+#/i
 
   cmd :all do |cfg|
     cfg.cut_both

data/lib/oxidized/model/aoscx.rb

@@ -1,25 +1,13 @@
 class Aoscx < Oxidized::Model
   using Refinements
+  # HPE Aruba Networking - ArubaOS-CX models
 
-  # previous command is repeated followed by "\eE", which sometimes ends up on last line
-  # ssh switches prompt may start with \r, followed by the prompt itself, regex ([\w\s.-]+[#>] ), which ends the line
-  # telnet switchs may start with various vt100 control characters, regex (\e\[24;[0-9][hH]), follwed by the prompt, followed
-  # by at least 3 other vt100 characters
-  prompt /(^\r|\e\[24;[0-9][hH])?([\w\s.-]+[#>] )($|(\e\[24;[0-9][0-9]?[hH]){3})/
+  prompt /^[\w\s.-]+[#>] $/
+  clean :escape_codes
 
   comment '! '
 
-  # replace next line control sequence with a new line
-  expect /(\e\[1M\e\[\??\d+(;\d+)*[A-Za-z]\e\[1L)|(\eE)/ do |data, re|
-    data.gsub re, "\n"
-  end
-
-  # replace all used vt100 control sequences
-  expect /\e\[\??\d+(;\d+)*[A-Za-z]/ do |data, re|
-    data.gsub re, ''
-  end
-
-  expect /Press any key to continue(\e\[\??\d+(;\d+)*[A-Za-z])*$/ do
+  expect /Press any key to continue$/ do
     send ' '
     ""
   end
@@ -30,13 +18,7 @@ class Aoscx < Oxidized::Model
   end
 
   cmd :all do |cfg|
-    cfg = cfg.cut_both
-    cfg = cfg.gsub /^\r/, ''
-    # Additional filtering for elder switches sending vt100 control chars via telnet
-    cfg.gsub! /\e\[\??\d+(;\d+)*[A-Za-z]/, ''
-    # Additional filtering for power usage reporting which obviously changes over time
-    cfg.gsub! /^(.*AC [0-9]{3}V\/?([0-9]{3}V)?) *([0-9]{1,3}) (.*)/, '\\1 <removed> \\4'
-    cfg
+    cfg.cut_both
   end
 
   cmd :secret do |cfg|
@@ -54,27 +36,30 @@ class Aoscx < Oxidized::Model
   end
 
   cmd 'show environment' do |cfg|
-    cfg.gsub! /^(LC.*\s+)\d+\s+$/, '\\1<hidden>'
-    cfg.gsub! /^(\d\/\d\/\d.*\s+)\d+\s+$/, '\\1<hidden>'
-    cfg.gsub! /^(\d+\/?\S+\s+\S+\s+)\d+\.\d+\s+C\s+(.*)/, '\\1<hidden>   \\2'
-    cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
-    # match show environment No speed shown for switches CX83xx, e.g. "PSU-1/1/1      N/A      N/A            N/A     front-to-back  ok      7360"
-    cfg.gsub! /^PSU(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max|N\/A)\s+(\S+\s+\S+\s+)\d+[[:blank:]]+/, '\\1<speed> \\3<rpm>'
-    cfg.gsub! /^(\S+\s+\S+\s+\s+\S+\s+)(slow|normal|medium|fast|max)\s+(\S+\s+\S+\s+)\d+[[:blank:]]+/, '\\1<speed> \\3<rpm>'
-    # match show environment power-consumption on VSF or standadlone, non-chassis and non-6400 switch, e.g. "2    6300M 48G 4SFP56 Swch                 156.00      155.94"
-    cfg.gsub! /^(\d+\s+.+\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})(\s+)(\s{2}\d{2}\.\d{2}|\s{1}\d{3}\.\d{2}|\d{4}\.\d{2})$/, '\\1<power>\\3<power>'
-    # match show environment power-consumption on 6400 or chassis switches, e.g. "1/4    line-card-module    R0X39A 6400 48p 1GbE CL4 PoE 4SFP56 Mod     54 W"
-    cfg.gsub! /^(\d+\/?\d*\s+.+\s+)(\s{1,4}\d{1,3})\sW\s*$/, '\\1<power>'
-    # match show environment power-consumption on 6400 or chassis switches, e.g. "Module Total Power Usage      13000 W", match up to a 5-digit number and keep table formatting.
-    cfg.gsub! /^(Module|Chassis)\s(Total\sPower\sUsage)(\s+)\s(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1 <power>'
-    # match show environment power-consumption on 6400 or chassis switches, e.g. "Chassis Total Power Usage     13000 W", match up to a 5-digit number and keep table formatting.
-    cfg.gsub! /^(Chassis\sTotal\sPower\sUsage)(\s+)(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1\\2<power>'
-    # match show environment power-consumption on 8400 or chassis switches, up to a 5-digit number, example matches:
-    # e.g. "Chassis Total Power Allocated (total of all max wattages)               4130 W"
-    # e.g. "Chassis Total Power Unallocated                                        15860 W"
-    cfg.gsub! /^(Chassis\sTotal\sPower\s)(Allocated|Unallocated)(\s|\s\(total of all max wattages\))(\s+)(\s{4}\d{1}|\s{3}\d{2}|\s{2}\d{3}|\s{1}\d{4}|\d{5})\sW\s*$/, '\\1\\2\\3\\4<power>'
-    # match Total Power Consumption:
-    cfg.gsub! /^([t|T]otal\s[p|P]ower\s[c|C]onsumption\s+)(\d+\.\d\d)$/, '\\1<power>'
+    def with_section(cfg, section, &block)
+      cfg.sub!(/(show environment #{section}.*?-{10,}\n)(.*?)(?=\nshow environment|\z)/m) do
+        header = ::Regexp.last_match(1)
+        content = ::Regexp.last_match(2)
+        block.call(content) if block_given?
+        header + content
+      end
+    end
+
+    with_section(cfg, 'fan') do |content|
+      content.gsub!(/^(.*)(slow|normal|medium|fast|max) (.*?)\d+ +$/, '\\1<speed> \\3<rpm>')
+    end
+
+    with_section(cfg, 'power-consumption') do |content|
+      content.gsub!(/^(.*?) (?:\d+\.\d+ +)+\d+\.\d+$/, '\\1 <power hidden>')
+    end
+
+    with_section(cfg, 'power-allocation') do |content|
+      content.gsub!(/^(.*) \d+ W$/, '\\1 <power>')
+    end
+
+    with_section(cfg, 'temperature') do |content|
+      content.gsub!(/^(.*) \d+\.\d+ C (.*)$/, '\\1 <hidden>\\2')
+    end
     comment cfg
   end
 

data/lib/oxidized/model/aosw.rb

@@ -13,7 +13,7 @@ class AOSW < Oxidized::Model
 
   comment '# '
   # see /spec/model/aosw_spec.rb for prompt examples
-  prompt /^\(?[\w\:.@-]+\)? ?[*^]?(\[[\w\/]+\] ?)?[#>] ?$/
+  prompt /^\(?[\w:.@-]+\)? ?[*^]?(\[[\w\/]+\] ?)?[#>] ?$/
 
   # Ignore cariage returns - also for the prompt
   expect "\r" do |data, re|

data/lib/oxidized/model/arubainstant.rb

@@ -4,7 +4,7 @@ class ArubaInstant < Oxidized::Model
   # Aruba IAP, Instant Controller
 
   comment '# '
-  prompt(/^ ?[\w\:.@-]+[#>] $/)
+  prompt(/^ ?[\w:.@-]+[#>] $/)
 
   cmd :all do |cfg|
     # Remove command echo and prompt
@@ -61,11 +61,23 @@ class ArubaInstant < Oxidized::Model
   cmd 'show aps' do |cfg|
     out = ''
     cfg.each_line do |line|
-      out += if line.match?(/^Name/)
-               line.sub(/^(Name +IP Address +).*(Type +IPv6 Address +).*(Serial #).*$/, '\1\2\3')
-             else
-               line.sub(/^(\S+ +\S+ +)(?:\S+ +){3}(\S+ +\S+ +)(?:\S+ +){2}(\S+) +.*$/, '\1\2\3')
-             end
+      out += line.sub(
+        /^(?'Name'(?:.+?|-{2,})\s{2,})  # \s{2,} = separator between columns
+          (?'IPv4'(?:
+            IP\ Address|-{2,}|          # Header
+            (?:\d+\.){3}\S+             # Match an IPv4 to catch AP-Names with two spaces
+          )\s{2,})
+          (?:(?:.+?|-{2,})\s{2,}){3}    # Ignore Mode, Spectrum, Clients
+          (?'Type'(?:.+?|-{2,})\s{2,})
+          (?'IPv6'(?:.+?|-{2,})\s{2,})
+          (?:(?:.+?|-{2,})\s{2,})       # Ignore Mesh Role
+          (?'Zone'(?:.+?|-{2,})\s{2,})
+          (?'Serial'(?:.+?|-{2,}))
+          \s{2,}                        # Last separator
+          .*$                           # Ignore the rest
+          /x,
+        '\k<Name>\k<IPv4>\k<Type>\k<IPv6>\k<Zone>\k<Serial>'
+      )
     end
     comment out + "\n"
   end

data/lib/oxidized/model/asternos.rb

@@ -1,7 +1,7 @@
 class AsterNOS < Oxidized::Model
   using Refinements
 
-  prompt /^[^\$]+\$/
+  prompt /^[^$]+\$/
   comment '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/axos.rb

@@ -1,7 +1,7 @@
 class AxOS < Oxidized::Model
   using Refinements
 
-  prompt /(\x1b\[\?7h)?([\w.@()-]+[#]\s?)$/
+  prompt /(\x1b\[\?7h)?([\w.@()-]+\#\s?)$/
   comment '! '
 
   cmd 'show running-config | nomore' do |cfg|

data/lib/oxidized/model/comtrol.rb

@@ -35,7 +35,7 @@ class Comtrol < Oxidized::Model
           expect /[pP]assword:\s?$/
           send vars(:enable) + "\n"
         end
-        expect /^.+[#]\s?$/
+        expect /^.+\#\s?$/
       end
     end
     pre_logout 'exit'

data/lib/oxidized/model/cumulus.rb

@@ -1,19 +1,14 @@
 class Cumulus < Oxidized::Model
   using Refinements
 
-  # Remove ANSI escape codes
-  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
-    data.gsub re, ''
-  end
-
-  # The prompt contains ANSI escape codes, which have already been removed
-  # from the expect call above
+  # Regular expression explanation:
   # ^                 : match begin of line, to have the most specific prompt
   # [\w.-]+@[\w.-]+   : user@hostname
   # (:mgmt)?          : optional when logged in out of band
   # :~[#$] $          : end of prompt, containing the linux path,
   #                     which is always "~" in our context
   prompt /^[\w.-]+@[\w.-]+(:mgmt)?:~[#$] $/
+  clean :escape_codes
   comment '# '
 
   # add a comment in the final conf

data/lib/oxidized/model/eatonnetwork.rb

@@ -54,6 +54,11 @@ class EatonNetwork < Oxidized::Model
     json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['primaryServer'].delete('secret')
     json['features']['userAndSessionManagement']['data']['settings']['all']['1.0']['radius']['1.0']['settings']['connectivity']['secondaryServer'].delete('secret')
 
+    # Added in frimware v2.2.0
+    json['features']['peripherals']['data']['dmeData']['ethernet']['ports'].each do |n|
+      n.dig('dot1x', 'peap', 'password') && n['dot1x']['peap'].delete('password')
+    end
+
     cfg = JSON.pretty_generate(json)
     cfg
   end

data/lib/oxidized/model/eltex.rb

@@ -3,7 +3,7 @@ class Eltex < Oxidized::Model
 
   # Tested with MES2324FB Version: 4.0.7.1 Build: 37 (master)
 
-  prompt /^\s?[\w.@\(\)-]+[#>]\s?$/
+  prompt /^\s?[\w.@()-]+[#>]\s?$/
   comment '! '
 
   cmd :all do |cfg|

data/lib/oxidized/model/enterasys800.rb

@@ -5,7 +5,7 @@ class Enterasys800 < Oxidized::Model
   # Tested with 08H20G4-24 Fast Ethernet Switch Firmware: Build 01.01.01.0017
   comment '# '
 
-  prompt /([\w \(:.@-]+[#>]\s?)$/
+  prompt /([\w (:.@-]+[#>]\s?)$/
 
   cfg :telnet do
     username /UserName:/

data/lib/oxidized/model/fabricos.rb

@@ -4,7 +4,7 @@ class FabricOS < Oxidized::Model
   # Brocade Fabric OS model #
   ## FIXME: Only ssh exec mode support, no telnet, no ssh screenscraping
 
-  prompt /^([\w]+:+[\w]+[>]\s)$/
+  prompt /^(\w+:+\w+>\s)$/
   comment '# '
 
   cmd 'chassisShow' do |cfg|

data/lib/oxidized/model/fsos.rb

@@ -41,7 +41,7 @@ class FSOS < Oxidized::Model
   cfg :telnet, :ssh do
     post_login 'enable'
     post_login 'terminal length 0'
-    post_login 'terminal width 512'
+    post_login 'terminal width 0'
     pre_logout 'exit'
     pre_logout 'exit'
   end

data/lib/oxidized/model/garderos.rb

@@ -4,13 +4,8 @@ class Garderos < Oxidized::Model
   # Routers for harsh environments
   # grs = Garderos Router Software
 
-  # Remove ANSI escape codes
-  expect /\e\[[0-?]*[ -\/]*[@-~]\r?/ do |data, re|
-    data.gsub re, ''
-  end
-
-  # the prompt does not need to match escape codes, as they have been removed above
   prompt /[\w-]+# /
+  clean :escape_codes
   comment '# '
 
   cmd :all do |cfg|

data/lib/oxidized/model/ironware.rb

@@ -36,7 +36,7 @@ class IronWare < Oxidized::Model
     cfg.gsub! /current speed is [A-Z-]{2,6} \(\d{2,3}%\)/, ''
     cfg.gsub! /Fan \d* - STATUS: OK \D*\d*./, '' # Fix for ADX Fan speed reporting
     cfg.gsub! /\d* deg C/, '' # Fix for ADX temperature reporting
-    cfg.gsub! /([\[]*)1([\]]*)<->([\[]*)2([\]]*)(<->([\[]*)3([\]]*))*/, ''
+    cfg.gsub! /(\[*)1(\]*)<->(\[*)2(\]*)(<->(\[*)3(\]*))*/, ''
     cfg.gsub! /\d+\.\d deg-C/, 'XX.X deg-C'
     if cfg.include? "TEMPERATURE"
       sc = StringScanner.new cfg