cisco_node_utils 1.7.0 → 1.8.0

data/lib/cisco_node_utils/cmd_ref/interface_ospf.yaml

@@ -6,6 +6,11 @@ _template:
   get_command: 'show running interface all'
   context: ["interface %s"]
 
+all_interfaces:
+  multiple:
+  get_context: ~
+  get_value: '/^interface (.*)/'
+
 area:
   get_value: '/^\s*ip router ospf (\S+) area (\S+)/'
   set_value: "%s ip router ospf %s area %s"

data/lib/cisco_node_utils/cmd_ref/interface_portchannel.yaml

@@ -7,6 +7,11 @@ _template:
   get_context: ['/^interface %s$/i']
   set_context: ["interface %s"]
 
+all_interfaces:
+  multiple:
+  get_context: ~
+  get_value: '/^interface (.*)/'
+
 bfd_per_link:
   kind: boolean
   get_value: '/^bfd per-link$/'
@@ -38,6 +43,7 @@ lacp_max_bundle:
     default_value: 16
   N6k: *lacp_max_bundle_16
   N7k: *lacp_max_bundle_16
+  N3k-F: *lacp_max_bundle_32
   N9k-F: *lacp_max_bundle_32
   N9k: *lacp_max_bundle_32
 

data/lib/cisco_node_utils/cmd_ref/interface_service_vni.yaml

@@ -1,6 +1,6 @@
 # interface_service_vni
 ---
-_exclude: [N3k, N5k, N6k, N9k-F, N9k, ios_xr]
+_exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k, ios_xr]
 
 _template:
   get_command: 'show running interface all'

data/lib/cisco_node_utils/cmd_ref/inventory.yaml

@@ -22,15 +22,24 @@ productid:
     get_value: '/"Rack 0".*\n.*PID: ([^ ,]+)/'
   nexus:
     get_value: ["name \"Chassis\"", "productid"]
+  N5k: &productid5k
+    get_value: ["name Chassis", "productid"]
+  N6k: *productid5k
 
 serialnum:
   ios_xr:
     get_value: '/"Rack 0".*\n.*SN: ([^ ,]+)/'
   nexus:
     get_value: ["name \"Chassis\"", "serialnum"]
+  N5k: &serialnum5k
+    get_value: ["name Chassis", "serialnum"]
+  N6k: *serialnum5k
 
 versionid:
   ios_xr:
     get_value: '/"Rack 0".*\n.*VID: ([^ ,]+)/'
   nexus:
     get_value: ["name \"Chassis\"", "vendorid"]
+  N5k: &vendorid5k
+    get_value: ["name Chassis", "serialnum"]
+  N6k: *vendorid5k

data/lib/cisco_node_utils/cmd_ref/itd_device_group.yaml

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

data/lib/cisco_node_utils/cmd_ref/object_group.yaml

@@ -0,0 +1,32 @@
+# object_group
+---
+_exclude: [N5k, N6k, ios_xr]
+
+_template:
+  get_command: "show running-config | section object-group"
+  get_context: ['/^object-group <afi> <type> <grp_name>/']
+  set_context: ["object-group <afi> <type> <grp_name>"]
+
+all_entries:
+  multiple:
+  get_value: '/^(\d+) .+$/'
+
+all_object_groups:
+  multiple:
+  get_context: ~
+  get_value: '/^object-group (\S+) (\S+) (\S+)$/'
+
+create:
+  set_context: ~
+  set_value: "object-group <afi> <type> <grp_name>"
+
+destroy:
+  set_context: ~
+  set_value: "no object-group <afi> <type> <grp_name>"
+
+entry:
+  get_value: '/^<seqno> .+$/'
+  set_value: "<state> <seqno> <address> <port>"
+
+entry_destroy:
+  set_value: 'no <seqno>'

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, N9k-F, N9k]
+  _exclude: [ios_xr, N3k, N7k, N3k-F, N9k-F, N9k]
   # ospf process initialization state
   kind: boolean
   context: ~

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, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   default_value: false
 
 bundle_hash:
@@ -18,23 +18,24 @@ bundle_hash:
   N9k-F: &bundle_hash_ip_l4port
     default_value: 'ip-l4port'
   N9k: *bundle_hash_ip_l4port
+  N3k-F: *bundle_hash_ip_l4port
 
 bundle_select:
   default_value: 'src-dst'
 
 concatenation:
-  _exclude: [N3k, N5k, N6k, N7k, N9k-F]
+  _exclude: [N3k, N5k, N6k, N7k, N3k-F, N9k-F]
   default_value: false
 
 hash_distribution:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, 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, N9k-F, N9k]
+  _exclude: [N3k, N7k, N3k-F, N9k-F, N9k]
   default_value: ~
 
 load_balance_type:
@@ -50,9 +51,10 @@ load_balance_type:
     default_only: "no_hash"
   N9k: &load_balance_type_symmetry
     default_only: "symmetry"
