rbeapi 1.0 → 1.1

data/lib/rbeapi/api/radius.rb

@@ -201,11 +201,11 @@ module Rbeapi
         when true
           cmds = 'default radius-server key'
         when false
-          if enable
-            cmds = "radius-server key #{key_format} #{value}"
-          else
-            cmds = 'no radius-server key'
-          end
+          cmds = if enable
+                   "radius-server key #{key_format} #{value}"
+                 else
+                   'no radius-server key'
+                 end
         end
         configure cmds
       end

data/lib/rbeapi/api/routemaps.rb

@@ -253,13 +253,13 @@ module Rbeapi
       #
       # @return [Array] Returns the prepared eos command.
       def name_commands(name, action, seqno, opts = {})
-        if opts[:default] == true
-          cmd = "default route-map #{name}"
-        elsif opts[:enable] == false
-          cmd = "no route-map #{name}"
-        else
-          cmd = "route-map #{name}"
-        end
+        cmd = if opts[:default] == true
+                "default route-map #{name}"
+              elsif opts[:enable] == false
+                "no route-map #{name}"
+              else
+                "route-map #{name}"
+              end
         cmd << " #{action}"
         cmd << " #{seqno}"
         [cmd]
@@ -305,7 +305,7 @@ module Rbeapi
           cmds = name_commands(name, action, seqno)
         else
           if opts[:match] && !opts[:match].is_a?(Array)
-            fail ArgumentError, 'opts match must be an Array'
+            raise ArgumentError, 'opts match must be an Array'
           end
           cmds = name_commands(name, action, seqno, opts)
           if opts[:description]
@@ -346,7 +346,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def remove_match_statements(name, action, seqno, cmds)
-        fail ArgumentError, 'cmds must be an Array' unless cmds.is_a?(Array)
+        raise ArgumentError, 'cmds must be an Array' unless cmds.is_a?(Array)
 
         entries = parse_entries(name)
         return nil unless entries
@@ -374,7 +374,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def remove_set_statements(name, action, seqno, cmds)
-        fail ArgumentError, 'cmds must be an Array' unless cmds.is_a?(Array)
+        raise ArgumentError, 'cmds must be an Array' unless cmds.is_a?(Array)
 
         entries = parse_entries(name)
         return nil unless entries
@@ -446,7 +446,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def set_match_statements(name, action, seqno, value)
-        fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+        raise ArgumentError, 'value must be an Array' unless value.is_a?(Array)
 
         cmds = ["route-map #{name} #{action} #{seqno}"]
         remove_match_statements(name, action, seqno, cmds)
@@ -473,7 +473,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def set_set_statements(name, action, seqno, value)
-        fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+        raise ArgumentError, 'value must be an Array' unless value.is_a?(Array)
 
         cmds = ["route-map #{name} #{action} #{seqno}"]
         remove_set_statements(name, action, seqno, cmds)

data/lib/rbeapi/api/snmp.rb

@@ -44,12 +44,14 @@ module Rbeapi
     #
     # @since eos_version 4.13.7M
     class Snmp < Entity
-      DEFAULT_SNMP_LOCATION = ''
-      DEFAULT_SNMP_CONTACT = ''
-      DEFAULT_SNMP_CHASSIS_ID = ''
-      DEFAULT_SNMP_SOURCE_INTERFACE = ''
+      DEFAULT_SNMP_LOCATION = ''.freeze
+      DEFAULT_SNMP_CONTACT = ''.freeze
+      DEFAULT_SNMP_CHASSIS_ID = ''.freeze
+      DEFAULT_SNMP_SOURCE_INTERFACE = ''.freeze
       CFG_TO_STATE = { 'default' => 'default', 'no' => 'off', nil => 'on' }
+                     .freeze
       STATE_TO_CFG = { 'default' => 'default', 'on' => nil, 'off' => 'no' }
+                     .freeze
 
       ##
       # get returns the snmp resource Hash that represents the nodes snmp

data/lib/rbeapi/api/stp.rb

@@ -146,7 +146,7 @@ module Rbeapi
     # spanning-tree instances in EOS
     #
     class StpInstances < Entity
