cisco_node_utils 1.4.1 → 1.5.0

data/lib/cisco_node_utils/cmd_ref/itd_device_group.yaml

@@ -1,6 +1,6 @@
 # itd_device_group
 ---
-_exclude: [N3k, N5k, N6k, N8k, ios_xr]
+_exclude: [N3k, N5k, N6k, N9k-F, ios_xr]
 
 _template:
   get_command: "show running-config all | section itd"

data/lib/cisco_node_utils/cmd_ref/itd_service.yaml

@@ -1,6 +1,6 @@
 # itd_service
 ---
-_exclude: [N3k, N5k, N6k, N8k, ios_xr]
+_exclude: [N3k, N5k, N6k, N9k-F, ios_xr]
 
 _template:
   get_command: "show running-config all | section itd"

data/lib/cisco_node_utils/cmd_ref/ospf.yaml

@@ -32,7 +32,7 @@ log_adjacency:
   default_value: :none
 
 process_initialized:
-  _exclude: [ios_xr, N3k, N7k, N8k, N9k]
+  _exclude: [ios_xr, N3k, N7k, N9k-F, N9k]
   # ospf process initialization state
   kind: boolean
   context: ~

data/lib/cisco_node_utils/cmd_ref/pim.yaml

@@ -21,6 +21,12 @@ all_ssm_ranges:
   multiple:
   get_value : '/^<afi> pim ssm range (.*)$/'
 
+bfd:
+  kind: boolean
+  get_value: '/^<afi> pim bfd$/'
+  set_value: "<state> <afi> pim bfd"
+  default_value: false
+
 group_list:
   default_value: ~
   get_value: '/^<afi> pim rp-address (\S+) group-list (\S+)/'

data/lib/cisco_node_utils/cmd_ref/portchannel_global.yaml

@@ -6,7 +6,7 @@ _template:
   get_command: "show running all"
 
 asymmetric:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   default_value: false
 
 bundle_hash:
@@ -15,7 +15,7 @@ bundle_hash:
   N5k: *bundle_hash_ip
   N6k: *bundle_hash_ip
   N7k: *bundle_hash_ip
-  N8k: &bundle_hash_ip_l4port
+  N9k-F: &bundle_hash_ip_l4port
     default_value: 'ip-l4port'
   N9k: *bundle_hash_ip_l4port
 
@@ -23,18 +23,18 @@ bundle_select:
   default_value: 'src-dst'
 
 concatenation:
-  _exclude: [N3k, N5k, N6k, N7k, N8k]
+  _exclude: [N3k, N5k, N6k, N7k, N9k-F]
   default_value: false
 
 hash_distribution:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   get_value: '/^port.channel hash.distribution (.*)$/'
   set_context:  ['terminal dont-ask']
   set_value: "port-channel hash-distribution %s"
   default_value: 'adaptive'
 
 hash_poly:
-  _exclude: [N3k, N7k, N8k, N9k]
+  _exclude: [N3k, N7k, N9k-F, N9k]
   default_value: ~
 
 load_balance_type:
@@ -46,13 +46,13 @@ load_balance_type:
   N6k: *load_balance_type_ethernet
   N7k: &load_balance_type_asymmetric
     default_only: "asymmetric"
-  N8k: &load_balance_type_no_hash
+  N9k-F: &load_balance_type_no_hash
     default_only: "no_hash"
   N9k: &load_balance_type_symmetry
     default_only: "symmetry"
 
 load_defer:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   kind: int
   get_value: '/^port.channel load.defer (\d+)$/'
   set_value: "port-channel load-defer %s"
@@ -64,7 +64,7 @@ port_channel_load_balance:
   set_value: "port-channel load-balance %s %s %s %s %s %s"
 
 resilient:
-  _exclude: [N5k, N6k, N7k, N8k]
+  _exclude: [N5k, N6k, N7k, N9k-F]
   kind: boolean
   get_value: '/^port-channel load-balance resilient$/'
   set_value: "%s port-channel load-balance resilient"
@@ -80,5 +80,5 @@ rotate:
   default_value: 0
 
 symmetry:
-  _exclude: [N5k, N6k, N7k, N8k]
+  _exclude: [N5k, N6k, N7k, N9k-F]
   default_value: false

data/lib/cisco_node_utils/cmd_ref/snmp_server.yaml