+  N3k-F: *load_balance_type_no_hash
 
 load_defer:
-  _exclude: [N3k, N5k, N6k, N9k-F, N9k]
+  _exclude: [N3k, N5k, N6k, N3k-F, N9k-F, N9k]
   kind: int
   get_value: '/^port.channel load.defer (\d+)$/'
   set_value: "port-channel load-defer %s"
@@ -64,7 +66,7 @@ port_channel_load_balance:
   set_value: "port-channel load-balance %s %s %s %s %s %s"
 
 resilient:
-  _exclude: [N5k, N6k, N7k, N9k-F]
+  _exclude: [N5k, N6k, N7k, N3k-F, N9k-F]
   kind: boolean
   get_value: '/^port-channel load-balance resilient$/'
   set_value: "%s port-channel load-balance resilient"
@@ -80,5 +82,5 @@ rotate:
   default_value: 0
 
 symmetry:
-  _exclude: [N5k, N6k, N7k, N9k-F]
+  _exclude: [N5k, N6k, N7k, N3k-F, N9k-F]
   default_value: false

data/lib/cisco_node_utils/cmd_ref/radius_global.yaml

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

data/lib/cisco_node_utils/cmd_ref/route_map.yaml

@@ -45,46 +45,46 @@ match_community_exact_match:
   default_value: false
 
 match_evpn_route_type:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   multiple:
   get_value: '/^match evpn route-type (.*)$/'
   set_value: "<state> match evpn route-type <type>"
   default_value: []
 
 match_evpn_route_type_1:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_2_all:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_2_mac_ip:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_2_mac_only:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_3:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_4:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_5:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_6:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_evpn_route_type_all:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   default_value: false
 
 match_ext_community:
@@ -195,13 +195,13 @@ match_ipv6_route_src_prefix_list:
   default_value: []
 
 match_length:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   get_value: '/^match length (\d+) (\d+)$/'
   set_value: "<state> match length <min> <max>"
   default_value: []
 
 match_mac_list:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   get_value: '/^match mac-list (.*)$/'
   set_value: "<state> match mac-list <mac>"
   default_value: []
@@ -213,8 +213,8 @@ match_metric:
   default_value: []
 
 match_ospf_area:
-  _exclude: [N5k, N6k, N7k, N9k-F]
-  os_version: 'N3k, N9k:7.0.3.I5.1'
+  _exclude: [N5k, N6k, N7k, N3k-F, N9k-F]
+  os_version: 'N35:7.0.3.I7.1; N3k, N9k:7.0.3.I5.1'
   get_value: '/^match ospf-area (.*)$/'
   set_value: "<state> match ospf-area <area>"
   default_value: []
@@ -275,7 +275,7 @@ match_tag:
   default_value: []
 
 match_vlan:
-  _exclude: [N3k, N9k, N9k-F]
+  _exclude: [N35, N3k, N3k-F, N9k, N9k-F]
   get_value: '/^match vlan (.*)$/'
   set_value: "<state> match vlan <range>"
   default_value: ''
@@ -305,7 +305,7 @@ set_comm_list:
   default_value: false
 
 set_community:
-  os_version: 'N9k:7.0.3.I5.1'
+  os_version: 'N35:7.0.3.I7.1; N9k:7.0.3.I5.1'
   get_value: '/^set community(?:\s+.*)?$/'
   set_value: "<state> set community <string>"
 
@@ -396,6 +396,7 @@ set_extcommunity_cost_device:
   N7k: *set_extcommunity_device_no_str
   N9k: *set_extcommunity_device_str
   N9k-F: *set_extcommunity_device_str
+  N3k-F: *set_extcommunity_device_str
 
 set_extcommunity_cost_igp:
   default_value: []
@@ -425,13 +426,13 @@ set_interface:
   default_value: false
 
 set_ipv4_default_next_hop:
-  _exclude: [N5k, N6k, N9k, N9k-F]
+  _exclude: [N35, N5k, N6k, N3k-F, N9k, N9k-F]
   get_value: '/^set ip default next-hop (.*)$/'
   set_value: "<state> set ip default next-hop <nh>"
   default_value: []
 
 set_ipv4_default_next_hop_load_share:
-  _exclude: [N5k, N6k, N9k, N9k-F]
+  _exclude: [N35, N5k, N6k, N3k-F, N9k, N9k-F]
   default_value: false
 
 set_ipv4_next_hop:
@@ -442,7 +443,7 @@ set_ipv4_next_hop:
 
 set_ipv4_next_hop_load_share:
   _exclude: [N5k, N6k]
-  os_version: 'N9k-F:7.0.3.F2.1; N9k:7.0.3.I5.1'
+  os_version: 'N35:7.0.3.I7.1; N9k-F:7.0.3.F2.1; N9k:7.0.3.I5.1'
   default_value: false
 
 set_ipv4_next_hop_peer_addr:
@@ -453,7 +454,7 @@ set_ipv4_next_hop_peer_addr:
 
 set_ipv4_next_hop_redist:
   kind: boolean
-  os_version: 'N3k, N9k:7.0.3.I5.1'
+  os_version: 'N35:7.0.3.I7.1; N3k, N9k:7.0.3.I5.1'
   get_value: '/^set ip next-hop redist-unchanged$/'
   set_value: "<state> set ip next-hop redist-unchanged"
   default_value: false
@@ -476,13 +477,13 @@ set_ipv4_prefix:
   default_value: false
 
 set_ipv6_default_next_hop:
-  _exclude: [N5k, N6k, N9k, N9k-F]
+  _exclude: [N35, N5k, N6k, N3k-F, N9k, N9k-F]
   get_value: '/^set ipv6 default next-hop (.*)$/'
   set_value: "<state> set ipv6 default next-hop <nh>"
   default_value: []
 
 set_ipv6_default_next_hop_load_share:
-  _exclude: [N5k, N6k, N9k, N9k-F]
+  _exclude: [N35, N5k, N6k, N3k-F, N9k, N9k-F]
   default_value: false
 
 set_ipv6_next_hop:
@@ -493,7 +494,7 @@ set_ipv6_next_hop:
 
 set_ipv6_next_hop_load_share:
   _exclude: [N5k, N6k]
-  os_version: 'N9k-F:7.0.3.F2.1; N9k:7.0.3.I5.1'
+  os_version: 'N35:7.0.3.I7.1; N9k-F:7.0.3.F2.1; N9k:7.0.3.I5.1'
   default_value: false
 
 set_ipv6_next_hop_peer_addr:
@@ -504,7 +505,7 @@ set_ipv6_next_hop_peer_addr:
 
 set_ipv6_next_hop_redist:
   kind: boolean
-  os_version: 'N3k, N9k:7.0.3.I5.1'
+  os_version: 'N35:7.0.3.I7.1; N3k, N9k:7.0.3.I5.1'
   get_value: '/^set ipv6 next-hop redist-unchanged$/'
   set_value: "<state> set ipv6 next-hop redist-unchanged"
   default_value: false
@@ -588,7 +589,7 @@ set_tag:
   default_value: false
 
 set_vrf:
-  _exclude: [N3k, N5k, N6k, N9k, N9k-F]
+  _exclude: [N35, N3k, N5k, N6k, N3k-F, N9k, N9k-F]
   get_value: '/^set vrf (\S+)$/'
   set_value: "<state> set vrf <vrf>"
   default_value: false

data/lib/cisco_node_utils/cmd_ref/show_version.yaml

@@ -1,7 +1,15 @@
 # show_version
 ---
 _template:
-  get_command: 'sh version'
+  N5k: &template5k
+    get_command: 'sh version'
+  N6k: *template5k
+  N3k: &template3k
+    get_command: 'sh hardware'
+  N7k: *template3k
+  N9k: *template3k
+  N3k-F: *template3k
+  N9k-F: *template3k
   nexus:
     data_format: nxapi_structured
   ios_xr:
@@ -65,9 +73,9 @@ system_image:
     get_value: '/^\s*(\S*)\s*version.*\[Boot image\]$/'
 
 uptime:
-  # TODO: redundant with show_system, uptime?
+  get_command: 'sh system uptime'
   get_data_format: cli
-  get_value: '/uptime is (.*)/'
+  get_value: '/Kernel uptime:\s+(.*)/'
 
 version:
   nexus:

data/lib/cisco_node_utils/cmd_ref/snmp_community.yaml

@@ -8,6 +8,7 @@ _template:
     get_context: ["TABLE_snmp_community", "ROW_snmp_community"]
   N9k: *template_structured
   N9k-F: *template_structured
+  N3k-F: *template_structured
 
 acl:
   N3k: &acl_structured_get
@@ -16,6 +17,7 @@ acl:
     set_value: "<state> snmp-server community <name> use-acl <acl>"
   N9k: *acl_structured_get
   N9k-F: *acl_structured_get
+  N3k-F: *acl_structured_get
   ios_xr:
     get_command: "show running snmp"
     get_value: '/^snmp-server community <name> IPv4 (.*)$/'
@@ -34,6 +36,7 @@ all_communities:
     get_value: 'community_name'
   N9k: *all_structured
   N9k-F: *all_structured
+  N3k-F: *all_structured
   N5k: &all_cli
     get_command: "show running snmp all"
     get_value: '/^snmp-server community (\S+) /'
@@ -57,6 +60,7 @@ group:
     get_value: ["community_name <name>", "grouporaccess", '/^(?:Community groupname:\s+)?(\S+)/']
   N9k: *group_structured_get
   N9k-F: *group_structured_get
+  N3k-F: *group_structured_get
   ios_xr: &group_cli_based_get
     kind: string
     get_command: "show running snmp all"