-      DEFAULT_STP_PRIORITY = '32768'
+      DEFAULT_STP_PRIORITY = '32768'.freeze
 
       ##
       # get returns the specified stp instance config parsed from the nodes
@@ -263,11 +263,11 @@ module Rbeapi
         when true
           cmd = "default spanning-tree mst #{inst} priority"
         when false
-          if enable
-            cmd = "spanning-tree mst #{inst} priority #{value}"
-          else
-            cmd = "no spanning-tree mst #{inst} priority"
-          end
+          cmd = if enable
+                  "spanning-tree mst #{inst} priority #{value}"
+                else
+                  "no spanning-tree mst #{inst} priority"
+                end
         end
         configure cmd
       end
@@ -360,13 +360,13 @@ module Rbeapi
       #
       # @return [Hash<Symbol, Object>] Resource hash attribute.
       def parse_portfast_type(config)
-        if /spanning-tree portfast network/ =~ config
-          value = 'network'
-        elsif /no spanning-tree portfast/ =~ config
-          value = 'normal'
-        else
-          value = 'edge'
-        end
+        value = if /spanning-tree portfast network/ =~ config
+                  'network'
+                elsif /no spanning-tree portfast/ =~ config
+                  'normal'
+                else
+                  'edge'
+                end
         { portfast_type: value }
       end
       private :parse_portfast_type
@@ -423,7 +423,7 @@ module Rbeapi
       # @return [Boolean] True if the commands succeed otherwise False.
       def set_portfast_type(name, opts = {})
         value = opts[:value]
-        fail ArgumentError, 'value must be set' unless value
+        raise ArgumentError, 'value must be set' unless value
         enable = opts.fetch(:enable, true)
         default = opts[:default] || false
 
@@ -431,11 +431,11 @@ module Rbeapi
         when true
           cmds = "default spanning-tree portfast #{value}"
         when false
-          if enable
-            cmds = "spanning-tree portfast #{value}"
-          else
-            cmds = "no spanning-tree portfast #{value}"
-          end
+          cmds = if enable
+                   "spanning-tree portfast #{value}"
+                 else
+                   "no spanning-tree portfast #{value}"
+                 end
         end
         configure_interface(name, cmds)
       end
@@ -463,11 +463,11 @@ module Rbeapi
         when true
           cmds = 'default spanning-tree bpduguard'
         when false
-          if enable
-            cmds = 'spanning-tree bpduguard enable'
-          else
-            cmds = 'spanning-tree bpduguard disable'
-          end
+          cmds = if enable
+                   'spanning-tree bpduguard enable'
+                 else
+                   'spanning-tree bpduguard disable'
+                 end
         end
         configure_interface(name, cmds)
       end

data/lib/rbeapi/api/switchports.rb

@@ -85,6 +85,7 @@ module Rbeapi
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_mode(config)
         mdata = /(?<=\s{3}switchport\smode\s)(.+)$/.match(config)
+        return { mode: [] } unless defined? mdata[1]
         { mode: mdata[1] }
       end
       private :parse_mode
@@ -101,6 +102,7 @@ module Rbeapi
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_access_vlan(config)
         mdata = /(?<=access\svlan\s)(.+)$/.match(config)
+        return { access_vlan: [] } unless defined? mdata[1]
         { access_vlan: mdata[1] }
       end
       private :parse_access_vlan
@@ -117,6 +119,7 @@ module Rbeapi
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_trunk_native_vlan(config)
         mdata = /(?<=trunk\snative\svlan\s)(.+)$/.match(config)
+        return { trunk_native_vlan: [] } unless defined? mdata[1]
         { trunk_native_vlan: mdata[1] }
       end
       private :parse_trunk_native_vlan
@@ -154,7 +157,8 @@ module Rbeapi
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_trunk_groups(config)
         mdata = config.scan(/(?<=trunk\sgroup\s)(.+)$/)
-        mdata = mdata.flatten if mdata.length > 0
+        return { trunk_group: [] } unless defined? mdata[1]
+        mdata = mdata.flatten unless mdata.empty?
         { trunk_groups: mdata }
       end
       private :parse_trunk_groups
@@ -277,7 +281,9 @@ module Rbeapi
         default = opts[:default] || false
 
         if value
