rbeapi 1.0 → 1.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1dc55f02164a2136033dc85beedb95892b9c4123
+  data.tar.gz: 834b6277842521fb9fbfd47a00364dd1ac30457b
+SHA512:
+  metadata.gz: 6af640792253a287f6fc05cb940e1783c06c767d1bb592a61497e35a2c0b6db59ce5d11b0d26178219797d33554c5626e68506a0173ce1f9a43ee4fc73325442
+  data.tar.gz: 7571e8a5ebe5cb10b0f0c77f5c2011958d3f5cfeea568d5542a13d3cc56edb1ae30309dba4053bffe5ecc83b49bb252168554ae0ba3c60cbd5f06f8fef7e1d8a

data/.rubocop.yml

@@ -19,3 +19,6 @@ Metrics/AbcSize:
 
 Metrics/ClassLength:
   Max: 130
+
+Metrics/BlockLength:
+  Enabled: False

data/CHANGELOG.md

@@ -1,7 +1,28 @@
 # Change Log
 
-## [1.0](https://github.com/arista-eosplus/rbeapi/tree/1.0) (2016-09-22)
-[Full Changelog](https://github.com/arista-eosplus/rbeapi/compare/v0.5.1...1.0)
+## [1.1](https://github.com/arista-eosplus/rbeapi/tree/1.1) (2016-12-06)
+[Full Changelog](https://github.com/arista-eosplus/rbeapi/compare/v1.0...1.1)
+
+**Implemented enhancements:**
+
+- add subinterface functionality [\#161](https://github.com/arista-eosplus/rbeapi/pull/161) ([mmailand](https://github.com/mmailand))
+- add support to set aliases [\#160](https://github.com/arista-eosplus/rbeapi/pull/160) ([mmailand](https://github.com/mmailand))
+- added support for setting the crypto in managementdefaults [\#159](https://github.com/arista-eosplus/rbeapi/pull/159) ([mmailand](https://github.com/mmailand))
+- added support for autostate [\#158](https://github.com/arista-eosplus/rbeapi/pull/158) ([mmailand](https://github.com/mmailand))
+- add support for multi/single-line prefix list output [\#155](https://github.com/arista-eosplus/rbeapi/pull/155) ([mrvinti](https://github.com/mrvinti))
+
+**Fixed bugs:**
+
+- Fix multiline alias support [\#165](https://github.com/arista-eosplus/rbeapi/pull/165) ([jerearista](https://github.com/jerearista))
+- extend and fix ospf features [\#156](https://github.com/arista-eosplus/rbeapi/pull/156) ([rknaus](https://github.com/rknaus))
+
+**Merged pull requests:**
+
+- Style updates for Rubocop 0.45 [\#163](https://github.com/arista-eosplus/rbeapi/pull/163) ([jerearista](https://github.com/jerearista))
+- fix for rspec failure on current develop [\#162](https://github.com/arista-eosplus/rbeapi/pull/162) ([mmailand](https://github.com/mmailand))
+
+## [v1.0](https://github.com/arista-eosplus/rbeapi/tree/v1.0) (2016-09-26)
+[Full Changelog](https://github.com/arista-eosplus/rbeapi/compare/v0.5.1...v1.0)
 
 **Implemented enhancements:**
 
@@ -24,6 +45,8 @@
 
 **Merged pull requests:**
 
+- Release 1.0 [\#153](https://github.com/arista-eosplus/rbeapi/pull/153) ([jerearista](https://github.com/jerearista))
+- Release 1.0 [\#152](https://github.com/arista-eosplus/rbeapi/pull/152) ([jerearista](https://github.com/jerearista))
 - Add json option to get\_config [\#151](https://github.com/arista-eosplus/rbeapi/pull/151) ([jerearista](https://github.com/jerearista))
 - Handle more multiline config commands [\#150](https://github.com/arista-eosplus/rbeapi/pull/150) ([jerearista](https://github.com/jerearista))
 - Ensure get\_config, running\_config, and startup\_config return sane output [\#149](https://github.com/arista-eosplus/rbeapi/pull/149) ([jerearista](https://github.com/jerearista))

data/Gemfile

@@ -1,5 +1,9 @@
 source ENV['GEM_SOURCE'] || 'https://rubygems.org'
 
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+require 'rbeapi/version'
+
 gem 'inifile'
 gem 'net_http_unix'
 gem 'netaddr'
@@ -12,20 +16,20 @@ group :development do
 end
 
 group :development, :test do
+  gem 'ci_reporter_rspec', require: false
   gem 'listen', '<=3.0.3'
+  gem 'pry',                     require: false
+  gem 'pry-doc',                 require: false
+  gem 'pry-stack_explorer', require: false
   gem 'rake', '~> 10.1.0'
+  gem 'rbeapi', Rbeapi::VERSION, path: '.'
+  gem 'redcarpet', '~> 3.1.2'
   gem 'rspec', '~> 3.0.0'
   gem 'rspec-mocks', '~> 3.0.0'
   gem 'simplecov'
-  gem 'yard'
-  gem 'redcarpet', '~> 3.1.2'
-  gem 'pry',                     require: false
-  gem 'pry-doc',                 require: false
-  gem 'pry-stack_explorer',      require: false
-  gem 'rbeapi', '1.0', path: '.'
-  gem 'ci_reporter_rspec',       require: false
   gem 'simplecov-json',          require: false
   gem 'simplecov-rcov',          require: false
+  gem 'yard'
 end
 
 # Rubocop > 0.37 requires a gem that only works with ruby 2.x
@@ -35,6 +39,8 @@ if RUBY_VERSION.to_f < 2.0
     gem 'rubocop', '>=0.35.1', '< 0.38'
   end
 else
+  # Rubocop thinks these are duplicates.
+  # rubocop:disable Bundler/DuplicatedGem
   gem 'json'
   group :development, :test do
     gem 'rubocop', '>=0.35.1'

data/Rakefile

@@ -9,13 +9,14 @@ end
 
 RPM_OPTS = '--define "_topdir %(pwd)/rpmbuild" --define "_builddir ' \
   '%{_topdir}" --define "_rpmdir %(pwd)/rpms" --define "_srcrpmdir ' \
-  '%{_rpmdir}" --define "_sourcedir  %(pwd)" --define "_specdir %(pwd)" -bb'
+  '%{_rpmdir}" --define "_sourcedir  %(pwd)" --define "_specdir %(pwd)" '\
+  '-bb'.freeze
 desc 'Generate regular and puppet-enterprise rbeapi RPMs for EOS'
 task rpm: :build do
   system "sed -e 's/^Version:.*/Version: #{Rbeapi::VERSION}/g' " \
     'rbeapi.spec.tmpl > rbeapi.spec'
   system "rpmbuild #{RPM_OPTS} rbeapi.spec"
-  RPMS = `find rpms/noarch -name "*rbeapi*rpm"`
+  RPMS = `find rpms/noarch -name "*rbeapi*rpm"`.freeze
   puts "\n################################################\n#"
   puts "Created the following in rpms/noarch/\n#{RPMS}"
   puts "#\n################################################\n\n"
@@ -32,7 +33,7 @@ task :inifile do
   system "sed -e 's/^Version:.*/Version: #{INIFILE_VERSION}/g' " \
     'gems/inifile/inifile.spec.tmpl > gems/inifile/inifile.spec'
   system "rpmbuild #{RPM_OPTS} gems/inifile/inifile.spec"
-  RPMS = `find rpms/noarch -name "*inifile*rpm"`
+  RPMS = `find rpms/noarch -name "*inifile*rpm"`.freeze
   puts "\n################################################\n#"
   puts "Created the following in rpms/noarch/\n#{RPMS}"
   puts "#\n################################################\n\n"
@@ -50,7 +51,7 @@ task :net_http_unix do
     'gems/net_http_unix/net_http_unix.spec.tmpl > ' \
     'gems/net_http_unix/net_http_unix.spec'
   system "rpmbuild #{RPM_OPTS} gems/net_http_unix/net_http_unix.spec"
-  RPMS = `find rpms/noarch -name "*net_http_unix*rpm"`
+  RPMS = `find rpms/noarch -name "*net_http_unix*rpm"`.freeze
   puts "\n################################################\n#"
   puts "Created the following in rpms/noarch/\n#{RPMS}"
   puts "#\n################################################\n\n"
@@ -67,7 +68,7 @@ task :netaddr do
   system "sed -e 's/^Version:.*/Version: #{NETADDR_VERSION}/g' " \
     'gems/netaddr/netaddr.spec.tmpl > gems/netaddr/netaddr.spec'
   system "rpmbuild #{RPM_OPTS} gems/netaddr/netaddr.spec"
-  RPMS = `find rpms/noarch -name "*netaddr*rpm"`
+  RPMS = `find rpms/noarch -name "*netaddr*rpm"`.freeze
   puts "\n################################################\n#"
   puts "Created the following in rpms/noarch/\n#{RPMS}"
   puts "#\n################################################\n\n"
@@ -114,7 +115,7 @@ end
 desc 'Generate SWIX files from RPMs'
 task swix: :all_rpms do
   SWIX = 'PYTHONPATH=${PYTHONPATH}:/nfs/misc/tools/swix \
-          /nfs/misc/tools/swix/swix'
+          /nfs/misc/tools/swix/swix'.freeze
   system "(cd rpms/noarch;
           rm -f rbeapi-#{Rbeapi::VERSION}-1.swix;
           #{SWIX} create rbeapi-#{Rbeapi::VERSION}-1.swix \
@@ -141,7 +142,7 @@ task swix: :all_rpms do
           rubygem-inifile-puppet-aio-3.0.0-5.eos4.noarch.rpm \
           rubygem-netaddr-puppet-aio-1.5.1-4.eos4.noarch.rpm \
           rubygem-net_http_unix-puppet-aio-0.2.2-5.eos4.noarch.rpm)"
-  SWIXS = `find rpms/noarch -name "rbeapi*swix" -ls`
+  SWIXS = `find rpms/noarch -name "rbeapi*swix" -ls`.freeze
   puts "\n################################################\n#"
   puts "The following artifacts are in rpms/noarch/\n#{SWIXS}"
   puts "#\n################################################\n\n"

data/lib/rbeapi/api/alias.rb

@@ -0,0 +1,160 @@
+#
+## Copyright (c) 2016, Arista Networks, Inc.
+## All rights reserved.
+##
+## Redistribution and use in source and binary forms, with or without
+## modification, are permitted provided that the following conditions are
+## met:
+##
+##   Redistributions of source code must retain the above copyright notice,
+##   this list of conditions and the following disclaimer.
+##
+##   Redistributions in binary form must reproduce the above copyright
+##   notice, this list of conditions and the following disclaimer in the
+##   documentation and/or other materials provided with the distribution.
+##
+##   Neither the name of Arista Networks nor the names of its
+##   contributors may be used to endorse or promote products derived from
+##   this software without specific prior written permission.
+##
+## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL ARISTA NETWORKS
+## BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+## CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+## SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+## BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+## WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+## OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+## IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+##
+require 'rbeapi/api'
+
+##
+# Rbeapi toplevel namespace.
+module Rbeapi
+  ##
+  # Api is module namespace for working with the EOS command API.
+  module Api
+    ##
+    # The Alias class manages aliass entries on an EOS node.
+    class Alias < Entity
+      ##
+      # get returns the current alias configuration hash extracted from the
+      # nodes running configuration.
+      #
+      # @example
+      #   {
+      #     alias: array<strings>
+      #   }
+      #
+      # @return [Hash<Symbol, Object>] Returns the alias resource as a hash
+      #   object from the nodes current configuration.
+      def get(name)
+        # Complex regex handles the following cases:
+        #  All aliases start with 'alian <name>' followed by
+        #    <space><single-line command>
+        #    <carriage return><multiple lines of commands>
+        pattern = /^alias #{name}((?:(?= )(?:.+?)(?=\n)|\n(?:.+?)(?=\n\!)))/m
+        aliases = config.scan(pattern)
+        return nil unless aliases[0]
+        parse_alias_entry(name, aliases[0])
+      end
+
+      ##
+      # getall returns a collection of alias resource hashes from the nodes
+      # running configuration. The alias resource collection hash is keyed
+      # by the unique alias name.
+      #
+      # @example
+      #   [
+      #     <alias>: {
+      #       command: <string>
+      #     },
+      #     <alias>: {
+      #       command: <string>
+      #     },
+      #     ...
+      #   ]
+      #
+      # @return [Hash<Symbol, Object>] Returns a hash that represents the
+      #   entire alias collection from the nodes running configuration.  If
+      #   there are no aliass configured, this method will return an empty
+      #   hash.
+      def getall
+        entries = config.scan(/^alias (\w+)(.+)?/)
+        entries.inspect
+        response = {}
+        entries.each do |aliases|
+          response[aliases[0]] = get aliases[0]
+        end
+        response
+      end
+
+      ##
+      # parse_alias_entry maps the tokens found to the hash entries.
+      #
+      # @api private
+      #
+      # @param alias [Array] An array of values returned from the regular
+      #   expression scan of the aliass configuration.
+      #
+      # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
+      def parse_alias_entry(name, command)
+        hsh = {}
+        hsh[:name] = name
+        com = command[0]
+        hsh[:command] = com.strip
+        hsh
+      end
+      private :parse_alias_entry
+
+      ##
+      # create will create a alias entry in the nodes current
+      # configuration with the specified address.
+      #
+      # @since eos_version 4.13.7M
+      #
+      # ===Commands
+      #   alias <name> <address>
+      #
+      # @param name [String] The name of the alias.
+      #
+      # @param opts [hash] Optional keyword arguments.
+      #
+      # @option opts command [String] Configures the alias ip address
+      #
+      # @return [Boolean] Returns true if the command completed successfully.
+      def create(name, opts = {})
+        raise ArgumentError, 'a command must be provided' unless \
+            opts[:command] =~ /.+/
+        command = opts.fetch(:command)
+        cmd = ["alias #{name} "]
+        if command =~ /\\n/
+          command.split('\\n').each { |a| cmd << a }
+        else
+          cmd[0] << command
+        end
+        configure(cmd)
+      end
+
+      ##
+      # delete will delete an existing alias entry from the nodes current
+      # running configuration. If the delete method is called and the alias
+      # entry does not exist, this method will succeed.
+      #
+      # @since eos_version 4.13.7M
+      #
+      # ===Commands
+      #   no alias <name>
+      #
+      # @param name [String] The alias name entry to delete from the node.
+      #
+      # @return [Boolean] Returns true if the command completed successfully.
+      def delete(name)
+        configure("no alias #{name}")
+      end
+    end
+  end
+end

data/lib/rbeapi/api/bgp.rb

@@ -227,7 +227,7 @@ module Rbeapi
       def create(bgp_as, opts = {})
         if opts[:maximum_ecmp_paths] && !opts[:maximum_paths]
           message = 'maximum_paths must be set if maximum_ecmp_paths is set'
-          fail ArgumentError, message
+          raise ArgumentError, message
         end
         cmds = ["router bgp #{bgp_as}"]
         if opts.key?(:enable)
@@ -284,7 +284,7 @@ module Rbeapi
       # @return [Boolean] Returns true if the command complete successfully.
       def configure_bgp(cmd)
         config = get_block('^router bgp .*')
-        fail 'BGP router is not configured' unless config
+        raise 'BGP router is not configured' unless config
         bgp_as = Bgp.parse_bgp_as(config)
         cmds = ["router bgp #{bgp_as[:bgp_as]}", cmd]
         configure(cmds)
@@ -341,10 +341,10 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_shutdown(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
         value = !opts[:enable]
-        opts.merge!(enable: value)
+        opts[:enable] = value
         configure_bgp(command_builder('shutdown', opts))
       end
 
@@ -697,7 +697,7 @@ module Rbeapi
       # @return [Boolean] Returns true if the command complete successfully.
       def configure_bgp(cmd)
         config = get_block('^router bgp .*')
-        fail 'BGP router is not configured' unless config
+        raise 'BGP router is not configured' unless config
         bgp_as = Bgp.parse_bgp_as(config)
         cmds = ["router bgp #{bgp_as[:bgp_as]}", cmd]
         configure(cmds)
@@ -831,10 +831,10 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_shutdown(name, opts = {})
-        fail 'set_shutdown has value option set' if opts[:value]
+        raise 'set_shutdown has value option set' if opts[:value]
         # Shutdown semantics are opposite of enable semantics so invert enable.
         value = !opts[:enable]
-        opts.merge!(enable: value)
+        opts[:enable] = value
         configure_bgp(neigh_command_builder(name, 'shutdown', opts))
       end
 
@@ -859,7 +859,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_send_community(name, opts = {})
-        fail 'send_community has the value option set' if opts[:value]
+        raise 'send_community has the value option set' if opts[:value]
         configure_bgp(neigh_command_builder(name, 'send-community', opts))
       end
 
@@ -885,7 +885,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command complete successfully.
       def set_next_hop_self(name, opts = {})
-        fail 'set_next_hop_self has the value option set' if opts[:value]
+        raise 'set_next_hop_self has the value option set' if opts[:value]
         configure_bgp(neigh_command_builder(name, 'next-hop-self', opts))
       end
 

data/lib/rbeapi/api/dns.rb

@@ -213,7 +213,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
         end
 
         cmds = []

data/lib/rbeapi/api/interfaces.rb

@@ -55,6 +55,7 @@ module Rbeapi
       #     name: <string>,
       #     type: <string>,
       #     description: <string>,
+      #     encapsulation: <integer>,
       #     shutdown: <boolean>
       #   }
       #
@@ -77,6 +78,7 @@ module Rbeapi
       #       name: <string>,
       #       type: <string>,
       #       description: <string>,
+      #       encapsulation: <integer>,
       #       shutdown: <boolean>,
       #       ...
       #     },
@@ -84,6 +86,7 @@ module Rbeapi
       #       name: <string>,
       #       type: <string>,
       #       description: <string>,
+      #       encapsulation: <integer>,
       #       shutdown: <boolean>,
       #       ...
       #     },
@@ -110,16 +113,18 @@ module Rbeapi
       # @return [Object] Returns the interface instance as an Object.
       def get_instance(name)
         name = name[0, 2].upcase
-        case name
-        when 'ET'
-          cls = 'Rbeapi::Api::EthernetInterface'
-        when 'PO'
-          cls = 'Rbeapi::Api::PortchannelInterface'
-        when 'VX'
-          cls = 'Rbeapi::Api::VxlanInterface'
-        else
-          cls = 'Rbeapi::Api::BaseInterface'
-        end
+        cls = case name
+              when 'ET'
+                'Rbeapi::Api::EthernetInterface'
+              when 'PO'
+                'Rbeapi::Api::PortchannelInterface'
+              when 'VX'
+                'Rbeapi::Api::VxlanInterface'
+              when 'VL'
+                'Rbeapi::Api::VlanInterface'
+              else
+                'Rbeapi::Api::BaseInterface'
+              end
 
         return @instances[name] if @instances.include?(cls)
         instance = Rbeapi::Utils.class_from_string(cls).new(@node)
@@ -127,10 +132,12 @@ module Rbeapi
         instance
       end
 
+      # rubocop:disable Style/MethodMissing
       def method_missing(method_name, *args, &block)
         instance = get_instance(args[0])
         instance.send(method_name.to_sym, *args, &block)
       end
+      # rubocop:enable Style/MethodMissing
 
       def respond_to?(method_name, name = nil)
         return super unless name
@@ -143,8 +150,9 @@ module Rbeapi
     # The BaseInterface class extends Entity and provides an implementation
     # that is common to all interfaces configured in EOS.
     class BaseInterface < Entity
-      DEFAULT_INTF_DESCRIPTION = ''
-      DEFAULT_LOAD_INTERVAL = ''
+      DEFAULT_INTF_DESCRIPTION = ''.freeze
+      DEFAULT_INTF_ENCAPSULATION = ''.freeze
+      DEFAULT_LOAD_INTERVAL = ''.freeze
 
       ##
       # get returns the specified interface resource hash that represents the
@@ -157,6 +165,7 @@ module Rbeapi
       #     name: <string>
       #     type: 'generic'
       #     description: <string>
+      #     encapsulation: <integer>
       #     shutdown: [true, false]
       #     load_interval: <string>
       #   }
@@ -173,6 +182,7 @@ module Rbeapi
 
         response = { name: name, type: 'generic' }
         response.merge!(parse_description(config))
+        response.merge!(parse_encapsulation(config))
         response.merge!(parse_shutdown(config))
         response.merge!(parse_load_interval(config))
         response
@@ -197,6 +207,26 @@ module Rbeapi
       end
       private :parse_description
 
+      ##
+      # parse_encapsulation scans the provided configuration block and parses
+      # the encapsulation value if it exists in the configuration.  If the
+      # encapsulation value is not configured, then the
+      # DEFALT_INTF_ENCAPSULATION value is returned.  The hash returned by this
+      # method is intended to be merged into the interface resource hash
+      # returned by the get method.
+      #
+      # @api private
+      #
+      # @param config [String] The configuration block retrieved from the
+      #   nodes current running configuration.
+      #
+      # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
+      def parse_encapsulation(config)
+        mdata = /^\s{3}encapsulation dot1q vlan\s(.+)$/.match(config)
+        { encapsulation: mdata.nil? ? DEFAULT_INTF_ENCAPSULATION : mdata[1] }
+      end
+      private :parse_encapsulation
+
       ##
       # parse_shutdown scans the provided configuration block and parses
       # the shutdown value.  If the shutdown value is configured then true
@@ -315,6 +345,44 @@ module Rbeapi
         configure_interface(name, commands)
       end
 
+      ##
+      # set_encapsulation configures the VLAN ID value for the specified
+      # interface name in the nodes running configuration. If the enable
+      # keyword is false then the encapsulation value is negated using the no
+      # keyword. If the default keyword is set to true, then the encapsulation
+      # value is defaulted using the default keyword. The default keyword takes
+      # precedence over the enable keyword if both are provided.
+      #
+      # @since eos_version X.XX.XM
+      #
+      # @param name [String] The interface name to apply the configuration
+      #   to. The name value must be the full interface identifier.
+      #
+      # @param opts [hash] Optional keyword arguments.
+      #
+      # @option opts value [String] The value to configure the VLAN ID to be
+      #   used in the encapsulation dot1q vlan setting for a subinterface.
+      #
+      # @option opts enable [Boolean] If false then the command is
+      #   negated. Default is true.
+      #
+      # @option opts default [Boolean] Configure the interface encapsulation
+      #   using the default keyword.
+      #
+      # @return [Boolean] Returns true if the command completed successfully.
+      def set_encapsulation(name, opts = {})
+        unless name =~ /\./
+          raise ArgumentError, 'Parameter encapsulation can be set only on '\
+            'subinterfaces'
+        end
+        unless name.downcase =~ /et|po/
+          raise ArgumentError, 'Parameter encapsulation can be set only on '\
+            'Ethernet and PostChannel interfaces'
+        end
+        commands = command_builder('encapsulation dot1q vlan', opts)
+        configure_interface(name, commands)
+      end
+
       ##
       # set_shutdown configures the administrative state of the specified
       # interface in the node. If the enable keyword is false, then the
@@ -340,10 +408,10 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def set_shutdown(name, 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.
         value = !opts[:enable]
-        opts.merge!(enable: value)
+        opts[:enable] = value
         commands = command_builder('shutdown', opts)
         configure_interface(name, commands)
       end
@@ -374,9 +442,9 @@ module Rbeapi
     # The EthernetInterface class manages all Ethernet interfaces on an
     # EOS node.
     class EthernetInterface < BaseInterface
-      DEFAULT_ETH_FLOWC_TX = 'off'
-      DEFAULT_ETH_FLOWC_RX = 'off'
-      DEFAULT_SPEED = 'default'
+      DEFAULT_ETH_FLOWC_TX = 'off'.freeze
+      DEFAULT_ETH_FLOWC_RX = 'off'.freeze
+      DEFAULT_SPEED = 'default'.freeze
       DEFAULT_LACP_PRIORITY = 32_768
 
       ##
@@ -388,6 +456,7 @@ module Rbeapi
       #     name: <string>,
       #     type: <string>,
       #     description: <string>,
+      #     encapsulation: <integer>,
       #     shutdown: <boolean>,
       #     load_interval: <string>
       #     speed: <string>,
@@ -509,14 +578,19 @@ module Rbeapi
       ##
       # create overrides the create method from the BaseInterface and raises
       # an exception because Ethernet interface creation is not supported.
+      # This doesn't happen for Ethernet subinterfaces
       #
-      # @param _name [String] The name of the interface.
+      # @param name [String] The name of the interface.
       #
       # @raise [NotImplementedError] Creation of physical Ethernet interfaces
-      #   is not supported.
-      def create(_name)
-        fail NotImplementedError, 'creating Ethernet interfaces is '\
-              'not supported'
+      #   is not supported. Only subinterfaces are allowed.
+      def create(name)
+        if name !~ /\./
+          raise NotImplementedError, 'creating Ethernet interfaces is '\
+            'not supported'
+        else
+          configure("interface #{name}")
+        end
       end
 
       ##
@@ -524,13 +598,17 @@ module Rbeapi
       # raises an exception because Ethernet interface deletion is not
       # supported.
       #
-      # @param _name [String] The name of the interface.
+      # @param name [String] The name of the interface.
       #
       # @raise [NotImplementedError] Deletion of physical Ethernet interfaces
       #   is not supported.
-      def delete(_name)
-        fail NotImplementedError, 'deleting Ethernet interfaces is '\
-              'not supported'
+      def delete(name)
+        if name !~ /\./
+          raise NotImplementedError, 'deleting Ethernet interfaces is '\
+            'not supported'
+        else
+          configure("no interface #{name}")
+        end
       end
 
       ##
@@ -720,9 +798,9 @@ module Rbeapi
     # The PortchannelInterface class manages all port channel interfaces on an
     # EOS node.
     class PortchannelInterface < BaseInterface
-      DEFAULT_LACP_FALLBACK = 'disabled'
-      DEFAULT_LACP_MODE = 'on'
-      DEFAULT_MIN_LINKS = '0'
+      DEFAULT_LACP_FALLBACK = 'disabled'.freeze
+      DEFAULT_LACP_MODE = 'on'.freeze
+      DEFAULT_MIN_LINKS = '0'.freeze
 
       ##
       # get returns the specified port-channel interface configuration from
@@ -734,6 +812,7 @@ module Rbeapi
       #   {
       #     type: 'portchannel'
       #     description: <string>
+      #     encapsulation: <integer>
       #     shutdown: [true, false]
       #     load_interval: <string>
       #     members: array[<strings>]
@@ -861,6 +940,7 @@ module Rbeapi
       # @return [Hash<Symbol, Object>] Returns the resource hash attribute.
       def parse_lacp_timeout(config)
         mdata = /lacp fallback timeout (\d+)$/.match(config)
+        return { lacp_timeout: [] } unless defined? mdata[1]
         { lacp_timeout: mdata[1] }
       end
       private :parse_lacp_timeout
@@ -925,7 +1005,7 @@ module Rbeapi
       #
       # @return [Boolean] Returns true if the command completed successfully.
       def set_members(name, members, mode = nil)
-        fail ArgumentError, 'members must be an Array' unless
+        raise ArgumentError, 'members must be an Array' unless
         members.is_a?(Array)
 
         current_members = Set.new parse_members(name)[:members]
@@ -1091,8 +1171,8 @@ module Rbeapi
     ##
     # The VxlanInterface class manages all Vxlan interfaces on an EOS node.
     class VxlanInterface < BaseInterface
-      DEFAULT_SRC_INTF = ''
-      DEFAULT_MCAST_GRP = ''
+      DEFAULT_SRC_INTF = ''.freeze
+      DEFAULT_MCAST_GRP = ''.freeze
 
       ##
       # Returns the Vxlan interface configuration as a Ruby hash of key/value
@@ -1105,6 +1185,7 @@ module Rbeapi
       #     name: <string>,
       #     type: <string>,
       #     description: <string>,
+      #     encapsulation: <string>,
       #     shutdown: <boolean>,
       #     load_interval: <string>
       #     source_interface: <string>,
@@ -1374,5 +1455,86 @@ module Rbeapi
         configure_interface(name, "no vxlan vlan #{vlan} vni")
       end
     end
+
+    ##
+    # The VlanInterface class manages all Vlan interfaces on an EOS node.
+    class VlanInterface < BaseInterface
+      ##
+      # Returns the Vlan interface configuration as a Ruby hash of key/value
+      # pairs from the nodes running configuration. This method extends the
+      # BaseInterface get method and adds the Vlan specific attributes to
+      # the hash.
+      #
+      # @example
+      #   {
+      #     name: <string>,
+      #     type: <string>,
+      #     description: <string>,
+      #     shutdown: <boolean>,
+      #     autostate: <boolean>
+      #   }
+      #
+      # @param name [String] The interface name to return from the nodes
+      #   configuration.
+      #
+      # @return [nil, Hash<String, String>] Returns the interface configuration
+      #   as a Ruby hash object. If the provided interface name is not found
+      #   then this method will return nil.
+      def get(name)
+        config = get_block("interface #{name}")
+        return nil unless config
+
+        response = super(name)
+        response[:type] = 'vlan'
+        response.merge!(parse_autostate(config))
+        response
+      end
+
+      ##
+      # parse_autostate scans the interface config block and returns the
+      # value of the vlan autostate. If the autostate is not
+      # configured then it's enabled, as by default. The hash
+      # returned is intended to be merged into the interface resource hash
+      #
+      # @api private
+      #
+      # @param config [String] The interface configuration block to extract
+      #   the vlan autostate value from.
+      #
+      # @return [Hash<Symbol, Object>]
+      def parse_autostate(config)
+        mdata = /^\s{3}no\sautostate$/.match(config)
+        { autostate: mdata.nil? ? :true : :false }
+      end
+      private :parse_autostate
+
+      ##
+      # set_autostate configures the autostate on a vlan interface.
+      # Default value is true, if set to false 'no autostate' is
+      # configured on the interface.
+      #
+      # @since eos_version 4.13.7M
+      #
+      # @param name [String] The interface name to apply the configuration
+      #   values to. The name must be the full interface identifier.
+      #
+      # @param opts [Hash] Optional keyword arguments.
+      #
+      # @option opts value [Boolean] Enables or disables autotate for vlan
+      #   interfaces. Default is true.
+      #
+      # @option opts default [Boolean] Configures the autostate value
+      #   on the interface using the default value (true).
+      #
+      # @return [Boolean] Returns true if the command completed successfully.
+      def set_autostate(name, opts = {})
+        commands = if opts[:value] == :false
+                     command_builder('no autostate')
+                   else
+                     command_builder('autostate')
+                   end
+        configure_interface(name, commands)
+      end
+    end
   end
 end