oxidized 0.29.1 → 0.37.0

data/lib/oxidized/jobs.rb

@@ -44,6 +44,14 @@ module Oxidized
       @want = @max if @want > @max
     end
 
+    def increment
+      # Increments the job count if safe to do so, which means:
+      # a) less threads running than the total amount of nodes
+      # b) we want less than the max specified number of threads
+
+      @want = [(@want + 1), @nodes.size, @max].min
+    end
+
     def work
       # if   a) we want less or same amount of threads as we now running
       # and  b) we want less threads running than the total amount of nodes
@@ -51,7 +59,9 @@ module Oxidized
       # then we want one more thread (rationale is to fix hanging thread causing HOLB)
       return unless @want <= size && @want < @nodes.size
 
-      @want += 1 if (Time.now.utc - @last) > MAX_INTER_JOB_GAP
+      return unless @want <= size
+
+      increment if (Time.now.utc - @last) > MAX_INTER_JOB_GAP
     end
   end
 end

data/lib/oxidized/logger.rb

@@ -0,0 +1,51 @@
+require 'semantic_logger'
+
+module Oxidized
+  module Logger
+    include SemanticLogger::Loggable
+
+    def self.setup
+      config = Oxidized.config
+      FileUtils.mkdir_p(Config::LOG) unless File.directory?(Config::LOG)
+
+      SemanticLogger.add_signal_handler
+
+      if config.use_syslog?
+        SemanticLogger.add_appender(appender: :syslog)
+        logger.warn("The configuration 'use_syslog' is deprecated. " \
+                    "Remove it and use 'logger' instead")
+      elsif config.log?
+        SemanticLogger.add_appender(file_name: File.expand_path(config.log))
+        logger.warn("The configuration 'log' is deprecated. " \
+                    "Remove it and use 'logger' instead")
+      elsif config.logger?
+        SemanticLogger.default_level = config.logger.level if config.logger.level?
+        config.logger.appenders.each { |a| add_appender a } if config.logger.has_key?('appenders')
+      end
+
+      # No appenders configured
+      SemanticLogger.add_appender(io: $stderr) if SemanticLogger.appenders.empty?
+
+      return if %i[trace debug].include?(SemanticLogger.default_level)
+
+      SemanticLogger.default_level = :debug if config.debug?
+    end
+
+    def self.add_appender(appender)
+      case appender['type']
+      when 'file'
+        params = { file_name: File.expand_path(appender['file']) }
+      when 'stderr'
+        params = { io: $stderr }
+      when 'stdout'
+        params = { io: $stdout }
+      when 'syslog'
+        params = { appender: :syslog, application: "oxidized" }
+      else
+        raise InvalidConfig, "Unknown logger #{appender['type']}, edit #{Oxidized::Config.configfile}"
+      end
+      params[:level] = appender['level'] if appender.has_key?('level')
+      SemanticLogger.add_appender(**params)
+    end
+  end
+end

data/lib/oxidized/manager.rb

@@ -5,15 +5,16 @@ module Oxidized
   require 'oxidized/source/source'
   class Manager
     class << self
-      def load(dir, file)
+      def load(dir, file, namespace)
         require File.join dir, file + '.rb'
-        klass = nil
-        [Oxidized, Object].each do |mod|
-          klass   = mod.constants.find { |const| const.to_s.casecmp(file).zero? }
-          klass ||= mod.constants.find { |const| const.to_s.downcase == 'oxidized' + file.downcase }
-          klass   = mod.const_get klass if klass
-          break if klass
-        end
+
+        # Search the object to load in namespace
+        klass = namespace.constants.find { |const| const.to_s.casecmp(file).zero? }
+
+        return false unless klass
+
+        klass = namespace.const_get klass
+
         i = klass.new
         i.setup if i.respond_to? :setup
         { file => klass }
@@ -33,32 +34,32 @@ module Oxidized
     end
 
     def add_input(name)
-      loader @input, Config::InputDir, "input", name
+      loader @input, Config::INPUT_DIR, "input", name, Oxidized
     end
 
     def add_output(name)
-      loader @output, Config::OutputDir, "output", name
+      loader @output, Config::OUTPUT_DIR, "output", name, Oxidized::Output
     end
 
     def add_source(name)
