cisco_node_utils 1.7.0 → 1.8.0

data/lib/cisco_node_utils/cmd_ref/snmp_server.yaml

@@ -63,7 +63,11 @@ packet_size:
     default_value: 0
   N6k: *n5k_default_packet_size
   N7k: *n5k_default_packet_size
-  N9k-F: *n5k_default_packet_size
+  # On recent versions, packet size is fixed,
+  # so this change will take care of the fix but
+  # it could still fail in the older versions.
+  N9k-F: *n3k_default_packet_size
+  N3k-F: *n3k_default_packet_size
 
 protocol:
   _exclude: [ios_xr]

data/lib/cisco_node_utils/cmd_ref/stp_global.yaml

@@ -7,7 +7,7 @@ _template:
   get_command: "show running-config spanning-tree"
 
 bd_designated_priority:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_context: ['/^spanning-tree pseudo-information$/']
   get_value: '/^bridge-domain (.*) designated priority (.*)$/'
@@ -16,40 +16,40 @@ bd_designated_priority:
   default_value: []
 
 bd_forward_time:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_value: '/^spanning-tree bridge-domain (.*) forward-time (.*)$/'
   set_value: "<state> spanning-tree bridge-domain <range> forward-time <val>"
   default_value: []
 
 bd_hello_time:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_value: '/^spanning-tree bridge-domain (.*) hello-time (.*)$/'
   set_value: "<state> spanning-tree bridge-domain <range> hello-time <val>"
   default_value: []
 
 bd_max_age:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_value: '/^spanning-tree bridge-domain (.*) max-age (.*)$/'
   set_value: "<state> spanning-tree bridge-domain <range> max-age <val>"
   default_value: []
 
 bd_priority:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_value: '/^spanning-tree bridge-domain (.*) priority (.*)$/'
   set_value: "<state> spanning-tree bridge-domain <range> priority <val>"
   default_value: []
 
 bd_range:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   kind: string
   default_only: "2-3967"
 
 bd_root_priority:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   multiple:
   get_context: ['/^spanning-tree pseudo-information$/']
   get_value: '/^bridge-domain (.*) root priority (.*)$/'
@@ -78,7 +78,7 @@ bridge_assurance:
   default_value: true
 
 domain:
-  _exclude: [N9k-F]
+  _exclude: [N3k-F, N9k-F]
   os_version: 'N3k, N9k:7.0.3.I6.1'
   kind: int
   get_value: '/^spanning-tree domain (\d+)$/'

data/lib/cisco_node_utils/cmd_ref/syslog_server.yaml

@@ -15,8 +15,9 @@ server:
   multiple: true
   nexus:
     get_command: "show running-config all | include '^logging server'"
-    get_value: '/^logging server (\S+).*/'
-    set_value: '<state> logging server <ip> <level> <vrf>'
+    # Returns <ip>, <level>, <port>, <vrf>
+    get_value: '/^(?:logging server )([^\s]+)(?: (\d+))?(?: port (\d+))?(?: use-vrf (\S+))?/'
+    set_value: '<state> logging server <ip> <level> <port> <vrf>'
   ios_xr:
     get_command: "show running-config logging"
     get_value: '/^logging (\S+).*/'

data/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml

@@ -2,8 +2,28 @@
 ---
 _exclude: [ios_xr]
 
+console:
+  default_value: 2
+  get_command: "show running-config all | include 'logging'"
+  # Returns <state> and <severity>
+  get_value: '/^(no)?\s*logging console\s*(\d)?/'
+  set_value: '<state> logging console <severity>'
+
+monitor:
+  default_value: 5
+  get_command: "show running-config all | include 'logging'"
+  # Returns <state> and <severity>
+  get_value: '/^(no)?\s*logging monitor\s*(\d)?/'
+  set_value: '<state> logging monitor <severity>'
+
+source_interface:
+  default_value: ~
+  get_command: "show running-config all | include 'logging'"
+  get_value: '/^logging source-interface\s+(.*)$/'
+  set_value: '<state> logging source-interface <source_interface>'
+
 timestamp:
-  get_command: "show running-config all | include '^logging timestamp'"
+  get_command: "show running-config all | include 'logging'"
   get_value: '/^logging timestamp (.*)$/'
   set_value: '<state> logging timestamp <units>'
   default_value: 'seconds'

data/lib/cisco_node_utils/cmd_ref/tacacs_global.yaml

@@ -19,6 +19,13 @@ key_format:
   ios_xr:
     get_command: "show running-config tacacs-server"
 
