cisco_node_utils 1.2.0 → 1.3.0

data/lib/cisco_node_utils/cmd_ref/memory.yaml

@@ -1,13 +1,24 @@
 # memory
 ---
+_template:
+  nexus:
+    get_command: 'show system resources'
+  ios_xr:
+    get_command: 'show memory summary'
+
 free:
-  config_get: 'show system resources'
-  config_get_token: '/Memory.* (\S+) free/'
+  ios_xr:
+    get_value: '/Physical Memory:.*\((\S+) available\)/'
+  nexus:
+    get_value: '/Memory.* (\S+) free/'
 
 total:
-  config_get: 'show system resources'
-  config_get_token: '/Memory.* (\S+) total/'
+  ios_xr:
+    get_value: '/Physical Memory: *(\S+) total/'
+  nexus:
+    get_value: '/Memory.* (\S+) total/'
 
 used:
-  config_get: 'show system resources'
-  config_get_token: '/Memory.* (\S+) used/'
+  _exclude: [ios_xr]
+  nexus:
+    get_value: '/Memory.* (\S+) used/'

data/lib/cisco_node_utils/cmd_ref/ntp_config.yaml

@@ -1,7 +1,14 @@
 # ntp_config
 ---
+_template:
+  get_command: "show running-config ntp"
+
 source_interface:
-  config_get: "show running-config ntp"
-  config_get_token: '/^ntp source-interface\s+(.*)$/'
-  config_set: '<state> ntp source-interface <source_interface>'
   default_value: ~
+  nexus:
+    get_value: '/^ntp source-interface\s+(.*)$/'
+    set_value: '<state> ntp source-interface <source_interface>'
+  ios_xr:
+    context: ["ntp"]
+    get_value: '/source\s+(.*)$/'
+    set_value: '<state> source <source_interface>'

data/lib/cisco_node_utils/cmd_ref/ntp_server.yaml

@@ -1,14 +1,26 @@
 # ntp_server
 ---
+_template:
+  ios_xr:
+    context: ["ntp"]
+    get_command: "show running-config ntp"
+
 prefer:
   multiple: true
-  config_get: "show running-config all | include 'ntp server(.*)(prefer)'"
-  config_get_token: '/ntp server (\S+)/'
   default_value: []
+  nexus:
+    get_command: "show running-config all | include 'ntp server(.*)(prefer)'"
+    get_value: '/ntp server (\S+)/'
+  ios_xr:
+    get_value: '/server (?:ipv6 )?(\S+) prefer/'
 
 server:
   multiple: true
-  config_get: "show running-config all | include 'ntp server'"
-  config_get_token: '/ntp server (\S+)/'
-  config_set: '<state> ntp server <ip> <prefer>'
   default_value: []
+  nexus:
+    get_command: "show running-config all | include 'ntp server'"
+    get_value: '/ntp server (\S+)/'
+    set_value: '<state> ntp server <ip> <prefer>'
+  ios_xr:
+    get_value: '/server (?:ipv6 )?(\S+)/'
+    set_value: '<state> server <ip> <prefer>'

data/lib/cisco_node_utils/cmd_ref/ospf.yaml

@@ -1,50 +1,53 @@
 # ospf
 ---
+_exclude: [ios_xr]
+
 _template:
-  config_get: "show running ospf all"
-  config_get_token: '/^router ospf <name>$/'
-  config_get_token_append:
-    - '/^vrf <vrf>$/'
-  config_set: "router ospf <name>"
-  config_set_append:
-    - "vrf <vrf>"
+  get_command: "show running ospf all"
+  context:
+    - "router ospf <name>"
+    - "(?)vrf <vrf>"
 
 auto_cost:
-  config_get_token_append: '/^auto-cost reference-bandwidth (\d+)\s*(\S+)?$/'
-  config_set_append: "auto-cost reference-bandwidth <cost> <type>"
+  get_value: '/^auto-cost reference-bandwidth (\d+)\s*(\S+)?$/'
+  set_value: "auto-cost reference-bandwidth <cost> <type>"
   default_value: [40, "Gbps"]
 
 default_metric:
   kind: int
-  config_get_token_append: '/^default-metric (\d+)?$/'
-  config_set_append: "<state> default-metric <metric>"
+  get_value: '/^default-metric (\d+)?$/'
+  set_value: "<state> default-metric <metric>"
   default_value: 0
 
