cisco_node_utils 2.0.2 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a05bb2305207d3df446759d870f0422c458539b
-  data.tar.gz: c596cbf4b824b6ca0c07a90d89eeb8e6c7c2cd1f
+  metadata.gz: 25ab64767af23a6f2d3b6ae7e18df87fee6b1021
+  data.tar.gz: '0997f3d16c79fe25c8f9195cf8a16ba2a73d581e'
 SHA512:
-  metadata.gz: 01221c8c8d2d9c99bc89abab9d6650975d5288fd93f4d87994333cea2cd6107d3cae973d3995cbb40a4134b4aeb619616642861c9294d470bb4f5b79695b9539
-  data.tar.gz: 661b5c54fc64633b60b585c3aa1e5aa44dcc20b37272907d4ae599f6171986ee17f797b0e92fc7805d0149cb21a6dc2c8123a2a92f396cb062b01042deee58c7
+  metadata.gz: fecc5acce031898494571f1051cfde121631eabe8e4645fce634018a9192efd9a4cad0ab53618660c054ec79e2896c88021606ae69f48256ac96015a8727e3f8
+  data.tar.gz: bb4178e4b416a3f7ad3439db4e65801158e06463a75a271590f27b2faca2d279365d6e1f9594790fd452d81ede0cbfd84c4558e766593e0b163356a46e0d5907

data/CHANGELOG.md

@@ -1,6 +1,42 @@
 Changelog
 =========
 