+source_interface:
+  default_value: ~
+  get_value: '/^ip tacacs source-interface\s+(.*)$/'
+  set_value: '<state> ip tacacs source-interface <source_interface>'
+  nexus:
+    get_command: "show running-config all | include '^ip tacacs source-interface'"
+
 timeout:
   kind: int
   get_value: '/tacacs-server timeout\s+(\d+)/'

data/lib/cisco_node_utils/cmd_ref/vdc.yaml

@@ -3,7 +3,7 @@
 # The current simplified implementation assumes no admin-vdc and that the
 # default vdc name uses id 1. Full multi-vdc support is TBD.
 ---
-_exclude: [N3k, N5k, N6k, N9k-F, N9k, ios_xr]
+_exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k, ios_xr]
 
 _template:
   get_command: 'show run vdc all'

data/lib/cisco_node_utils/cmd_ref/vlan.yaml

@@ -16,7 +16,7 @@ destroy:
   set_value: "no vlan %s"
 
 fabric_control:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   kind: boolean
   get_command: "show running-config vlan"
   get_context: ['/^vlan <vlan>/']
@@ -30,6 +30,7 @@ mapped_vni:
   N3k: &mapped_vni_n3_8_9k
     get_command: 'show running vlan'
   N9k-F: *mapped_vni_n3_8_9k
+  N3k-F: *mapped_vni_n3_8_9k
   N9k: *mapped_vni_n3_8_9k
   N5k: &mapped_vni_n5_6k
     get_command: 'show running vlan 1-4094'
@@ -50,7 +51,7 @@ mapped_vni_requires_nv_overlay:
     default_only: false
 
 mode:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N3k, N3k-F, N9k, N9k-F]
   multiple: true
   get_command: "show vlan"
   # TBD: 'show vlan' is problematic and should be converted to use show run
@@ -70,7 +71,7 @@ name:
   set_value: "%s name %s ; end"
 
 pvlan_association:
-  _exclude: [N9k-F]
+  _exclude: [N3k-F, N9k-F]
   multiple: true
   get_command: "show vlan private-vlan"
   get_value: '/^<id>\s+(\d+)/'
@@ -79,7 +80,7 @@ pvlan_association:
   default_value: []
 
 pvlan_type:
-  _exclude: [N9k-F]
+  _exclude: [N3k-F, N9k-F]
   kind: string
   get_command: 'show vlan private-vlan type'
   get_value: '/^<id>\s+(\S+)/'

data/lib/cisco_node_utils/cmd_ref/vpc.yaml

@@ -1,6 +1,6 @@
 # vpc
 ---
-_exclude: [ios_xr, N9k-F]
+_exclude: [ios_xr, N3k-F, N9k-F]
 
 _template:
   get_command:  'show running-config vpc all'
@@ -64,7 +64,7 @@ dual_active_exclude_interface_vlan_bridge_domain:
   default_value: 'none'
 
 fabricpath_emulated_switch_id:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   kind: int
   set_context:  ['terminal dont-ask', 'vpc domain <domain>']
   get_value: '/^fabricpath switch-id\s+(\d+)$/'
@@ -72,7 +72,7 @@ fabricpath_emulated_switch_id:
   default_value: false
 
 fabricpath_multicast_load_balance:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   kind: boolean
   get_value: '/^fabricpath multicast load-balance$/'
   set_value: "<state> fabricpath multicast load-balance"
@@ -118,14 +118,14 @@ peer_gateway:
 # Exclude everyone for now till the BD command is fully supported
 peer_gateway_exclude_bridge_domain:
   kind: string
-  _exclude: [N3k, N5k, N6k, N7k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N7k, N3k-F, N9k-F, N9k]
   set_context:  ['terminal dont-ask', 'vpc domain <domain>']
   get_value: '/^peer-gateway exclude bridge-domain\s+(\S+)/'
   set_value: "peer-gateway exclude-bridge-domain <range>"
   default_value: ''
 
 peer_gateway_exclude_vlan:
-  _exclude: [N3k, N9k-F, N9k]
+  _exclude: [N3k, N3k-F, N9k-F, N9k]
   kind: string
   set_context:  ['terminal dont-ask', 'vpc domain <domain>']
   get_value: '/^peer-gateway exclude-vlan\s(\S+)/'
@@ -181,11 +181,11 @@ peer_switch:
   default_value: false
 
 phy_port_vpc_module_pids:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   default_only: 'N7[K7]-(?:F2|F3|F4|M3)'
 
 port_channel_limit:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   auto_default: false
   kind: boolean
   get_value: '/^port-channel limit/'