-          fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+          unless value.is_a?(Array)
+            raise ArgumentError, 'value must be an Array'
+          end
           value = value.map(&:inspect).join(',').tr('"', '')
         end
 
@@ -285,11 +291,11 @@ module Rbeapi
         when true
           cmds = 'default switchport trunk allowed vlan'
         when false
-          if !enable
-            cmds = 'no switchport trunk allowed vlan'
-          else
-            cmds = ["switchport trunk allowed vlan #{value}"]
-          end
+          cmds = if !enable
+                   'no switchport trunk allowed vlan'
+                 else
+                   ["switchport trunk allowed vlan #{value}"]
+                 end
         end
         configure_interface(name, cmds)
       end
@@ -370,7 +376,7 @@ module Rbeapi
         end
 
         value = opts.fetch(:value, [])
-        fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+        raise ArgumentError, 'value must be an Array' unless value.is_a?(Array)
 
         value = Set.new value
         current_value = Set.new get(name)[:trunk_groups]
@@ -385,7 +391,7 @@ module Rbeapi
         current_value.difference(value).each do |group|
           cmds << "no switchport trunk group #{group}"
         end
-        configure_interface(name, cmds) if cmds.length > 0
+        configure_interface(name, cmds) unless cmds.empty?
       end
     end
   end

data/lib/rbeapi/api/tacacs.rb

@@ -166,7 +166,7 @@ module Rbeapi
       def set_global_key(opts = {})
         format = opts[:key_format]
         key = opts[:key]
-        fail ArgumentError, 'key option is required' unless key
+        raise ArgumentError, 'key option is required' unless key
         result = api.config("tacacs-server key #{format} #{key}")
         result == [{}]
       end

data/lib/rbeapi/api/users.rb

@@ -149,7 +149,7 @@ module Rbeapi
       #
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_user_entry(user)
-        fail ArgumentError, 'user must be an Array' unless user.is_a?(Array)
+        raise ArgumentError, 'user must be an Array' unless user.is_a?(Array)
 
         hsh = {}
         hsh[:name] = user[0]
@@ -219,13 +219,13 @@ module Rbeapi
           # just return the value.
           enc = opts.fetch(:encryption, 'cleartext')
           unless @encryption_map[enc]
-            fail ArgumentError, "invalid encryption value: #{enc}"
+            raise ArgumentError, "invalid encryption value: #{enc}"
           end
           enc = @encryption_map[enc]
 
           unless opts[:secret]
-            fail ArgumentError,
-                 'secret must be specified if nopassword is false'
+            raise ArgumentError,
+                  'secret must be specified if nopassword is false'
           end
           cmd << " secret #{enc} #{opts[:secret]}"
         end

data/lib/rbeapi/api/varp.rb

@@ -207,7 +207,9 @@ module Rbeapi
         cmds = ["interface #{name}"]
 
         if value
-          fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+          unless value.is_a?(Array)
+            raise ArgumentError, 'value must be an Array'
+          end
         end
 
         case default
@@ -216,8 +218,10 @@ module Rbeapi
         when false
           cmds << 'no ip virtual-router address'
           if enable
-            fail ArgumentError,
-                 'no values for addresses provided' unless value
+            unless value
+              raise ArgumentError,
+                    'no values for addresses provided'
+            end
             value.each do |addr|
               cmds << "ip virtual-router address #{addr}"
             end

data/lib/rbeapi/api/vlans.rb

@@ -283,7 +283,7 @@ module Rbeapi
       def set_state(id, opts = {})
         value = opts[:value]
         unless ['active', 'suspend', nil].include?(value)
-          fail ArgumentError, 'state must be active, suspend or nil'
+          raise ArgumentError, 'state must be active, suspend or nil'
         end
 
         cmd = command_builder('state', opts)
@@ -360,7 +360,7 @@ module Rbeapi
         return configure(["vlan #{name}", 'no trunk group']) unless enable
 
         value = opts.fetch(:value, [])
-        fail ArgumentError, 'value must be an Array' unless value.is_a?(Array)
+        raise ArgumentError, 'value must be an Array' unless value.is_a?(Array)
 
         value = Set.new value
         current_value = Set.new get(name)[:trunk_groups]

data/lib/rbeapi/api/vrrp.rb