+## [v2.1.0]
+
+### Added
+
+### Changed
+
+### Removed
+- Removal of deprecated `interface` `private-vlan` properties.
+
+| Deprecated/Removed Name | New Name |
+|:---|:---|
+| `private_vlan_mapping`                          | `pvlan_mapping`
+| `switchport_mode_private_vlan_host`             | `switchport_pvlan_host`, `switchport_pvlan_promiscuous`,
+| `switchport_mode_private_vlan_host_association` | `switchport_pvlan_host_association`
+| `switchport_mode_private_vlan_host_promiscous`  | `switchport_pvlan_mapping`
+| `switchport_mode_private_vlan_trunk_promiscuous`| `switchport_pvlan_trunk_promiscuous`
+| `switchport_mode_private_vlan_trunk_secondary`  | `switchport_pvlan_trunk_secondary`
+| `switchport_private_vlan_association_trunk`     | `switchport_pvlan_trunk_association`
+| `switchport_private_vlan_mapping_trunk`         | `switchport_pvlan_mapping_trunk`
+| `switchport_private_vlan_trunk_allowed_vlan`    | `switchport_pvlan_trunk_allowed_vlan`
+| `switchport_private_vlan_trunk_native_vlan`     | `switchport_pvlan_trunk_native_vlan`
+
+- Removal of deprecated `vlan` `private-vlan` properties.
+
+| Deprecated/Removed Name | New Name |
+|:---|:---|
+| `private_vlan_association` | `pvlan_association`
+| `private_vlan_type`        | `pvlan_type`
+
+- Removed interface attribute:
+   * `purge_config`
+
+### Issues Addressed
+
+- [Very slow execution when managing interfaces #496](https://github.com/cisco/cisco-network-puppet-module/issues/496)
+
 ## [v2.0.2]
 
 ### Issues Addressed
@@ -621,6 +657,7 @@ Cisco::Environment.add_env('default', env)
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
+[v2.1.0]: https://github.com/cisco/cisco-network-node-utils/compare/v2.0.2...v2.1.0
 [v2.0.2]: https://github.com/cisco/cisco-network-node-utils/compare/v2.0.1...v2.0.2
 [v2.0.1]: https://github.com/cisco/cisco-network-node-utils/compare/v2.0.0...v2.0.1
 [v2.0.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.10.0...v2.0.0

data/lib/cisco_node_utils/bfd_global.rb

@@ -146,6 +146,8 @@ module Cisco
     end
 
     def ipv4_slow_timer=(val)
+      # Only set the value if it's not already configured and default
+      return if val == default_ipv4_slow_timer && val == ipv4_slow_timer
       set_args_keys(timer: val,
                     state: val == default_ipv4_slow_timer ? 'no' : '')
       config_set('bfd_global', 'ipv4_slow_timer', @set_args)
@@ -160,6 +162,8 @@ module Cisco
     end
 
     def ipv6_slow_timer=(val)
+      # Only set the value if it's not already configured and default
+      return if val == default_ipv6_slow_timer && val == ipv6_slow_timer
       set_args_keys(timer: val,
                     state: val == default_ipv6_slow_timer ? 'no' : '')
       config_set('bfd_global', 'ipv6_slow_timer', @set_args)

data/lib/cisco_node_utils/cisco_cmn_utils.rb

@@ -415,5 +415,30 @@ module Cisco
       prefix = prop.to_s if prefix.nil?
       val.to_s.empty? ? val : "#{prefix} #{val}"
     end
+
+    # Helper utility to normalize the interface name pattern to be filtered.
+    # This is only a problem on N7k which has to use a section filter
+    # due to a show run int bug (no 'all' keyword for some interfaces).
+    def self.normalize_intf_pattern(show_name)
+      return '' if show_name.nil? || show_name.empty?
+      require_relative 'platform'
+      return show_name unless Platform.hardware_type[/Nexus7/]
+      return show_name if show_name[-1] == '$' #  already normalized
+      pat = show_name.downcase + '$'
+      case pat
+      when /ethernet/
+        pat.sub!(/ethernet/, 'Ethernet')
+      when /loopback/
+        pat.sub!(/loopback/, 'loopback')
+      when /port-channel/
+        pat.sub!(/port-channel/, 'port-channel')
+      when /vlan/
+        pat.sub!(/vlan/, 'Vlan')
+      else
+        # wildcard the first char of the name
+        pat.sub!(/./, '.')
+      end
+      pat
+    end
   end # class Utils
 end   # module Cisco

data/lib/cisco_node_utils/cmd_ref/interface.yaml

@@ -3,9 +3,11 @@
 _template:
   context: ["interface <name>"]
   ios_xr:
-    get_command: "show running interface"
+    get_command: "show running interface <name>"
   nexus:
-    get_command: "show running interface all"
+    get_command: "show running interface <show_name> all"
+    N7k:
+      get_command: "show running interface all | section '^interface <show_name>'"
 
 access_vlan:
   _exclude: [ios_xr]
@@ -14,13 +16,20 @@ access_vlan:
   set_value: "switchport access vlan <vlan>"
   default_value: 1
 
+all_count:
+  get_context: ~
+  get_command: "show running interface | incl ^interface | count"
+  get_value: '/\d+/'
+
 all_interfaces:
   multiple:
   ios_xr:
     get_command: 'show running all-interfaces'
     get_value: '/^interface (.*)/'
   nexus:
-    get_command: "show running-config interface | section '^interface'"
+    get_command: "show running-config interface <show_name> | section '^interface'"
+    N7k:
+      get_command: "show running interface all | section '^interface <show_name>'"
     get_value: '/(.*)/'
   get_context: ~
 
@@ -35,7 +44,7 @@ capabilities:
   _exclude: [ios_xr]
   multiple:
   get_context: ["<name>"]
-  get_command: "show interface capabilities"
+  get_command: "show interface <name> capabilities"
   get_value: '/(.*)/'
   default_value: [] # :raw default
 
@@ -377,15 +386,6 @@ pim_bfd:
   set_value: "<state> ip pim bfd-instance"
   default_value: false
 
-purge_config:
-  _exclude: [ios_xr]
-  multiple:
-  set_context: ~
-  set_value:   "default interface <name>"
-  get_command: "show running interface"
-  get_value:   '/(.*)/'
-  default_value: ~
-
 pvlan_any:
   multiple:
   get_value: '/switchport private-vlan/'
@@ -498,14 +498,14 @@ stp_link_type:
 
 stp_mst_cost:
   multiple:
-  get_command: "show running interface"
+  get_command: "show running interface <name>"
   get_value: '/^spanning-tree mst (.*) cost (.*)$/'
   set_value: "<state> spanning-tree mst <range> cost <val>"
   default_value: []
 
 stp_mst_port_priority:
   multiple:
-  get_command: "show running interface"
+  get_command: "show running interface <name>"
   get_value: '/^spanning-tree mst (.*) port-priority (.*)$/'
   set_value: "<state> spanning-tree mst <range> port-priority <val>"
   default_value: []
@@ -522,21 +522,21 @@ stp_port_priority:
 
 stp_port_type:
   kind: string
-  get_command: "show running interface"
+  get_command: "show running interface <name>"
   get_value: '/^spanning-tree port type (.*)$/'
   set_value: "<state> spanning-tree port type <type>"
   default_value: ~
 
 stp_vlan_cost:
   multiple:
-  get_command: "show running interface"
+  get_command: "show running interface <name>"
   get_value: '/^spanning-tree vlan (.*) cost (.*)$/'
   set_value: "<state> spanning-tree vlan <range> cost <val>"
   default_value: []
 
 stp_vlan_port_priority:
   multiple:
-  get_command: "show running interface"
+  get_command: "show running interface <name>"
   get_value: '/^spanning-tree vlan (.*) port-priority (.*)$/'
   set_value: "<state> spanning-tree vlan <range> port-priority <val>"
   default_value: []

data/lib/cisco_node_utils/cmd_ref/interface_channel_group.yaml

@@ -5,7 +5,10 @@ _template:
   ios_xr:
     get_command: "show running interface"
   nexus:
-    get_command: "show running interface all"
+    get_command: "show running interface <show_name> all"
+    N7k:
+      get_command: "show running interface all | section '^interface <show_name>'"
+
 
 all_interfaces:
   multiple:

data/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml

@@ -3,7 +3,7 @@
 _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
 
 _template:
-  get_command: "show running interface all"
+  get_command: "show running interface <show_name> all"
   context:
     - "interface <interface>"
 

data/lib/cisco_node_utils/cmd_ref/interface_ospf.yaml

@@ -3,8 +3,10 @@
 _exclude: [ios_xr]
 
 _template:
-  get_command: 'show running interface all'
-  context: ["interface %s"]
+  context: ['interface <name>']
+  get_command: 'show running interface <show_name> all'
+  N7k:
+    get_command: "show running interface all | section '^interface <show_name>'"
 
 all_interfaces:
   multiple:
@@ -13,7 +15,7 @@ all_interfaces:
 
 area:
   get_value: '/^\s*ip router ospf (\S+) area (\S+)/'
-  set_value: "%s ip router ospf %s area %s"
+  set_value: '<state> ip router ospf <ospf_name> area <area>'
 
 bfd:
   # the config can be 'ip ospf bfd' or
@@ -22,31 +24,31 @@ bfd:
   # match to get the whole config for checking
   # the mode
   get_value: '/^\s*ip ospf bfd *(?:\S*)$/'
-  set_value: '%s ip ospf bfd %s'
+  set_value: '<state> ip ospf bfd <disable>'
   default_value: ~
 
 cost:
   kind: int
   get_value: '/^\s*ip ospf cost (\d+)/'
-  set_value: "%s ip ospf cost %s"
+  set_value: '<state> ip ospf cost <cost>'
   default_value: 0
 
 dead_interval:
   kind: int
   get_value: '/^\s*ip ospf dead-interval (\d+)/'
-  set_value: "%s ip ospf dead-interval %s"
+  set_value: '<state> ip ospf dead-interval <interval>'
   default_value: 40
 
 hello_interval:
   kind: int
   get_value: '/^\s*ip ospf hello-interval (\d+)/'
-  set_value: "%s ip ospf hello-interval %s"
+  set_value: '<state> ip ospf hello-interval <interval>'
   default_value: 10
 
 message_digest:
   kind: boolean
   get_value: '/^\s*ip ospf authentication message-digest/'
-  set_value: "%s ip ospf authentication message-digest"
+  set_value: '<state> ip ospf authentication message-digest'
   default_value: false
 
 message_digest_alg_type:
@@ -63,7 +65,7 @@ message_digest_key_id:
   default_value: 0
 
 message_digest_key_set:
-  set_value: "%s ip ospf message-digest-key %s %s %s %s"
+  set_value: '<state> ip ospf message-digest-key <keyid> <algtype> <enctype> <password>'
 
 message_digest_password:
   default_value: ~
@@ -72,12 +74,12 @@ message_digest_password:
 mtu_ignore:
   kind: boolean
   get_value: '/^\s*ip ospf mtu-ignore/'
-  set_value: "%s ip ospf mtu-ignore"
+  set_value: '<state> ip ospf mtu-ignore'
   default_value: false
 
 network_type:
   get_value: '/^\s*ip ospf network (\S+)$/'
-  set_value: "%s ip ospf network %s"
+  set_value: '<state> ip ospf network <network_type>'
 
 network_type_default:
   default_value: 'broadcast'
@@ -88,23 +90,23 @@ network_type_loopback_default:
 passive_interface:
   kind: boolean
   get_value: '/^\s*ip ospf passive-interface/'
-  set_value: "%s ip ospf passive-interface"
+  set_value: '<state> ip ospf passive-interface'
   default_value: false
 
 priority:
   kind: int
   get_value: '/^\s*ip ospf priority (\d+)/'
-  set_value: "%s ip ospf priority %s"
+  set_value: '<state> ip ospf priority <priority>'
   default_value: 1
 
 shutdown:
   kind: boolean
   get_value: '/^\s*ip ospf shutdown/'
-  set_value: "%s ip ospf shutdown"
+  set_value: '<state> ip ospf shutdown'
   default_value: false
 
 transmit_delay:
   kind: int
   get_value: '/^\s*ip ospf transmit-delay (\d+)/'
-  set_value: "%s ip ospf transmit-delay %s"
+  set_value: '<state> ip ospf transmit-delay <delay>'
   default_value: 1

data/lib/cisco_node_utils/interface.rb

@@ -18,7 +18,6 @@ require_relative 'cisco_cmn_utils'
 require_relative 'node_util'
 require_relative 'vrf'
 require_relative 'overlay_global'
-require_relative 'interface_DEPRECATED'
 
 # Cisco provider module
 module Cisco
@@ -31,16 +30,8 @@ module Cisco
     fabricpath: 'fabricpath',
   }
 
-  # REMOVE THIS HASH WITH RELEASE 2.0.0
-  IF_DEPRECATED = {
-    host:        'host',
-    promiscuous: 'promiscuous',
-    secondary:   'secondary',
-  }
-  IF_SWITCHPORT_MODE.merge!(IF_DEPRECATED)
-
   # Interface - node utility class for general interface config management
-  class Interface < Cisco::InterfaceDeprecated
+  class Interface < NodeUtil
     # Regexp to match various Ethernet interface variants:
     #                       Ethernet
     #                GigabitEthernet
@@ -51,12 +42,18 @@ module Cisco
     # Regexp to match various link bundle interface variants
     PORTCHANNEL = Regexp.new('(port-channel|Bundle-Ether)', Regexp::IGNORECASE)
 
-    attr_reader :name, :state_default
+    attr_reader :name, :state_default, :show_name
 
-    def initialize(name, instantiate=true, default_state=false)
+    def initialize(name, instantiate=true, default_state=false, show_name=nil)
       fail TypeError unless name.is_a?(String)
       fail ArgumentError unless name.length > 0
+
+      # @name is used for context: keys only
+      # @show_name is used for get_command: keys; allows callers to limit
+      # show command to a single interface
       @name = name.downcase
+      @show_name = show_name.nil? ? '' : Utils.normalize_intf_pattern(show_name)
+      @get_args = { name: @name, show_name: @show_name }
       @smr = config_get('interface', 'stp_mst_range')
       @svr = config_get('interface', 'stp_vlan_range')
       @match_found = false
@@ -74,28 +71,43 @@ module Cisco
       "interface #{name}"
     end
 
-    def self.interfaces(opt=nil)
+    def self.interface_count
+      config_get('interface', 'all_count').to_i
+    end
+
+    def self.interfaces(opt=nil, show_name=nil)
       hash = {}
-      intf_list = config_get('interface', 'all_interfaces')
+      show_name = Utils.normalize_intf_pattern(show_name)
+      begin
+        intf_list = config_get('interface', 'all_interfaces',
+                               show_name: show_name)
+      rescue CliError => e
+        raise unless show_name
+        # ignore logical interfaces that do not exist
+        debug 'Interface.interfaces ignoring CliError => ' + e.to_s
+      end
       return hash if intf_list.nil?
 
-      # Massage intf_list data into an array that is easy
-      # to work with.
+      # Massage intf_list data into an array that is easy to work with.
+      # Use a MARKER to hide pesky 'interface' substrings
       intf_list.collect! { |x| x.strip || x }
       intf_list.delete('')
+      intf_list.collect! { |x| (x.sub('interface', '~!MARKER!~') unless x[/^interface /]) || x } # rubocop:disable Metrics/LineLength
       intf_list = intf_list.join(' ').split('interface')
       intf_list.delete('')
+      # Restore 'interface' substrings
+      intf_list.collect! { |x| x.sub('~!MARKER!~', 'interface') }
 
       intf_list.each do |id|
         int_data = id.strip.split(' ')
         next if int_data[0].nil?
         id = int_data[0].downcase
-        next if opt && filter(opt, id)
+        next if opt && filter(opt, id, show_name)
         # If there are any additional options associated
         # with this interface then it's in a non-default
         # state.
         default_state = int_data.size > 1 ? false : true
-        hash[id] = Interface.new(id, false, default_state)
+        hash[id] = Interface.new(id, false, default_state, show_name)
       end
       hash
     end
@@ -103,11 +115,13 @@ module Cisco
     # General-purpose filter for Interface.interfaces().
     # filter: This may be overloaded in the future to allow a hash of filters.
     #     id: The interface name
+    # show_name: needed for get_command: <show_name>
     # Return: true if the interface should be filtered out, false to keep it.
-    def self.filter(filter, id)
+    def self.filter(filter, id, show_name)
       case filter
       when :pvlan_any
-        return false if config_get('interface', 'pvlan_any', name: id)
+        return false if config_get('interface', 'pvlan_any',
+                                   name: id, show_name: show_name)
 
       else
         # Just a basic pattern filter (:ethernet, :loopback, etc)
@@ -132,7 +146,12 @@ module Cisco
     # {"Model"=>"N7K-M132XP-12L", "Type"=>"10Gbase-SR", "Speed"=>"10,100,1000"}
     #
     def self.capabilities(intf, mode=:hash)
-      array = config_get('interface', 'capabilities', name: intf)
+      array = []
+      begin
+        array = config_get('interface', 'capabilities', name: intf)
+      rescue CliError => e
+        raise unless e.clierror[/(Invalid command|Cmd exec error)/]
+      end
       return array if mode == :raw
       hash = {}
       if array
@@ -169,7 +188,7 @@ module Cisco
     end
 
     def default?
-      state = config_get('interface', 'default', name: @name)
+      state = config_get('interface', 'default', @get_args)
       state.nil? ? true : false
     end
 
@@ -193,7 +212,7 @@ module Cisco
 
     def access_vlan
       return nil if switchport_mode == :disabled
-      config_get('interface', 'access_vlan', name: @name)
+      config_get('interface', 'access_vlan', @get_args)
     end
 
     def access_vlan=(vlan)
@@ -207,7 +226,7 @@ module Cisco
     def bfd_echo
       return nil unless Feature.bfd_enabled?
       return nil if @name[/loop/i]
-      config_get('interface', 'bfd_echo', name: @name)
+      config_get('interface', 'bfd_echo', @get_args)
     end
 
     def bfd_echo=(val)
@@ -227,7 +246,7 @@ module Cisco
     end
 
     def description
-      config_get('interface', 'description', name: @name)
+      config_get('interface', 'description', @get_args)
     end
 
     def description=(desc)
@@ -246,7 +265,7 @@ module Cisco
     end
 
     def encapsulation_dot1q
-      config_get('interface', 'encapsulation_dot1q', name: @name)
+      config_get('interface', 'encapsulation_dot1q', @get_args)
     end
 
     def encapsulation_dot1q=(val)
@@ -272,7 +291,7 @@ module Cisco
     end
 
     def fabric_forwarding_anycast_gateway
-      config_get('interface', 'fabric_forwarding_anycast_gateway', name: @name)
+      config_get('interface', 'fabric_forwarding_anycast_gateway', @get_args)
     end
 
     def fabric_forwarding_anycast_gateway=(state)
@@ -298,7 +317,7 @@ module Cisco
     end
 
     def hsrp_bfd
-      config_get('interface', 'hsrp_bfd', name: @name)
+      config_get('interface', 'hsrp_bfd', @get_args)
     end
 
     def hsrp_bfd=(val)
@@ -318,7 +337,7 @@ module Cisco
     # hsrp delay minimum and reload are in the same CLI
     # hsrp delay minimum 0 reload 0
     def hsrp_delay
-      match = config_get('interface', 'hsrp_delay', name: @name)
+      match = config_get('interface', 'hsrp_delay', @get_args)
       match.nil? ? default_hsrp_delay : match.collect(&:to_i)
     end
 
@@ -363,7 +382,7 @@ module Cisco
     end
 
     def hsrp_mac_refresh
-      config_get('interface', 'hsrp_mac_refresh', name: @name)
+      config_get('interface', 'hsrp_mac_refresh', @get_args)
     end
 
     def hsrp_mac_refresh=(val)
@@ -379,7 +398,7 @@ module Cisco
     end
 
     def hsrp_use_bia
-      match = config_get('interface', 'hsrp_use_bia', name: @name)
+      match = config_get('interface', 'hsrp_use_bia', @get_args)
       return default_hsrp_use_bia unless match
       match.include?('scope') ? :use_bia_intf : :use_bia
     end
@@ -418,7 +437,7 @@ module Cisco
 
     def hsrp_version
       return nil if switchport_mode != :disabled || @name[/loop/i]
-      config_get('interface', 'hsrp_version', name: @name)
+      config_get('interface', 'hsrp_version', @get_args)
     end
 
     def hsrp_version=(val)
@@ -431,7 +450,7 @@ module Cisco
     end
 
     def ipv4_acl_in
-      config_get('interface', 'ipv4_acl_in', name: @name)
+      config_get('interface', 'ipv4_acl_in', @get_args)
     end
 
     def ipv4_acl_in=(val)
@@ -452,7 +471,7 @@ module Cisco
     end
 
     def ipv4_acl_out
-      config_get('interface', 'ipv4_acl_out', name: @name)
+      config_get('interface', 'ipv4_acl_out', @get_args)
     end
 
     def ipv4_acl_out=(val)
@@ -494,7 +513,7 @@ module Cisco
     end
 
     def ipv4_addr_mask
-      val = config_get('interface', 'ipv4_addr_mask', name: @name)
+      val = config_get('interface', 'ipv4_addr_mask', @get_args)
       if val && platform == :ios_xr
         # IOS XR reports address as <address> <bitmask> [secondary] but we
         # want <address>/<length> [secondary]
@@ -569,7 +588,7 @@ module Cisco
     end
 
     def ipv4_arp_timeout
-      config_get('interface', ipv4_arp_timeout_lookup_string, name: @name)
+      config_get('interface', ipv4_arp_timeout_lookup_string, @get_args)
     end
 
     def ipv4_arp_timeout=(timeout)
@@ -585,7 +604,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_addr
-      config_get('interface', 'ipv4_dhcp_relay_addr', name: @name)
+      config_get('interface', 'ipv4_dhcp_relay_addr', @get_args)
     end
 
     def ipv4_dhcp_relay_addr=(list)
@@ -610,7 +629,7 @@ module Cisco
 
     def ipv4_dhcp_relay_info_trust
       return nil if @name[/loop/i] || switchport_mode != :disabled
-      config_get('interface', 'ipv4_dhcp_relay_info_trust', name: @name)
+      config_get('interface', 'ipv4_dhcp_relay_info_trust', @get_args)
     end
 
     def ipv4_dhcp_relay_info_trust=(state)
@@ -625,7 +644,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_src_addr_hsrp
-      config_get('interface', 'ipv4_dhcp_relay_src_addr_hsrp', name: @name)
+      config_get('interface', 'ipv4_dhcp_relay_src_addr_hsrp', @get_args)
     end
 
     def ipv4_dhcp_relay_src_addr_hsrp=(state)
@@ -640,7 +659,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_src_intf
-      intf = config_get('interface', 'ipv4_dhcp_relay_src_intf', name: @name)
+      intf = config_get('interface', 'ipv4_dhcp_relay_src_intf', @get_args)
       # Normalize by downcasing and removing white space
       intf = intf.downcase.delete(' ') if intf
       intf
@@ -661,7 +680,7 @@ module Cisco
 
     def ipv4_dhcp_relay_subnet_broadcast
       return nil if @name[/loop/i] || switchport_mode != :disabled
-      config_get('interface', 'ipv4_dhcp_relay_subnet_broadcast', name: @name)
+      config_get('interface', 'ipv4_dhcp_relay_subnet_broadcast', @get_args)
     end
 
     def ipv4_dhcp_relay_subnet_broadcast=(state)
@@ -677,7 +696,7 @@ module Cisco
 
     def ipv4_dhcp_smart_relay
       return nil if @name[/loop/i] || switchport_mode != :disabled
-      config_get('interface', 'ipv4_dhcp_smart_relay', name: @name)
+      config_get('interface', 'ipv4_dhcp_smart_relay', @get_args)
     end
 
     def ipv4_dhcp_smart_relay=(state)
@@ -692,7 +711,7 @@ module Cisco
     end
 
     def ipv4_forwarding
-      config_get('interface', 'ipv4_forwarding', name: @name)
+      config_get('interface', 'ipv4_forwarding', @get_args)
     end
 
     def ipv4_forwarding=(state)
@@ -707,7 +726,7 @@ module Cisco
 
     def ipv4_pim_sparse_mode
       return nil unless switchport_mode == :disabled
-      config_get('interface', 'ipv4_pim_sparse_mode', name: @name)
+      config_get('interface', 'ipv4_pim_sparse_mode', @get_args)
     end
 
     def ipv4_pim_sparse_mode=(state)
@@ -723,7 +742,7 @@ module Cisco
 
     def ipv4_proxy_arp
       return nil if @name[/loop/i] || switchport_mode != :disabled
-      config_get('interface', 'ipv4_proxy_arp', name: @name)
+      config_get('interface', 'ipv4_proxy_arp', @get_args)
     end
 
     def ipv4_proxy_arp=(proxy_arp)
@@ -747,7 +766,7 @@ module Cisco
 
     def ipv4_redirects
       return nil unless switchport_mode == :disabled
-      config_get('interface', ipv4_redirects_lookup_string, name: @name)
+      config_get('interface', ipv4_redirects_lookup_string, @get_args)
     end
 
     def ipv4_redirects=(redirects)
@@ -762,7 +781,7 @@ module Cisco
     end
 
     def ipv6_acl_in
-      config_get('interface', 'ipv6_acl_in', name: @name)
+      config_get('interface', 'ipv6_acl_in', @get_args)
     end
 
     def ipv6_acl_in=(val)
@@ -782,7 +801,7 @@ module Cisco
     end
 
     def ipv6_acl_out
-      config_get('interface', 'ipv6_acl_out', name: @name)
+      config_get('interface', 'ipv6_acl_out', @get_args)
     end
 
     def ipv6_acl_out=(val)
@@ -802,7 +821,7 @@ module Cisco
     end
 
     def ipv6_dhcp_relay_addr
-      config_get('interface', 'ipv6_dhcp_relay_addr', name: @name)
+      config_get('interface', 'ipv6_dhcp_relay_addr', @get_args)
     end
 
     def ipv6_dhcp_relay_addr=(list)
@@ -826,7 +845,7 @@ module Cisco
     end
 
     def ipv6_dhcp_relay_src_intf
-      intf = config_get('interface', 'ipv6_dhcp_relay_src_intf', name: @name)
+      intf = config_get('interface', 'ipv6_dhcp_relay_src_intf', @get_args)
       # Normalize by downcasing and removing white space
       intf = intf.downcase.delete(' ') if intf
       intf
@@ -847,7 +866,7 @@ module Cisco
 
     def ipv6_redirects
       return nil if @name[/loop/i] || switchport_mode != :disabled
-      config_get('interface', 'ipv6_redirects', name: @name)
+      config_get('interface', 'ipv6_redirects', @get_args)
     end
 
     def ipv6_redirects=(redirects)
@@ -872,7 +891,7 @@ module Cisco
 
     def load_interval_counter_1_delay
       return nil if @name[/loop/] || @name[/ethernet.*\S+\.\d+$/]
-      config_get('interface', 'load_interval_counter_1_delay', name: @name)
+      config_get('interface', 'load_interval_counter_1_delay', @get_args)
     end
 
     def load_interval_counter_1_delay=(val)
@@ -894,7 +913,7 @@ module Cisco
 
     def load_interval_counter_2_delay
       return nil if @name[/loop/] || @name[/ethernet.*\S+\.\d+$/]
-      config_get('interface', 'load_interval_counter_2_delay', name: @name)
+      config_get('interface', 'load_interval_counter_2_delay', @get_args)
     end
 
     def load_interval_counter_2_delay=(val)
@@ -910,7 +929,7 @@ module Cisco
 
     def load_interval_counter_3_delay
       return nil if @name[/loop/] || @name[/ethernet.*\S+\.\d+$/]
-      config_get('interface', 'load_interval_counter_3_delay', name: @name)
+      config_get('interface', 'load_interval_counter_3_delay', @get_args)
     end
 
     def load_interval_counter_3_delay=(val)
@@ -936,7 +955,7 @@ module Cisco
     end
 
     def mtu
-      config_get('interface', mtu_lookup_string, name: @name)
+      config_get('interface', mtu_lookup_string, @get_args)
     end
 
     def mtu=(val)
@@ -952,7 +971,7 @@ module Cisco
 
     def speed
       return nil if @name[/loop|vlan/i]
-      config_get('interface', 'speed', name: @name)
+      config_get('interface', 'speed', @get_args)
     end
 
     def speed=(val)
@@ -965,7 +984,7 @@ module Cisco
 
     def duplex
       return nil if @name[/loop|vlan/i]
-      config_get('interface', 'duplex', name: @name)
+      config_get('interface', 'duplex', @get_args)
     end
 
     def duplex=(val)
@@ -989,7 +1008,7 @@ module Cisco
 
     def negotiate_auto
       return nil if @name[/loop|vlan/]
-      config_get('interface', negotiate_auto_lookup_string, name: @name)
+      config_get('interface', negotiate_auto_lookup_string, @get_args)
     end
 
     def negotiate_auto=(negotiate_auto)
@@ -1003,7 +1022,7 @@ module Cisco
     end
 
     def shutdown
-      config_get('interface', 'shutdown', name: @name)
+      config_get('interface', 'shutdown', @get_args)
     end
 
     def shutdown=(state)
@@ -1045,7 +1064,7 @@ module Cisco
     end
 
     def pim_bfd
-      config_get('interface', 'pim_bfd', name: @name)
+      config_get('interface', 'pim_bfd', @get_args)
     end
 
     def pim_bfd=(val)
@@ -1064,7 +1083,7 @@ module Cisco
 
     def storm_control_broadcast
       return nil if @name[/loop|vlan/i]
-      config_get('interface', 'storm_control_broadcast', name: @name)
+      config_get('interface', 'storm_control_broadcast', @get_args)
     end
 
     def storm_control_broadcast=(val)
@@ -1081,7 +1100,7 @@ module Cisco
 
     def storm_control_multicast
       return nil if @name[/loop|vlan/i]
-      config_get('interface', 'storm_control_multicast', name: @name)
+      config_get('interface', 'storm_control_multicast', @get_args)
     end
 
     def storm_control_multicast=(val)
@@ -1098,7 +1117,7 @@ module Cisco
 
     def storm_control_unicast
       return nil if @name[/loop|vlan/i]
-      config_get('interface', 'storm_control_unicast', name: @name)
+      config_get('interface', 'storm_control_unicast', @get_args)
     end
 
     def storm_control_unicast=(val)
@@ -1114,7 +1133,7 @@ module Cisco
     end
 
     def stp_bpdufilter
-      config_get('interface', 'stp_bpdufilter', name: @name)
+      config_get('interface', 'stp_bpdufilter', @get_args)
     end
 
     def stp_bpdufilter=(val)
@@ -1134,7 +1153,7 @@ module Cisco
     end
 
     def stp_bpduguard
-      config_get('interface', 'stp_bpduguard', name: @name)
+      config_get('interface', 'stp_bpduguard', @get_args)
     end
 
     def stp_bpduguard=(val)
@@ -1154,7 +1173,7 @@ module Cisco
 
     def stp_cost
       return nil if switchport_mode == :disabled
-      cost = config_get('interface', 'stp_cost', name: @name)
+      cost = config_get('interface', 'stp_cost', @get_args)
       cost == 'auto' ? cost : cost.to_i
     end
 
@@ -1168,7 +1187,7 @@ module Cisco
     end
 
     def stp_guard
-      config_get('interface', 'stp_guard', name: @name)
+      config_get('interface', 'stp_guard', @get_args)
     end
 
     def stp_guard=(val)
@@ -1189,7 +1208,7 @@ module Cisco
 
     def stp_link_type
       return nil if switchport_mode == :disabled
-      config_get('interface', 'stp_link_type', name: @name)
+      config_get('interface', 'stp_link_type', @get_args)
     end
 
     def stp_link_type=(val)
@@ -1203,7 +1222,7 @@ module Cisco
 
     def stp_port_priority
       return nil if switchport_mode == :disabled
-      config_get('interface', 'stp_port_priority', name: @name)
+      config_get('interface', 'stp_port_priority', @get_args)
     end
 
     def stp_port_priority=(val)
@@ -1222,7 +1241,7 @@ module Cisco
     # array: [['0,2-4,6,8-12', '1000'], ['4000-4020', '2568']]
     #
     def stp_mst_cost
-      config_get('interface', 'stp_mst_cost', name: @name)
+      config_get('interface', 'stp_mst_cost', @get_args)
     end
 
     def stp_mst_cost=(list)
@@ -1244,7 +1263,7 @@ module Cisco
     # array: [['0,2-4,6,8-12', '64'], ['4000-4020', '160']]
     #
     def stp_mst_port_priority
-      config_get('interface', 'stp_mst_port_priority', name: @name)
+      config_get('interface', 'stp_mst_port_priority', @get_args)
     end
 
     def stp_mst_port_priority=(list)
@@ -1260,7 +1279,7 @@ module Cisco
     end
 
     def stp_port_type
-      config_get('interface', 'stp_port_type', name: @name)
+      config_get('interface', 'stp_port_type', @get_args)
     end
 
     def stp_port_type=(val)
@@ -1286,7 +1305,7 @@ module Cisco
     # array: [['1-4,6,8-12', '1000'], ['3000-3960', '2568']]
     #
     def stp_vlan_cost
-      config_get('interface', 'stp_vlan_cost', name: @name)
+      config_get('interface', 'stp_vlan_cost', @get_args)
     end
 
     def stp_vlan_cost=(list)
@@ -1308,7 +1327,7 @@ module Cisco
     # array: [['1-4,6,8-12', '64'], ['3000-3960', '160']]
     #
     def stp_vlan_port_priority
-      config_get('interface', 'stp_vlan_port_priority', name: @name)
+      config_get('interface', 'stp_vlan_port_priority', @get_args)
     end
 
     def stp_vlan_port_priority=(list)
@@ -1325,7 +1344,7 @@ module Cisco
 
     def switchport
       # This is "switchport", not "switchport mode"
-      config_get('interface', 'switchport', name: @name)
+      config_get('interface', 'switchport', @get_args)
     end
 
     def switchport_enable(val=true)
@@ -1335,8 +1354,7 @@ module Cisco
     # switchport_autostate_exclude is exclusive to switchport interfaces
     def switchport_autostate_exclude
       return nil if switchport_mode == :disabled
-      config_get('interface',
-                 'switchport_autostate_exclude', name: @name)
+      config_get('interface', 'switchport_autostate_exclude', @get_args)
     end
 
     def switchport_autostate_exclude=(val)
@@ -1367,7 +1385,7 @@ module Cisco
 
     def switchport_mode
       return nil if platform == :ios_xr
-      mode = config_get('interface', switchport_mode_lookup_string, name: @name)
+      mode = config_get('interface', switchport_mode_lookup_string, @get_args)
 
       return mode.nil? ? :disabled : IF_SWITCHPORT_MODE.key(mode)
 
@@ -1427,7 +1445,7 @@ module Cisco
     def switchport_trunk_allowed_vlan
       return nil if switchport_mode == :disabled
       vlans = config_get('interface', 'switchport_trunk_allowed_vlan',
-                         name: @name)
+                         @get_args)
       vlans = vlans.join(',') if vlans.is_a?(Array)
       vlans = Utils.normalize_range_array(vlans, :string) unless vlans == 'none'
       vlans