@@ -200,7 +200,7 @@ role_priority:
 
 self_isolation:
   kind: boolean
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   get_value: '/^self-isolation/'
   set_value: "<state> self-isolation"
   default_value: false
@@ -227,7 +227,7 @@ system_priority:
 # Exclude everyone for now till the track command is fully supported
 track:
   kind: int
-  _exclude: [N3k, N5k, N6k, N7k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N7k, N3k-F, N9k-F, N9k]
   get_value: '/^track\s+(\d+)/'
   set_value: "<state> track <val>"
   default_value: 0

data/lib/cisco_node_utils/cmd_ref/vrf.yaml

@@ -76,6 +76,7 @@ vni: # TBD Should this move to the vni provider as vrf_vni?
     set_value: '<state> vni <id>'
     default_value: false
   N9k-F: *vni9k
+  N3k-F: *vni9k
 
 vpn_id:
   _exclude: [nexus]

data/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml

@@ -32,6 +32,7 @@ mt_lite_support:
   N9k: &mt_lite_default
     default_only: true
   N9k-F: *mt_lite_default
+  N3k-F: *mt_lite_default
   N6k: *mt_lite_default
   N5k: *mt_lite_default
   else:

data/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml

@@ -16,8 +16,7 @@ all_vnis:
   get_value: '/^member vni (\d+|\d+-\d+) ?(associate-vrf)?$/'
 
 ingress_replication:
-  _exclude: [N5k, N6k]
-  os_version: 'N7k:8.1.1'
+  _exclude: [N5k, N6k, N7k]
   kind: string
   get_value: '/^ingress-replication protocol (\S+)$/'
   set_value: '<state> ingress-replication protocol <protocol>'
@@ -29,8 +28,7 @@ multicast_group:
   default_value: ''
 
 peer_list:
-  _exclude: [N5k, N6k]
-  os_version: 'N7k:8.1.1'
+  _exclude: [N5k, N6k, N7k]
   multiple:
   get_context:
     - '/^interface <name>$/i'
@@ -51,7 +49,7 @@ suppress_arp:
   default_value: false
 
 suppress_uuc:
-  _exclude: [N9k-F, N9k]
+  _exclude: [N3k-F, N9k-F, N9k]
   os_version: 'N7k:8.1.1'
   kind: boolean
   get_value: '/^suppress-unknown-unicast$/'

data/lib/cisco_node_utils/command_reference.rb

@@ -437,13 +437,16 @@ module Cisco
       puts "DEBUG: #{text}" if @@debug
     end
 
-    KNOWN_PLATFORMS = %w(C3064 C3132 C3172 N3k N5k N6k N7k N9k N9k-F XRv9k)
+    KNOWN_PLATFORMS = %w(C3064 C3132 C3172 N35 N3k N3k-F N5k N6k N7k N9k N9k-F
+                         XRv9k)
 
     def self.platform_to_filter(platform)
       if KNOWN_PLATFORMS.include?(platform)
         case platform
         when 'XRv9k'
           /XRV9/
+        when 'N35'
+          /N3K-C35/
         when 'N9k'
           # For non-fretta n9k platforms we need to
           # match everything except the trailing -F
@@ -451,6 +454,13 @@ module Cisco
         when 'N9k-F'
           # For fretta n9k we need to include the trailing -F
           /^N9.*-F$/
+        when 'N3k'
+          # For non-fretta n3k platforms we need to
+          # match everything except the trailing -F
+          /^N3...(?!.*-F)/
+        when 'N3k-F'
+          # For fretta n3k we need to include the trailing -F
+          /^N3.*-F$/
         else
           Regexp.new platform.tr('k', '')
         end

data/lib/cisco_node_utils/interface.rb

@@ -1,6 +1,6 @@
 # November 2015, Chris Van Heuveln
 #
-# Copyright (c) 2015-2016 Cisco and/or its affiliates.
+# Copyright (c) 2015-2017 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -51,15 +51,22 @@ module Cisco
     # Regexp to match various link bundle interface variants
     PORTCHANNEL = Regexp.new('(port-channel|Bundle-Ether)', Regexp::IGNORECASE)
 
-    attr_reader :name
+    attr_reader :name, :state_default
 
-    def initialize(name, instantiate=true)
+    def initialize(name, instantiate=true, default_state=false)
       fail TypeError unless name.is_a?(String)
       fail ArgumentError unless name.length > 0
       @name = name.downcase
       @smr = config_get('interface', 'stp_mst_range')
       @svr = config_get('interface', 'stp_vlan_range')
       @match_found = false