@@ -152,8 +152,8 @@ module Rbeapi
       #   address or nil if the value is not set.
       def parse_primary_ip(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} ip (\d+\.\d+\.\d+\.\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for primary_ip'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for primary_ip'
         else
           value = match[0][0]
         end
@@ -175,8 +175,8 @@ module Rbeapi
       #   <1-255> or nil if the value is not set.
       def parse_priority(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} priority (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for priority'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for priority'
         else
           value = match[0][0].to_i
         end
@@ -198,8 +198,8 @@ module Rbeapi
       #   is between <1-255> or nil if the value is not set.
       def parse_timers_advertise(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} timers advertise (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for timers advertise'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for timers advertise'
         else
           value = match[0][0].to_i
         end
@@ -221,11 +221,11 @@ module Rbeapi
       #   between <1-255> or nil if the value is not set.
       def parse_preempt(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} preempt$/)
-        if match.empty?
-          value = false
-        else
-          value = true
-        end
+        value = if match.empty?
+                  false
+                else
+                  true
+                end
         { preempt: value }
       end
       private :parse_preempt
@@ -243,11 +243,11 @@ module Rbeapi
       # @return [Hash<'enable', Boolean>]
       def parse_enable(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} shutdown$/)
-        if match.empty?
-          value = true
-        else
-          value = false
-        end
+        value = if match.empty?
+                  true
+                else
+                  false
+                end
         { enable: value }
       end
       private :parse_enable
@@ -289,11 +289,11 @@ module Rbeapi
       #   value is not set.
       def parse_description(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} description\s+(.*)\s*$/)
-        if match.empty?
-          value = nil
-        else
-          value = match[0][0]
-        end
+        value = if match.empty?
+                  nil
+                else
+                  match[0][0]
+                end
         { description: value }
       end
       private :parse_description