@@ -1449,7 +1467,7 @@ module Cisco
 
     def switchport_trunk_native_vlan
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_trunk_native_vlan', name: @name)
+      config_get('interface', 'switchport_trunk_native_vlan', @get_args)
     end
 
     def switchport_trunk_native_vlan=(val)
@@ -1486,7 +1504,7 @@ module Cisco
     # <state> switchport mode private-vlan host
     def switchport_pvlan_host
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_pvlan_host', name: @name)
+      config_get('interface', 'switchport_pvlan_host', @get_args)
     end
 
     def switchport_pvlan_host=(state)
@@ -1503,7 +1521,7 @@ module Cisco
     # <state> switchport mode private-vlan promiscuous
     def switchport_pvlan_promiscuous
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_pvlan_promiscuous', name: @name)
+      config_get('interface', 'switchport_pvlan_promiscuous', @get_args)
     end
 
     def switchport_pvlan_promiscuous=(state)
@@ -1520,7 +1538,7 @@ module Cisco
     # <state> switchport private-vlan host-association <pri> <sec>
     # Note this is NOT a multiple, unlike trunk association.
     def switchport_pvlan_host_association
-      config_get('interface', 'switchport_pvlan_host_association', name: @name)
+      config_get('interface', 'switchport_pvlan_host_association', @get_args)
     end
 
     # Input: An array of primary and secondary vlans: ['44', '244']