-      loader @source, Config::SourceDir, "source", name
+      loader @source, Config::SOURCE_DIR, "source", name, Oxidized::Source
     end
 
     def add_model(name)
-      loader @model, Config::ModelDir, "model", name
+      loader @model, Config::MODEL_DIR, "model", name, Object
     end
 
     def add_hook(name)
-      loader @hook, Config::HookDir, "hook", name
+      loader @hook, Config::HOOK_DIR, "hook", name, Object
     end
 
     private
 
     # if local version of file exists, load it, else load global - return falsy value if nothing loaded
-    def loader(hash, global_dir, local_dir, name)
-      dir   = File.join(Config::Root, local_dir)
-      map   = Manager.load(dir, name) if File.exist? File.join(dir, name + ".rb")
-      map ||= Manager.load(global_dir, name)
+    def loader(hash, global_dir, local_dir, name, namespace)
+      dir   = File.join(Config::ROOT, local_dir)
+      map   = Manager.load(dir, name, namespace) if File.exist? File.join(dir, name + ".rb")
+      map ||= Manager.load(global_dir, name, namespace)
       hash.merge!(map) if map
     end
   end

data/lib/oxidized/model/acos.rb

@@ -20,6 +20,7 @@ class ACOS < Oxidized::Model
     cfg.gsub! /\s(Memory).*/, ' \\1 <removed>'
     cfg.gsub! /\s(Current time is).*/, ' \\1 <removed>'
     cfg.gsub! /\s(The system has been up).*/, ' \\1 <removed>'
+    cfg.gsub! /\s(Hardware: \d+ CPUs\(Stepping \d+\). Single \d+G drive. Free storage is).*/, ' \\1 <removed>'
     comment cfg
   end
 
@@ -72,7 +73,7 @@ class ACOS < Oxidized::Model
         out << "! partition: #{partition}"
         arules.each do |name|
           cmd("show aflex #{name} partition #{partition}") do |cfg|
-            content = cfg.split(/Content:/).last.strip
+            content = cfg.split("Content:").last.strip
             out << "aflex create #{name}"
             out << content
             out << ".\n"

data/lib/oxidized/model/addpack.rb