+      # Keep track of default vs non-default state for
+      # interfaces that cannot be created/destroyed.
+      @state_default = nil
+      # Track ethernet but not sub-interfaces
+      if @name[/ethernet/] && !@name[/ethernet.*\.\d+/]
+        @state_default = default_state
+      end
       create if instantiate
     end
 
@@ -72,10 +79,23 @@ module Cisco
       intf_list = config_get('interface', 'all_interfaces')
       return hash if intf_list.nil?
 
+      # Massage intf_list data into an array that is easy
+      # to work with.
+      intf_list.collect! { |x| x.strip || x }
+      intf_list.delete('')
+      intf_list = intf_list.join(' ').split('interface')
+      intf_list.delete('')
+
       intf_list.each do |id|
-        id = id.downcase
+        int_data = id.strip.split(' ')
+        next if int_data[0].nil?
+        id = int_data[0].downcase
         next if opt && filter(opt, id)
-        hash[id] = Interface.new(id, false)
+        # 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)
       end
       hash
     end
@@ -141,7 +161,16 @@ module Cisco
     end
 
     def destroy
-      config_set('interface', 'destroy', name: @name)
+      if @name[/ethernet/] && !@name[/ethernet.*\.\d+/]
+        config_set('interface', 'default', name: @name)
+      else
+        config_set('interface', 'destroy', name: @name)
+      end
+    end
+
+    def default?
+      state = config_get('interface', 'default', name: @name)
+      state.nil? ? true : false
     end
 
     def pvlan_enable
@@ -579,6 +608,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_info_trust=(state)
+      return false if !state && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state
       config_set('interface', 'ipv4_dhcp_relay_info_trust',
                  name:  @name, state: state ? '' : 'no')
@@ -593,6 +623,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_src_addr_hsrp=(state)
+      return false if !state && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state
       config_set('interface', 'ipv4_dhcp_relay_src_addr_hsrp',
                  name:  @name, state: state ? '' : 'no')
@@ -611,8 +642,9 @@ module Cisco
 
     def ipv4_dhcp_relay_src_intf=(val)
       state = val == default_ipv4_dhcp_relay_src_intf ? 'no' : ''
-      intf = val == default_ipv4_dhcp_relay_src_intf ? '' : val
+      return false if state == 'no' && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state.empty?
+      intf = val == default_ipv4_dhcp_relay_src_intf ? '' : val
       config_set('interface', 'ipv4_dhcp_relay_src_intf',
                  name:  @name, state: state, intf: intf)
     end
@@ -626,6 +658,7 @@ module Cisco
     end
 
     def ipv4_dhcp_relay_subnet_broadcast=(state)
+      return false if !state && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state
       config_set('interface', 'ipv4_dhcp_relay_subnet_broadcast',
                  name:  @name, state: state ? '' : 'no')
@@ -640,6 +673,7 @@ module Cisco
     end
 
     def ipv4_dhcp_smart_relay=(state)
+      return false if !state && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state
       config_set('interface', 'ipv4_dhcp_smart_relay',
                  name:  @name, state: state ? '' : 'no')
@@ -654,6 +688,7 @@ module Cisco
     end
 
     def ipv4_forwarding=(state)
+      return if state == ipv4_forwarding
       config_set('interface', 'ipv4_forwarding',
                  name:  @name, state: state ? '' : 'no')
     end
@@ -788,8 +823,9 @@ module Cisco
 
     def ipv6_dhcp_relay_src_intf=(val)
       state = val == default_ipv6_dhcp_relay_src_intf ? 'no' : ''
-      intf = val == default_ipv6_dhcp_relay_src_intf ? '' : val
+      return false if state == 'no' && !Feature.dhcp_enabled?
       Feature.dhcp_enable if state.empty?
+      intf = val == default_ipv6_dhcp_relay_src_intf ? '' : val
       config_set('interface', 'ipv6_dhcp_relay_src_intf',
                  name:  @name, state: state, intf: intf)
     end
@@ -1831,6 +1867,8 @@ module Cisco
     def switchport_vtp=(vtp_set)
       # TODO: throw UnsupportedError instead of returning false?
       return false unless switchport_vtp_mode_capable?
+      return false if !vtp_set && !Feature.vtp_enabled?
+      Feature.vtp_enable if vtp_set
       no_cmd = (vtp_set) ? '' : 'no'
       config_set('interface', 'vtp', name: @name, state: no_cmd)
     end