@@ -1541,7 +1559,7 @@ module Cisco
     # --------------------------
     # <state> switchport private-vlan mapping <primary> <vlan>
     def switchport_pvlan_mapping
-      config_get('interface', 'switchport_pvlan_mapping', name: @name)
+      config_get('interface', 'switchport_pvlan_mapping', @get_args)
     end
 
     # Input: An array of primary vlan and range of vlans: ['44', '3-4,6']
@@ -1605,7 +1623,7 @@ module Cisco
     # --------------------------
     # <state> switchport private-vlan mapping trunk <primary> <vlan>
     def switchport_pvlan_mapping_trunk
-      config_get('interface', 'switchport_pvlan_mapping_trunk', name: @name)
+      config_get('interface', 'switchport_pvlan_mapping_trunk', @get_args)
     end
 
     # Input: A nested array of primary vlan and range of vlans:
@@ -1656,7 +1674,7 @@ module Cisco
     # <state> switchport private-vlan association trunk <pri> <sec>
     # Supports multiple.
     def switchport_pvlan_trunk_association
-      config_get('interface', 'switchport_pvlan_trunk_association', name: @name)
+      config_get('interface', 'switchport_pvlan_trunk_association', @get_args)
     end
 
     # Input: A nested array of primary and secondary vlans:
@@ -1696,7 +1714,7 @@ module Cisco
     # <state> switchport mode private-vlan trunk promiscuous
     def switchport_pvlan_trunk_promiscuous
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_pvlan_trunk_promiscuous', name: @name)
+      config_get('interface', 'switchport_pvlan_trunk_promiscuous', @get_args)
     end
 
     def switchport_pvlan_trunk_promiscuous=(state)
@@ -1713,7 +1731,7 @@ module Cisco
     # <state> switchport mode private-vlan trunk secondary
     def switchport_pvlan_trunk_secondary
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_pvlan_trunk_secondary', name: @name)
+      config_get('interface', 'switchport_pvlan_trunk_secondary', @get_args)
     end
 
     def switchport_pvlan_trunk_secondary=(state)
@@ -1733,7 +1751,7 @@ module Cisco
     def switchport_pvlan_trunk_allowed_vlan
       return nil if switchport_mode == :disabled
       vlans = config_get('interface', 'switchport_pvlan_trunk_allowed_vlan',
-                         name: @name)
+                         @get_args)
       vlans = vlans.join(',') if vlans.is_a?(Array)
       vlans = Utils.normalize_range_array(vlans, :string) unless vlans == 'none'
       vlans
@@ -1757,7 +1775,7 @@ module Cisco
     # <state> switchport trunk native vlan <vlan>
     def switchport_pvlan_trunk_native_vlan
       return nil if switchport_mode == :disabled