@@ -63,7 +63,7 @@ packet_size:
     default_value: 0
   N6k: *n5k_default_packet_size
   N7k: *n5k_default_packet_size
-  N8k: *n5k_default_packet_size
+  N9k-F: *n5k_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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   kind: string
   default_only: "2-3967"
 
 bd_root_priority:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, 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: [N3k, N8k, N9k]
+  _exclude: [N3k, N9k-F, N9k]
   kind: int
   get_value: '/^spanning-tree domain (\d+)$/'
   set_value: "<state> spanning-tree domain <domain>"

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, N8k, N9k, ios_xr]
+_exclude: [N3k, N5k, N6k, N9k-F, N9k, ios_xr]
 
 _template:
   get_command: 'show run vdc all'

data/lib/cisco_node_utils/cmd_ref/vlan.yaml

@@ -4,8 +4,10 @@ _exclude: [ios_xr]
 
 all_vlans:
   multiple: true
+  get_data_format: nxapi_structured
   get_command: "show vlan brief"
-  get_value: '/^(\d+)\s/'
+  get_context: ["TABLE_vlanbriefxbrief", "ROW_vlanbriefxbrief"]
+  get_value: "vlanshowbr-vlanid-utf"
 
 create:
   set_value: "vlan %s"
@@ -14,7 +16,7 @@ destroy:
   set_value: "no vlan %s"
 
 fabric_control:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   kind: boolean
   get_command: "show running-config vlan"
   get_context: ['/^vlan <vlan>/']
@@ -27,7 +29,7 @@ mapped_vni:
   _exclude: [N7k]
   N3k: &mapped_vni_n3_8_9k
     get_command: 'show running vlan'
-  N8k: *mapped_vni_n3_8_9k
+  N9k-F: *mapped_vni_n3_8_9k
   N9k: *mapped_vni_n3_8_9k
   N5k: &mapped_vni_n5_6k
     get_command: 'show running vlan 1-4094'
@@ -48,7 +50,7 @@ mapped_vni_requires_nv_overlay:
     default_only: false
 
 mode:
-  _exclude: [N3k, N9k]
+  _exclude: [N3k, N9k, N9k-F]
   multiple: true
   get_command: "show vlan"
   # TBD: 'show vlan' is problematic and should be converted to use show run
@@ -59,13 +61,16 @@ mode:
   default_value: 'CE'
 
 name:
+  kind: string
+  get_data_format: nxapi_structured
   get_command: "show vlan brief"
-  get_value: '/^%d\s+(\S+)\s/'
+  get_context: ["TABLE_vlanbriefxbrief", "ROW_vlanbriefxbrief"]
+  get_value: ["vlanshowbr-vlanid-utf <vlanid>", "vlanshowbr-vlanname"]
   set_context: ["vlan %d"]
   set_value: "%s name %s ; end"
 
 pvlan_association:
-  _exclude: [N8k]
+  _exclude: [N9k-F]
   multiple: true
   get_command: "show vlan private-vlan"
   get_value: '/^<id>\s+(\d+)/'
@@ -74,7 +79,7 @@ pvlan_association:
   default_value: []
 
 pvlan_type:
-  _exclude: [N8k]
+  _exclude: [N9k-F]
   kind: string
   get_command: 'show vlan private-vlan type'
   get_value: '/^<id>\s+(\S+)/'
@@ -83,8 +88,11 @@ pvlan_type:
   default_value: ""
 
 shutdown:
+  kind: boolean
+  get_data_format: nxapi_structured
   get_command: "show vlan brief"
-  get_value: '/^%d\s+\S+\s+(\S+)\s/'
+  get_context: ["TABLE_vlanbriefxbrief", "ROW_vlanbriefxbrief"]
+  get_value: ["vlanshowbr-vlanid-utf <vlanid>", "vlanshowbr-shutstate", '/^shutdown$/']
   set_context: ["vlan %d"]
   set_value: "%s shutdown ; end"
   default_value: false

data/lib/cisco_node_utils/cmd_ref/vpc.yaml

@@ -1,6 +1,6 @@
 # vpc
 ---
-_exclude: [ios_xr, N8k]
+_exclude: [ios_xr, N9k-F]
 
 _template:
   get_command:  'show running-config vpc all'
@@ -58,7 +58,7 @@ dual_active_exclude_interface_vlan_bridge_domain:
   default_value: 'none'
 
 fabricpath_emulated_switch_id:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   kind: int
   set_context:  ['terminal dont-ask', 'vpc domain <domain>']
   get_value: '/^fabricpath switch-id\s+(\d+)$/'