@@ -0,0 +1,26 @@
+class AddPack < Oxidized::Model
+  # Used in AddPack Voip, such as AP100B, AP100_G2, AP700, AP1000, AP1100F
+
+  using Refinements
+  PROMPT = /^.*[>#]\s?$/
+
+  expect /-- [Mm]ore --/ do |data, re|
+    send ' '
+    data.sub re, ''
+  end
+
+  prompt PROMPT
+  cmd 'enable'
+
+  cmd 'show running-config' do |cfg|
+    cfg.gsub! /^Building configuration.../, ''
+    cfg.gsub! /^*show running-config/, ''
+    cfg.gsub! PROMPT, ''
+    cfg
+  end
+
+  cfg :telnet do
+    username /[Ll]ogin:\s?/
+    password /[Pp]assword:\s?/
+  end
+end

data/lib/oxidized/model/adtran.rb

@@ -14,7 +14,11 @@ class Adtran < Oxidized::Model
     cfg
   end
 
-  cmd 'show running-config'
+  cmd 'show running-config' do |cfg|
+    # Strip out line at the top which displays the current date/time
+    # ! Created                         : Mon Jun 26 2023 10:07:07
+    cfg.gsub! /! Createds+:.*\n/, ''
+  end
 
   cfg :ssh do
     if vars :enable

data/lib/oxidized/model/adva.rb

@@ -6,7 +6,7 @@
 class ADVA < Oxidized::Model
   using Refinements
 
-  prompt /\w+\-+[#>]\s?$/
+  prompt /\w+-+[#>]\s?$/
   comment '# '
 
   cmd :secret do |cfg|
@@ -18,7 +18,7 @@ class ADVA < Oxidized::Model
     cfg.cut_both
   end
 
-  cmd 'show running-config current' do |cfg|
+  cmd 'show running-config delta' do |cfg|
     cfg.each_line.reject { |line| line.match /^Preparing configuration file.*/ }.join
   end
 
@@ -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/aos7.rb

@@ -4,6 +4,8 @@ class AOS7 < Oxidized::Model
   # Alcatel-Lucent Operating System Version 7 (Linux based)
   # used in OmniSwitch 6900/10k
 
+  prompt /^([\w.@-]+ ?[#>]\s?)$/
+
   comment  '! '
 
   cmd :all do |cfg, cmdstring|
@@ -24,14 +26,23 @@ class AOS7 < Oxidized::Model
   end
 
   cmd 'show hardware-info' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n\n/, "\n\n"
     comment cfg
   end
 
   cmd 'show running-directory' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n/, "\n"
     comment cfg
   end
 
   cmd 'show configuration snapshot' do |cfg|
+    # Remove extra lines occuring when the command runs slow
+    cfg.gsub! /^Please wait...\n/, ''
+    cfg.gsub! /^\n\n/, "\n"
     cfg
   end
 

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,19 +18,15 @@ 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|
+    cfg.gsub! /^(user .* group .*(?: ciphertext)?) \S+/, '\\1 <secret hidden>'
     cfg.gsub! /^(snmp-server community) \S+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(snmp-server host \S+) \S+(.*)/, '\\1 <secret hidden> \\2'
-    cfg.gsub! /^(radius-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
+    cfg.gsub! /^(snmpv3 user).*?(auth (?:md5|sha(?:\d{1,3})?) auth-pass ciphertext).*?(priv (?:des|aes(?:\d{1,3})?) priv-pass ciphertext).*/, '\\1 <user> \\2 <auth-pass> \\3 <priv-pass>'
+    cfg.gsub! /^(radius-server host \S+ key(?: ciphertext)?) \S+ (.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(radius-server key).*/, '\\1 <configuration removed>'
     cfg.gsub! /^(tacacs-server host \S+ key) \S+(.*)/, '\\1 <secret hidden> \\2'
     cfg.gsub! /^(tacacs-server key).*/, '\\1 <secret hidden>'
@@ -53,11 +37,32 @@ class Aoscx < Oxidized::Model
     comment cfg
   end
 
+  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
+
   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(.*)/, '\\1<hidden>\\2'
-    cfg.gsub! /^(LC.*\s+)\d+\.\d+\s+(C.*)$/, '\\1 <hidden> \\2'
+    with_section(cfg, 'fan') do |content|
+      content.gsub!(/^((?:\S+ +){3})(slow  |normal|medium|fast  |max   |N\/A   ) (.*?)\d+ +$/, '\\1<speed> \\3<rpm>')
+    end
+
+    with_section(cfg, 'power-consumption') do |content|
+      content.gsub!(/^(.*?) (?:\d+\.\d+ +)+\d+\.\d+$/, '\\1 <power hidden>')
+      content.gsub!(/^(Total Power Consumption +)\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
 
@@ -69,7 +74,10 @@ class Aoscx < Oxidized::Model
     comment cfg
   end
 
-  cmd 'show system | exclude "Up Time" | exclude "CPU" | exclude "Memory"' do |cfg|
+  cmd 'show system' do |cfg|
+    cfg = cfg.reject_lines [
+      "Up Time", "CPU", "Memory", /Pkts .x/, "Lowest", "Missed"
+    ]
     comment cfg
   end
 

data/lib/oxidized/model/aosw.rb

@@ -12,69 +12,79 @@ class AOSW < Oxidized::Model
   # All IAPs connected to a Instant Controller will have the same config output. Only the controller needs to be monitored.
 
   comment '# '
-  prompt /^([\w\(:.@-]+(\)?\s?)[#>]\s?)$/
+  # see /spec/model/aosw_spec.rb for prompt examples
+  prompt /^\(?[\w:.@-]+\)? ?[*^]?(\[[\w\/]+\] ?)?[#>] ?$/
+
+  # Ignore cariage returns - also for the prompt
+  expect "\r" do |data, re|
+    data.gsub re, ''
+  end
 
   cmd :all do |cfg|
     cfg.cut_both
   end
 
   cmd :secret do |cfg|
-    cfg.gsub!(/secret (\S+)$/, 'secret <secret removed>')
-    cfg.gsub!(/enable secret (\S+)$/, 'enable secret <secret removed>')
-    cfg.gsub!(/PRE-SHARE (\S+)$/, 'PRE-SHARE <secret removed>')
-    cfg.gsub!(/ipsec (\S+)$/, 'ipsec <secret removed>')
-    cfg.gsub!(/community (\S+)$/, 'community <secret removed>')
+    cfg.gsub!(/secret (\S+)\s?$/, 'secret <secret removed>')
+    cfg.gsub!(/enable secret (\S+)\s?$/, 'enable secret <secret removed>')
+    cfg.gsub!(/PRE-SHARE (\S+)\s?$/, 'PRE-SHARE <secret removed>')
+    cfg.gsub!(/ipsec (\S+)\s?$/, 'ipsec <secret removed>')
+    cfg.gsub!(/community (\S+)\s?$/, 'community <secret removed>')
     cfg.gsub!(/ sha (\S+)/, ' sha <secret removed>')
     cfg.gsub!(/ des (\S+)/, ' des <secret removed>')
     cfg.gsub!(/mobility-manager (\S+) user (\S+) (\S+)/, 'mobility-manager \1 user \2 <secret removed>')
-    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
-    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?$/, 'mgmt-user \1 <secret removed> \3') # IAP
+    cfg.gsub!(/mgmt-user (\S+) (root|guest-provisioning|network-operations|read-only|location-api-mgmt) (\S+)\s?$/, 'mgmt-user \1 \2 <secret removed>') # MAS & Wireless Controler
+    cfg.gsub!(/mgmt-user (\S+) (\S+)( (read-only|guest-mgmt))?\s?$/, 'mgmt-user \1 <secret removed> \3') # IAP
     # MAS format: mgmt-user <username> <accesslevel> <password hash>
     # IAP format (root user): mgmt-user <username> <password hash>
     # IAP format: mgmt-user <username> <password hash> <access level>
-    cfg.gsub!(/key (\S+)$/, 'key <secret removed>')
-    cfg.gsub!(/wpa-passphrase (\S+)$/, 'wpa-passphrase <secret removed>')
-    cfg.gsub!(/bkup-passwords (\S+)$/, 'bkup-passwords <secret removed>')
-    cfg.gsub!(/user (\S+) (\S+) (\S+)$/, 'user \1 <secret removed> \3')
-    cfg.gsub!(/virtual-controller-key (\S+)$/, 'virtual-controller-key <secret removed>')
+    cfg.gsub!(/key (\S+)\s?$/, 'key <secret removed>')
+    cfg.gsub!(/vrrp-passphrase (\S+)\s?$/, 'vrrp-passphrase <secret removed>')
+    cfg.gsub!(/wpa-passphrase (\S+)\s?$/, 'wpa-passphrase <secret removed>')
+    cfg.gsub!(/bkup-passwords (\S+)\s?$/, 'bkup-passwords <secret removed>')
+    cfg.gsub!(/ap-console-password (\S+)\s?$/, 'ap-console-password <secret removed>')
+    cfg.gsub!(/virtual-controller-key (\S+)\s?$/, 'virtual-controller-key <secret removed>')
     cfg
   end
 
   cmd 'show version' do |cfg|
-    cfg = cfg.each_line.reject { |line| line.match(/(Switch|AP) uptime/i) || line.match(/Reboot Time and Cause/i) }
-    rstrip_cfg comment cfg.join
+    cfg = cfg.reject_lines [
+      /(Switch|AP) uptime/i,
+      /Reboot Time and Cause/i
+    ]
+    rstrip_cfg comment cfg
   end
 
   cmd 'show inventory' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg clean cfg
   end
 
   cmd 'show slots' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
   cmd 'show license' do |cfg|
-    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg =~ /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
   cmd 'show license passphrase' do |cfg|
-    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/ # Don't show for unsupported devices (IAP and MAS)
+    # Don't show for unsupported devices (IAP and MAS)
+    cfg = "" if cfg.match /(Invalid input detected at '\^' marker|Parse error)/
     rstrip_cfg comment cfg
   end
 
   cmd 'show running-config' do |cfg|
-    out = []
-    cfg.each_line do |line|
-      next if line =~ /^controller config \d+$/
-      next if line =~ /^Building Configuration/
-
-      out << line.strip
-    end
-    out = out.join "\n"
-    out << "\n"
+    cfg = cfg.reject_lines [
+      /^controller config \d+$/,
+      /^Building Configuration/
+    ]
+    rstrip_cfg cfg
   end
 
   cfg :telnet do
@@ -111,7 +121,7 @@ class AOSW < Oxidized::Model
       next if line =~ /Output \d Config/i
       next if line =~ /(Tachometers|Temperatures|Voltages)/
       next if line =~ /((Card|CPU) Temperature|Chassis Fan|VMON1[0-9])/
-      next if line =~ /[0-9]+\s+(RPMS?|m?V|C)/i
+      next if line =~ /[0-9.]{1,6}\s+(RPMS?|m?V|C|W)/i
 
       out << line.strip
     end

data/lib/oxidized/model/apc_aos.rb

@@ -1,10 +1,15 @@
 class Apc_aos < Oxidized::Model # rubocop:disable Naming/ClassAndModuleCamelCase
   using Refinements
 
+  comment '; '
+
   cmd 'config.ini' do |cfg|
-    cfg.gsub! /^; Configuration file, generated on.*/, ''
+    logger.warn "Apc_aos is deprecated, use ApcAos instead."
+
+    cfg.gsub!(/^; Configuration file, generated on.*\n/, '')
+    cfg
   end
 
-  cfg :ftp do
+  cfg :ftp, :scp do
   end
 end

data/lib/oxidized/model/apcaos.rb

@@ -0,0 +1,39 @@
+class ApcAos < Oxidized::Model
+  using Refinements
+
+  # Prompt can be short (apc>) or long (username@apc>)
+  prompt /^(:?\S+@)?apc>/
+  comment '; '
+
+  def clean(cfg)
+    cfg = cfg.cut_both(2, 1)
+    cfg.gsub("\r", "")
+  end
+
+  cmd 'about', input: :ssh do |cfg|
+    cfg = clean(cfg)
+    cfg = cfg.reject_lines [/^Management Uptime: /, /^Date: /, /^Time: /]
+    comment cfg
+  end
+
+  cmd 'upsabout', input: :ssh do |cfg|
+    cfg = clean(cfg)
+    comment cfg
+  end
+
+  cmd 'detstatus -ss', input: :ssh do |cfg|
+    cfg = clean(cfg)
+    comment cfg
+  end
+
+  cmd 'config.ini', input: %i[scp ftp] do |cfg|
+    cfg = cfg.reject_lines [/^; Configuration file, generated on /]
+    "; ========== config.ini ==========\n" + cfg
+  end
+
+  inputs [:ssh, %i[scp ftp]]
+
+  cfg :ssh do
+    pre_logout 'exit'
+  end
+end

data/lib/oxidized/model/aricentiss.rb

@@ -2,6 +2,10 @@
 # #show version
 # Switch ID       Hardware Version                Firmware Version
 # 0               SSE-G48-TG4   (P2-01)           1.0.16-9
+# and
+# # show version
+# Switch ID       Hardware Version                Firmware Version
+# 0               MBM-XEM-002  (B6-01)            2.1.3-25
 
 class AricentISS < Oxidized::Model
   using Refinements
@@ -13,6 +17,9 @@ class AricentISS < Oxidized::Model
     # 1.0.18-15 is known to include the corrected spelling
     post_login 'no cli pagination'
     post_login 'no cli pagignation'
+    # Starting firmware 2.0, pagination is done differently.
+    # This configuration is reset after the session ends.
+    post_login 'conf t; set cli pagination off; exit'
     pre_logout 'exit'
   end
 
@@ -30,7 +37,7 @@ class AricentISS < Oxidized::Model
   cmd 'show system information' do |cfg|
     cfg.sub! /^Device Up Time.*\n/, ''
     cfg.delete! "\r"
-    comment(cfg).gsub(/ +$/, '')
+    comment(cfg).rstrip
   end
 
   cmd 'show running-config' do |cfg|
@@ -46,6 +53,6 @@ class AricentISS < Oxidized::Model
       end
 
       l
-    end.join.gsub(/ +$/, '')
+    end.join.rstrip
   end
 end