-      config_get('interface', 'switchport_pvlan_trunk_native_vlan', name: @name)
+      config_get('interface', 'switchport_pvlan_trunk_native_vlan', @get_args)
     end
 
     def switchport_pvlan_trunk_native_vlan=(vlan)
@@ -1775,7 +1793,7 @@ module Cisco
     # <state> private-vlan mapping <range>  # ex. range = ['2-4,9']
     # Always returns an array.
     def pvlan_mapping
-      range = config_get('interface', 'pvlan_mapping', name: @name)
+      range = config_get('interface', 'pvlan_mapping', @get_args)
       return default_pvlan_mapping if range.nil?
       range.empty? ? range : [range.delete(' ')]
     end
@@ -1828,7 +1846,7 @@ module Cisco
     end
 
     def vlan_mapping
-      match = config_get('interface', 'vlan_mapping', name: @name)
+      match = config_get('interface', 'vlan_mapping', @get_args)
       match.each(&:compact!) unless match.nil?
       match
     end
@@ -1860,7 +1878,7 @@ module Cisco
     end
 
     def vlan_mapping_enable
-      config_get('interface', 'vlan_mapping_enable', name: @name)
+      config_get('interface', 'vlan_mapping_enable', @get_args)
     end
 
     def vlan_mapping_enable=(state)