@@ -341,8 +341,8 @@ module Rbeapi
       #   value is not set.
       def parse_ip_version(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} ip version (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for ip version'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for ip version'
         else
           value = match[0][0].to_i
         end
@@ -367,7 +367,7 @@ module Rbeapi
         regex = "vrrp #{vrid} mac-address advertisement-interval"
         match = config.scan(/^\s+#{regex} (\d+)$/)
         if match.empty?
-          fail 'Did not get a default value for mac address ' \
+          raise 'Did not get a default value for mac address ' \
                'advertisement interval'
         else
           value = match[0][0].to_i
@@ -390,8 +390,8 @@ module Rbeapi
       #   value is not set.
       def parse_preempt_delay_min(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} preempt delay minimum (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for preempt delay minimum'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for preempt delay minimum'
         else
           value = match[0][0].to_i
         end
@@ -413,8 +413,8 @@ module Rbeapi
       #   value is not set.
       def parse_preempt_delay_reload(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} preempt delay reload (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for preempt delay reload'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for preempt delay reload'
         else
           value = match[0][0].to_i
         end
@@ -436,8 +436,8 @@ module Rbeapi
       #   value is not set.
       def parse_delay_reload(config, vrid)
         match = config.scan(/^\s+vrrp #{vrid} delay reload (\d+)$/)
-        if match.empty?
-          fail 'Did not get a default value for delay reload'
+        if match.empty? # rubocop:disable Style/GuardClause
+          raise 'Did not get a default value for delay reload'
         else
           value = match[0][0].to_i
         end
@@ -513,23 +513,23 @@ module Rbeapi
       # rubocop:disable Metrics/CyclomaticComplexity, Metrics/AbcSize,
       # rubocop:disable Metrics/PerceivedComplexity
       def create(name, vrid, opts = {})
-        fail ArgumentError, 'create has no options set' if opts.empty?
+        raise ArgumentError, 'create has no options set' if opts.empty?
 
         if opts[:secondary_ip] && !opts[:secondary_ip].is_a?(Array)
-          fail ArgumentError, 'opts secondary_ip must be an Array'
+          raise ArgumentError, 'opts secondary_ip must be an Array'
         end
 
         if opts[:track] && !opts[:track].is_a?(Array)
-          fail ArgumentError, 'opts track must be an Array'
+          raise ArgumentError, 'opts track must be an Array'
         end
 
         cmds = []
         if opts.key?(:enable)
-          if opts[:enable]
-            cmds << "no vrrp #{vrid} shutdown"
-          else
-            cmds << "vrrp #{vrid} shutdown"
-          end
+          cmds << if opts[:enable]
+                    "no vrrp #{vrid} shutdown"
+                  else
+                    "vrrp #{vrid} shutdown"
+                  end
         end
         cmds << "vrrp #{vrid} ip #{opts[:primary_ip]}" if opts.key?(:primary_ip)
         if opts.key?(:priority)
@@ -552,11 +552,11 @@ module Rbeapi
           cmds << "vrrp #{vrid} mac-address advertisement-interval #{val}"
         end
         if opts.key?(:preempt)
-          if opts[:preempt]
-            cmds << "vrrp #{vrid} preempt"
-          else
-            cmds << "no vrrp #{vrid} preempt"
-          end
+          cmds << if opts[:preempt]
+                    "vrrp #{vrid} preempt"
+                  else
+                    "no vrrp #{vrid} preempt"
+                  end
         end
         if opts.key?(:preempt_delay_min)
           val = opts[:preempt_delay_min]
@@ -642,10 +642,10 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_shutdown(name, vrid, opts = {})
-        fail 'set_shutdown has the value option set' if opts[:value]
+        raise 'set_shutdown has the value option set' if opts[:value]
         # Shutdown semantics are opposite of enable semantics so invert enable.
         enable = opts.fetch(:enable, true)
-        opts.merge!(enable: !enable)
+        opts[:enable] = !enable
         cmd = "vrrp #{vrid} shutdown"
         configure_interface(name, command_builder(cmd, opts))
       end
@@ -757,11 +757,11 @@ module Rbeapi
         vrrp = get(name)
         vrrp = [] if vrrp.nil?
 
-        if vrrp.key?(vrid)
-          current_addrs = Set.new vrrp[vrid][:secondary_ip]
-        else
-          current_addrs = Set.new []
-        end
+        current_addrs = if vrrp.key?(vrid)
+                          Set.new vrrp[vrid][:secondary_ip]
+                        else
+                          Set.new []
+                        end
 
         cmds = []
         # Add commands to delete any secondary IP addresses that are
@@ -921,7 +921,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_preempt(name, vrid, opts = {})
-        fail 'set_preempt has the value option set' if opts[:value]
+        raise 'set_preempt has the value option set' if opts[:value]
         cmd = "vrrp #{vrid} preempt"
         configure_interface(name, command_builder(cmd, opts))
       end
@@ -1038,22 +1038,22 @@ module Rbeapi
         tracks.each do |track|
           track.keys do |key|
             unless valid_keys.include?(key)
-              fail ArgumentError, 'Key: #{key} invalid in track hash'
+              raise ArgumentError, 'Key: #{key} invalid in track hash'
             end
           end
           unless track.key?(:name) && track.key?(:action)
-            fail ArgumentError, 'Must specify :name and :action in track hash'
+            raise ArgumentError, 'Must specify :name and :action in track hash'
           end
           unless track[:action] == 'decrement' || track[:action] == 'shutdown'
-            fail ArgumentError, "Action must be 'decrement' or 'shutdown'"
+            raise ArgumentError, "Action must be 'decrement' or 'shutdown'"
           end
           if track.key?(:amount) && track[:action] != 'decrement'
-            fail ArgumentError, "Action must be 'decrement' to set amount"
+            raise ArgumentError, "Action must be 'decrement' to set amount"
           end
           if track.key?(:amount)
             track[:amount] = track[:amount].to_i
             if track[:amount] < 0
-              fail ArgumentError, 'Amount must be greater than zero'
+              raise ArgumentError, 'Amount must be greater than zero'
             end
           end
         end
@@ -1066,11 +1066,11 @@ module Rbeapi
         vrrp = get(name)
         vrrp = [] if vrrp.nil?
 
-        if vrrp.key?(vrid)
-          current_tracks = Set.new vrrp[vrid][:track]
-        else
-          current_tracks = Set.new []
-        end
+        current_tracks = if vrrp.key?(vrid)
+                           Set.new vrrp[vrid][:track]
+                         else
+                           Set.new []
+                         end
 
         cmds = []
         # Add commands to delete any tracks that are