@@ -66,7 +66,7 @@ fabricpath_emulated_switch_id:
   default_value: false
 
 fabricpath_multicast_load_balance:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   kind: boolean
   get_value: '/^fabricpath multicast load-balance$/'
   set_value: "<state> fabricpath multicast load-balance"
@@ -90,7 +90,7 @@ graceful_consistency_check:
 
 layer3_peer_routing:
   kind: boolean
-  _exclude: [N3k, N8k, N9k]
+  _exclude: [N3k, N9k-F, N9k]
   get_value: '/^layer3 peer-router$/'
   set_value: "<state> layer3 peer-router"
   default_value: false
@@ -105,14 +105,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, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N7k, 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, N8k, N9k]
+  _exclude: [N3k, N9k-F, N9k]
   kind: string
   set_context:  ['terminal dont-ask', 'vpc domain <domain>']
   get_value: '/^peer-gateway exclude-vlan\s(\S+)/'
@@ -161,11 +161,11 @@ peer_keepalive_vrf:
   default_value: 'management'
 
 phy_port_vpc_module_pids:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   default_only: 'N7[K7]-(?:F2|F3|F4|M3)'
 
 port_channel_limit:
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   auto_default: false
   kind: boolean
   get_value: '/^port-channel limit/'
@@ -180,14 +180,14 @@ role_priority:
 
 self_isolation:
   kind: boolean
-  _exclude: [N3k, N5k, N6k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
   get_value: '/^self-isolation/'
   set_value: "<state> self-isolation"
   default_value: false
 
 shutdown:
   kind: boolean
-  _exclude: [N3k, N8k, N9k]
+  _exclude: [N3k, N9k-F, N9k]
   get_value: '/^shutdown/'
   set_value: "<state> shutdown"
   default_value: false
@@ -207,7 +207,7 @@ system_priority:
 # Exclude everyone for now till the track command is fully supported
 track:
   kind: int
-  _exclude: [N3k, N5k, N6k, N7k, N8k, N9k]
+  _exclude: [N3k, N5k, N6k, N7k, 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

@@ -70,11 +70,12 @@ shutdown:
 
 vni: # TBD Should this move to the vni provider as vrf_vni?
   # MT-lite only
-  N9k:
+  N9k: &vni9k
     kind: int
     get_value: '/^vni (\d+)$/'
     set_value: '<state> vni <id>'
     default_value: false
+  N9k-F: *vni9k
 
 vpn_id:
   _exclude: [nexus]

data/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml

@@ -31,7 +31,7 @@ mt_lite_support:
   kind: boolean
   N9k: &mt_lite_default
     default_only: true
-  N8k: *mt_lite_default
+  N9k-F: *mt_lite_default
   N6k: *mt_lite_default
   N5k: *mt_lite_default
   else:

data/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml

@@ -49,7 +49,7 @@ suppress_arp:
   default_value: false
 
 suppress_uuc:
-  _exclude: [N7k, N8k, N9k]
+  _exclude: [N7k, N9k-F, N9k]
   kind: boolean
   get_value: '/^suppress-unknown-unicast$/'
   set_value: '<state> suppress-unknown-unicast'

data/lib/cisco_node_utils/command_reference.rb

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

data/lib/cisco_node_utils/domain_name.rb

@@ -49,8 +49,23 @@ module Cisco
         config_set('dnsclient', 'domain_name',
                    state: '', name: @name)
       else
-        config_set('dnsclient', 'domain_name_vrf',
-                   state: '', name: @name, vrf: @vrf)
+        # On some platforms attempts to create a new domain results
+        # in the error. 'ERROR: Deletion of VRF test in progresswait
+        # for it to complete'.  We handle this by trying up to 10 times
+        # with a 1 second delay between attempts before giving up.
+        tries = 10
+        begin
+          config_set('dnsclient', 'domain_name_vrf',
+                     state: '', name: @name, vrf: @vrf)
+        rescue Cisco::CliError => e
+          if /ERROR: Deletion of VRF .* in progress/.match(e.to_s)
+            sleep 1
+            tries -= 1
+            # rubocop:disable Metrics/BlockNesting
+            retry if tries > 0
+            # rubocop:enable Metrics/BlockNesting
+          end
+        end
       end
     end