@@ -1911,7 +1929,7 @@ module Cisco
 
     def switchport_vtp
       return nil unless switchport_vtp_mode_capable?
-      config_get('interface', 'vtp', name: @name)
+      config_get('interface', 'vtp', @get_args)
     end
 
     def switchport_vtp=(vtp_set)
@@ -1931,7 +1949,7 @@ module Cisco
     # svi_autostate is exclusive to svi interfaces
     def svi_autostate
       return nil unless @name[/^vlan/i]
-      config_get('interface', 'svi_autostate', name: @name)
+      config_get('interface', 'svi_autostate', @get_args)
     end
 
     def svi_autostate=(val)
@@ -1959,7 +1977,7 @@ module Cisco
     # svi_management is exclusive to svi interfaces
     def svi_management
       return nil unless @name[/^vlan/i]
-      config_get('interface', 'svi_management', name: @name)
+      config_get('interface', 'svi_management', @get_args)
     end
 
     def svi_management=(val)
@@ -2002,7 +2020,7 @@ module Cisco
     end
 
     def vpc_id
-      config_get('interface', 'vpc_id', name: @name)
+      config_get('interface', 'vpc_id', @get_args)
     end
 
     def vpc_id=(num)
@@ -2021,7 +2039,7 @@ module Cisco
 
     def vpc_peer_link
       return nil unless @name[/port-channel/i] && switchport_mode != :disabled
-      config_get('interface', 'vpc_peer_link', name: @name)
+      config_get('interface', 'vpc_peer_link', @get_args)
     end
 
     def vpc_peer_link=(state)
@@ -2035,7 +2053,7 @@ module Cisco
     end
 
     def vrf
-      config_get('interface', 'vrf', name: @name)
+      config_get('interface', 'vrf', @get_args)
     end
 
     def vrf=(v)
@@ -2078,24 +2096,5 @@ module Cisco
         end
       end
     end
-
-    def purge_config=(val)
-      return unless val
-      fail ArgumentError,
-           'purge_config is only supported on Ethernet interfaces' unless
-        @name[/ethernet/]
-      config_set('interface', 'purge_config', name: @name) if val
-    end
-
-    def purge_config
-      # This getter is only supported on ethernet interfaces
-      return nil unless @name[/ethernet/]
-      state = config_get('interface', 'purge_config', name: @name)
-      state.nil? ? true : default_purge_config
-    end
-
-    def default_purge_config
-      config_get_default('interface', 'purge_config')
-    end
   end  # Class
 end    # Module