-feature:
-  config_get: "show running ospf"
-  config_get_token: '/^feature ospf$/'
-  config_set: "%s feature ospf"
-
 log_adjacency:
   auto_default: false
-  config_get_token_append: '/^(log-adjacency-changes)\s*(detail)?$/'
-  config_set_append: "<state> log-adjacency-changes <type>"
+  get_value: '/^(log-adjacency-changes)\s*(detail)?$/'
+  set_value: "<state> log-adjacency-changes <type>"
   default_value: :none
 
+process_initialized:
+  _exclude: [ios_xr, N3k, N7k, N8k, N9k]
+  # ospf process initialization state
+  kind: boolean
+  context: ~
+  get_command: "show ip ospf stat"
+  get_value: '/^No SAP is registered/' # Ospf is not initialized when seen
+
 router:
   multiple: true
-  config_get: "show running ospf"
-  config_get_token: '/^router ospf (\S+)$/'
-  config_set: "%s router ospf %s"
+  get_command: "show running ospf"
+  context: ~
+  get_value: '/^router ospf (\S+)$/'
+  set_value: "<state> router ospf <name>"
 
 router_id:
-  config_get_token_append: '/^router-id (\S+)?$/'
-  config_set_append: "<state> router-id <router_id>"
+  get_value: '/^router-id (\S+)?$/'
+  set_value: "<state> router-id <router_id>"
   default_value: ""
 
 timer_throttle_lsa:
-  config_get_token_append: '/^timers throttle lsa (\d+) (\d+) (\d+)$/'
-  config_set_append: "timers throttle lsa <start> <hold> <max>"
+  get_value: '/^timers throttle lsa (\d+) (\d+) (\d+)$/'
+  set_value: "timers throttle lsa <start> <hold> <max>"
 
 timer_throttle_lsa_hold:
   default_value: 5000
@@ -56,8 +59,8 @@ timer_throttle_lsa_start:
   default_value: 0
 
 timer_throttle_spf:
-  config_get_token_append: '/^timers throttle spf (\d+) (\d+) (\d+)$/'
-  config_set_append: "timers throttle spf <start> <hold> <max>"
+  get_value: '/^timers throttle spf (\d+) (\d+) (\d+)$/'
+  set_value: "timers throttle spf <start> <hold> <max>"
 
 timer_throttle_spf_hold:
   default_value: 1000
@@ -70,5 +73,6 @@ timer_throttle_spf_start:
 
 vrf:
   multiple: true
-  config_get_token: ['/^router ospf <name>$/i', '/^vrf\s+(\S+)$/']
-  config_set: ["router ospf <name>", "<state> vrf <vrf>", "end"]
+  context: ["router ospf <name>"]
+  get_value: '/^vrf\s+(\S+)$/'
+  set_value: "<state> vrf <vrf>"

data/lib/cisco_node_utils/cmd_ref/overlay_global.yaml

@@ -1,16 +1,18 @@
 # overlay_global
 ---
+_exclude: [N3k, ios_xr]
+
 anycast_gateway_mac:
   kind: string
-  config_get: "show running all | inc 'fabric forwarding'"
-  config_get_token: '/^fabric forwarding anycast-gateway-mac (\S+)$/'
-  config_set: "<state> fabric forwarding anycast-gateway-mac <mac_addr>"
+  get_command: "show running all | inc 'fabric forwarding'"
+  get_value: '/^fabric forwarding anycast-gateway-mac (\S+)$/'
+  set_value: "<state> fabric forwarding anycast-gateway-mac <mac_addr>"
   default_value: ""
 
 dup_host_ip_addr_detection:
-  config_get: "show running all | inc 'fabric forwarding'"
-  config_get_token: '/^fabric forwarding dup-host-ip-addr-detection (\d+) (\d+)$/'
-  config_set: "<state> fabric forwarding dup-host-ip-addr-detection <host_moves> <timeout>"
+  get_command: "show running all | inc 'fabric forwarding'"
+  get_value: '/^fabric forwarding dup-host-ip-addr-detection (\d+) (\d+)$/'
+  set_value: "<state> fabric forwarding dup-host-ip-addr-detection <host_moves> <timeout>"
 
 dup_host_ip_addr_detection_host_moves:
   default_value: 5
@@ -19,12 +21,12 @@ dup_host_ip_addr_detection_timeout:
   default_value: 180
 
 dup_host_mac_detection:
-  config_get: 'show running | i l2rib'
-  config_get_token: '/^l2rib dup-host-mac-detection (\d+) (\d+)$/'
-  config_set: "l2rib dup-host-mac-detection <host_moves> <timeout>"
+  get_command: 'show running | i l2rib'
+  get_value: '/^l2rib dup-host-mac-detection (\d+) (\d+)$/'
+  set_value: "l2rib dup-host-mac-detection <host_moves> <timeout>"
 
 dup_host_mac_detection_default:
-  config_set: "l2rib dup-host-mac-detection default"
+  set_value: "l2rib dup-host-mac-detection default"
 
 dup_host_mac_detection_host_moves:
   default_value: 5

data/lib/cisco_node_utils/cmd_ref/pim.yaml

@@ -1,40 +1,37 @@
 # pim
 ---
+_exclude: [ios_xr]
+
 _template:
-  config_get : "show run pim all"
-  config_get_token :
-    - '/^vrf context <vrf>$/'
-  config_set :
-    - "vrf context <vrf>"
+  get_command: "show run pim all"
+  get_context:
+    - '(?)/^vrf context <vrf>$/'
+  set_context:
+    - '(?)vrf context <vrf>'
 
 all_group_lists:
   multiple:
-  config_get_token_append : '/^<afi> pim rp-address ([0-9\.]+) group-list (\S+)/'
+  get_value : '/^<afi> pim rp-address ([0-9\.]+) group-list (\S+)/'
 
 all_rp_addresses:
   multiple:
-  config_get_token_append: '/^<afi> pim rp-address ([0-9\.]+)/'
+  get_value: '/^<afi> pim rp-address ([0-9\.]+)/'
 
 all_ssm_ranges:
   multiple:
-  config_get_token_append : '/^<afi> pim ssm range (.*)$/'
-
-feature:
-  config_get: 'show running | section feature'
-  config_get_token: '/^feature pim$/' # TBD pim6
-  config_set: 'feature pim'
+  get_value : '/^<afi> pim ssm range (.*)$/'
 
 group_list:
   default_value: ~
-  config_get_token_append: '/^<afi> pim rp-address (\S+) group-list (\S+)/'
-  config_set_append: "<state> <afi> pim rp-address <addr> group-list <group>"
+  get_value: '/^<afi> pim rp-address (\S+) group-list (\S+)/'
+  set_value: "<state> <afi> pim rp-address <addr> group-list <group>"
 
 rp_address:
   multiple:
-  config_get_token_append: '/^<afi> pim rp-address (\S+)/'
-  config_set_append: "<state> <afi> pim rp-address <addr>"
+  get_value: '/^<afi> pim rp-address (\S+)/'
+  set_value: "<state> <afi> pim rp-address <addr>"
   default_value: ~
 
 ssm_range:
-  config_get_token_append: '/^<afi> pim ssm range (.*)/'
-  config_set_append: "<state> <afi> pim ssm range <ssm_range>"
+  get_value: '/^<afi> pim ssm range (.*)/'
+  set_value: "<state> <afi> pim ssm range <ssm_range>"

data/lib/cisco_node_utils/cmd_ref/portchannel_global.yaml

@@ -1,69 +1,84 @@
 # portchannel_global
 ---
+_exclude: [ios_xr]
+
 _template:
-  config_get: "show running all"
+  get_command: "show running all"
 
 asymmetric:
-  _exclude: [/N6/, /N5/, /N3/, /N9/]
+  _exclude: [N3k, N5k, N6k, N8k, N9k]
   default_value: false
 
 bundle_hash:
-  /N(5|6|7)/:
+  N3k: &bundle_hash_ip
     default_value: 'ip'
-  /N(3|9)/:
+  N5k: *bundle_hash_ip
+  N6k: *bundle_hash_ip
+  N7k: *bundle_hash_ip
+  N8k: &bundle_hash_ip_l4port
     default_value: 'ip-l4port'
+  N9k: *bundle_hash_ip_l4port
 
 bundle_select:
   default_value: 'src-dst'
 
 concatenation:
-  _exclude: [/N7/, /N5/, /N6/]
+  _exclude: [N3k, N5k, N6k, N7k, N8k]
   default_value: false
 
 hash_distribution:
-  _exclude: [/N6/, /N5/, /N3/, /N9/]
-  config_get_token: ['/^port.channel hash.distribution (.*)$/']
-  config_set: ["terminal dont-ask", "port-channel hash-distribution %s", "end"]
+  _exclude: [N3k, N5k, N6k, N8k, 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: [/N7/, /N3/, /N9/]
-  default_value: 'CRC10b'
+  _exclude: [N3k, N7k, N8k, N9k]
+  default_value: ~
 
 load_balance_type:
   kind: string
-  /N(5|6)/:
+  N3k: &load_balance_type_symmetric
+    default_only: "no_rotate"
+  N5k: &load_balance_type_ethernet
     default_only: "ethernet"
-  /N7/:
+  N6k: *load_balance_type_ethernet
+  N7k: &load_balance_type_asymmetric
     default_only: "asymmetric"
-  /N(3|9)/:
+  N8k: &load_balance_type_no_hash
+    default_only: "no_hash"
+  N9k: &load_balance_type_symmetry
     default_only: "symmetry"
 
 load_defer:
-  _exclude: [/N6/, /N5/, /N3/, /N9/]
+  _exclude: [N3k, N5k, N6k, N8k, N9k]
   kind: int
-  config_get_token: ['/^port.channel load.defer (\d+)$/']
-  config_set: ["port-channel load-defer %s"]
+  get_value: '/^port.channel load.defer (\d+)$/'
+  set_value: "port-channel load-defer %s"
   default_value: 120
 
 port_channel_load_balance:
   multiple:
-  config_get_token: '/^port-channel load-balance (.*)$/'
-  config_set: "port-channel load-balance %s %s %s %s %s %s"
+  get_value: '/^port-channel load-balance (.*)$/'
+  set_value: "port-channel load-balance %s %s %s %s %s %s"
 
 resilient:
-  _exclude: [/N6/, /N5/, /N7/]
+  _exclude: [N5k, N6k, N7k, N8k]
   kind: boolean
-  config_get: "show running-config all"
-  config_get_token: '/^port-channel load-balance resilient$/'
-  config_set: "%s port-channel load-balance resilient"
-  default_value: false
+  get_value: '/^port-channel load-balance resilient$/'
+  set_value: "%s port-channel load-balance resilient"
+  N3k:
+    auto_default: false
+    default_value: true
+  N9k:
+    default_value: false
 
 rotate:
-  _exclude: [/N5/, /N6/]
+  _exclude: [N3k, N5k, N6k]
   kind: int
   default_value: 0
 
 symmetry:
-  _exclude: [/N7/, /N3/, /N5/, /N6/]
+  _exclude: [N5k, N6k, N7k, N8k]
   default_value: false

data/lib/cisco_node_utils/cmd_ref/radius_global.yaml

@@ -1,25 +1,30 @@
 # radius_global.yaml
 ---
+_template:
+  nexus:
+    get_command: "show running-config radius all"
+  ios_xr:
+    get_command: "show running-config radius-server"
+
 key:
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server key \d+\s+(\S+)/'
-  config_set: '<state> radius-server key <key>'
+  get_value: '/^radius-server key \d+\s+(\S+)/'
+  set_value: '<state> radius-server key <key>'
 
 key_format:
   kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server key (\d).*/'
+  get_value: '/^radius-server key (\d).*/'
 
 retransmit:
   kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server retransmit (\d+).*/'
-  config_set: '<state> radius-server retransmit <count>'
-  default_value: 1
+  get_value: '/^radius-server retransmit (\d+).*/'
+  set_value: '<state> radius-server retransmit <count>'
+  nexus:
+    default_value: 1
+  ios_xr:
+    default_value: 3
 
 timeout:
   kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server timeout (\d+).*/'
-  config_set: '<state> radius-server timeout <timeout>'
+  get_value: '/^radius-server timeout (\d+).*/'
+  set_value: '<state> radius-server timeout <timeout>'
   default_value: 5

data/lib/cisco_node_utils/cmd_ref/radius_server.yaml

@@ -1,64 +1,100 @@
 # radius_server.yaml
 ---
+_template:
+  nexus:
+    get_command: "show running-config radius all"
+  ios_xr:
+    get_command: "show running-config radius-server"
+    multiple: true
+
 accounting:
+  _exclude: [ios_xr]
   auto_default: false
   kind: boolean
-  config_get: "show running-config radius"
-  config_get_token: '/^radius-server host %s.* (accounting) .*$/'
-  config_set: '<state> radius-server host <ip> accounting'
+  get_command: "show running-config radius"
+  get_value: '/^radius-server host <ip>.* (accounting) .*$/'
+  set_value: '<state> radius-server host <ip> accounting'
   default_value: true
 
 acct-port:
-  kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* acct-port (\d+).*$/'
-  config_set: '<state> radius-server host <ip> acct-port <port>'
-  default_value: 1813
+  get_value: '/^radius-server host <ip>.* acct-port (\d+).*$/'
+  nexus:
+    default_value: 1813
+    kind: int
+    set_value: '<state> radius-server host <ip> acct-port <port>'
+  ios_xr:
+    default_value: 1646
 
 auth-port:
-  kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* auth-port (\d+).*$/'
-  config_set: '<state> radius-server host <ip> auth-port <port>'
-  default_value: 1812
+  get_value: '/^radius-server host <ip>.* auth-port (\d+).*$/'
+  nexus:
+    default_value: 1812
+    kind: int
+    set_value: '<state> radius-server host <ip> auth-port <port>'
+  ios_xr:
+    default_value: 1645
 
 authentication:
-  auto_default: false
+  _exclude: [ios_xr]
   kind: boolean
-  config_get: "show running-config radius"
-  config_get_token: '/^radius-server host %s.* (authentication) .*$/'
-  config_set: '<state> radius-server host <ip> authentication'
+  get_command: "show running-config radius"
+  get_value: '/^radius-server host <ip>.* (authentication) .*$/'
+  set_value: '<state> radius-server host <ip> authentication'
   default_value: true
 
-hosts:
+host_port_pairs:
+  _exclude: [nexus]
   multiple: true
-  config_get: "show running-config radius"
-  config_get_token: '/^radius-server host (\S+).*/'
-  config_set: '<state> radius-server host <ip>'
+  get_command: "show running-config radius-server"
+  get_value: '/^radius-server host <ip> auth-port (\d+) acct-port (\d+)/'
+  default_value: ''
+
+hosts:
+  get_value: '/^radius-server host (\S+).*/'
   default_value: ''
+  nexus:
+    multiple: true
+    get_command: "show running-config radius"
+    set_value: '<state> radius-server host <ip>'
+  ios_xr:
+    set_value: '<state> radius-server host <ip> auth-port <auth_port> acct-port <acct_port>'
 
 key:
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* key \d+\s+(\S+)/'
-  config_set: '<state> radius-server host <ip> key <key>'
   default_value: ~
+  nexus:
+    get_value: '/^radius-server host <ip>.* key \d+\s+(\S+)/'
+    set_value: '<state> radius-server host <ip> key <key>'
+  ios_xr:
+    context: ["radius-server host <ip> auth-port <auth_port> acct-port <acct_port>"]
+    get_value: '/key \d+\s+(\S+)/'
+    set_value: '<state> key <key>'
 
 key_format:
-  kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* key (\d).*$/'
   default_value: ~
+  nexus:
+    get_value: '/^radius-server host <ip>.* key (\d).*$/'
+  ios_xr:
+    context: ["radius-server host <ip> auth-port <auth_port> acct-port <acct_port>"]
+    get_value: '/key (\d).*/'
 
 retransmit:
-  kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* retransmit (\d+).*$/'
-  config_set: '<state> radius-server host <ip> retransmit <count>'
   default_value: ~
+  nexus:
+    kind: int
+    get_value: '/^radius-server host <ip>.* retransmit (\d+).*$/'
+    set_value: '<state> radius-server host <ip> retransmit <count>'
+  ios_xr:
+    context: ["radius-server host <ip> auth-port <auth_port> acct-port <acct_port>"]
+    get_value: '/retransmit (\d+).*$/'
+    set_value: '<state> retransmit <count>'
 
 timeout:
-  kind: int
-  config_get: "show running-config radius all"
-  config_get_token: '/^radius-server host %s.* timeout (\d+).*$/'
-  config_set: '<state> radius-server host <ip> timeout <timeout>'
   default_value: ~
+  nexus:
+    kind: int
+    get_value: '/^radius-server host <ip>.* timeout (\d+).*$/'
+    set_value: '<state> radius-server host <ip> timeout <timeout>'
+  ios_xr:
+    context: ["radius-server host <ip> auth-port <auth_port> acct-port <acct_port>"]
+    get_value: '/timeout (\d+).*$/'
+    set_value: '<state> timeout <timeout>'