cisco
diff --git a/‎CHANGELOG.md
Lines changed: 23 additions & 0 deletions b/‎CHANGELOG.md
Lines changed: 23 additions & 0 deletions
diff --git a/‎README.md
Lines changed: 2 additions & 1 deletion b/‎README.md
Lines changed: 2 additions & 1 deletion
diff --git a/‎docs/cisco_node_utils.yaml.example
Lines changed: 6 additions & 0 deletions b/‎docs/cisco_node_utils.yaml.example
Lines changed: 6 additions & 0 deletions
diff --git a/‎lib/cisco_node_utils/cisco_cmn_utils.rb
Lines changed: 6 additions & 15 deletions b/‎lib/cisco_node_utils/cisco_cmn_utils.rb
Lines changed: 6 additions & 15 deletions
diff --git a/‎lib/cisco_node_utils/client/nxapi/client.rb
Lines changed: 19 additions & 1 deletion b/‎lib/cisco_node_utils/client/nxapi/client.rb
Lines changed: 19 additions & 1 deletion
diff --git a/‎lib/cisco_node_utils/client/utils.rb
Lines changed: 1 addition & 1 deletion b/‎lib/cisco_node_utils/client/utils.rb
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/cisco_node_utils/cmd_ref/README_YAML.md
Lines changed: 1 addition & 1 deletion b/‎lib/cisco_node_utils/cmd_ref/README_YAML.md
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/cisco_node_utils/cmd_ref/interface.yaml
Lines changed: 25 additions & 0 deletions b/‎lib/cisco_node_utils/cmd_ref/interface.yaml
Lines changed: 25 additions & 0 deletions
diff --git a/‎lib/cisco_node_utils/cmd_ref/radius_global.yaml
Lines changed: 1 addition & 1 deletion b/‎lib/cisco_node_utils/cmd_ref/radius_global.yaml
Lines changed: 1 addition & 1 deletion
diff --git a/‎lib/cisco_node_utils/cmd_ref/radius_server.yaml
Lines changed: 1 addition & 1 deletion b/‎lib/cisco_node_utils/cmd_ref/radius_server.yaml
Lines changed: 1 addition & 1 deletion
@@ -1,6 +1,28 @@
 Changelog
 =========
 
+## [v1.6.0]
+
+### New feature support
+
+#### Cisco Resources
+* Route_map
+  * route_map (@saichint)
+
+* Upgrade
+  * upgrade (@rahushen)
+
+### Added
+
+* Extend interface with attributes:
+   * `load_interval_counter_1_delay`
+   * `load_interval_counter_2_delay`
+   * `load_interval_counter_3_delay`
+
+### Changed
+
+### Removed
+
 ## [v1.5.0]
 
 ### New feature support
@@ -397,6 +419,7 @@ Changelog
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
+[v1.6.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.5.0...v1.6.0
 [v1.5.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.4.1...v1.5.0
 [v1.4.1]: https://github.com/cisco/cisco-network-node-utils/compare/v1.4.0...v1.4.1
 [v1.4.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.3.0...v1.4.0
 
@@ -73,7 +73,8 @@ If both files exist and are readable, configuration in the user-specific file wi
 
 This file specifies the host, port, username, and/or password to be used to connect to one or more nodes.
 
-* When installing this gem on NX-OS nodes, this file is generally not needed, as the default client behavior is sufficient.
+* When installing this gem on NX-OS nodes, this file is generally not needed, as the default client behavior is sufficient.  This file can be used however to override the default cookie.
+    - Nodes defined with a single `cookie` parameter will override the default cookie.
 * When developing for or testing this gem, this file can specify one or more NX-OS nodes to run tests against. In this case:
     - A node labeled as `default` will be the default node to test against.
     - Nodes with other names can be selected at test execution time.
 
@@ -14,6 +14,12 @@ nxapi_remote:
 nxapi_local:
   # (none needed)
 
+# Example config for running NXAPI on a node with default cookie override:
+# User 'nxapi' must be configured with requisite privilages to configure the device.
+# This will override the default 'admin:local' cookie and use 'nxapi:local' instead.
+default:
+  cookie: 'nxapi:local'
+
 # Example config for running gRPC remotely:
 grpc_remote:
   host: 192.168.1.100
 
@@ -361,20 +361,11 @@ def self.merge_range(range)
       merged
     end # merge_range
 
-    # Add double quotes to string.
-    #
-    # Helper method to add a double quote to the beginning
-    # and end of a string.
-    #
-    # Nxapi adds an escape character to config lines that
-    # nvgen in this way in some but not all nxos releases.
-    #
-    # Input: String (Example 'foo')
-    # Returns: String with double quotes: (Example: '"foo"'
-    #
-    def self.add_quotes(string)
-      string = "\"#{string}\"" if image_version?(/8.0/)
-      string
-    end
+    def self.add_quotes(value)
+      return value if image_version?(/7.3.0/)
+      value = "\"#{value}\"" unless
+        value.start_with?('"') && value.end_with?('"')
+      value
+    end # add_quotes
   end # class Utils
 end   # module Cisco
@@ -56,6 +56,7 @@ def initialize(**kwargs)
       # unit testing where the base Net::HTTP will meet our needs.
       require 'net_http_unix'
       @http = NetX::HTTPUnix.new('unix://' + NXAPI_UDS)
+      @cookie = kwargs[:cookie]
     else
       # Remote connection. This is primarily expected
       # when running e.g. from a Unix server as part of Minitest.
@@ -76,13 +77,24 @@ def self.validate_args(**kwargs)
     if kwargs[:host].nil?
       # Connection to UDS - no username or password either
       fail ArgumentError unless kwargs[:username].nil? && kwargs[:password].nil?
+      validate_cookie(**kwargs)
     else
       # Connection to remote system - username and password are required
       fail TypeError, 'username is required' if kwargs[:username].nil?
       fail TypeError, 'password is required' if kwargs[:password].nil?
     end
   end
 
+  def self.validate_cookie(**kwargs)
+    return if kwargs[:cookie].nil?
+    format = 'Cookie format must match: <username>:local'
+    msg = "Invalid cookie: [#{kwargs[:cookie]}]. : #{format}"
+
+    fail TypeError, msg unless kwargs[:cookie].is_a?(String)
+    fail TypeError, msg unless /\S+:local/.match(kwargs[:cookie])
+    fail ArgumentError, 'empty cookie' if kwargs[:cookie].empty?
+  end
+
   # Clear the cache of CLI output results.
   #
   # If cache_auto is true (default) then this will be performed automatically
@@ -189,6 +201,7 @@ def req(type, command_or_list)
     # send the request and get the response
     debug("Sending HTTP request to NX-API at #{@http.address}:\n" \
           "#{request.to_hash}\n#{request.body}")
+    tries = 2
     begin
       # Explicitly use http to avoid EOFError
       # http://stackoverflow.com/a/23080693
@@ -197,6 +210,10 @@ def req(type, command_or_list)
     rescue Errno::ECONNREFUSED, Errno::ECONNRESET
       emsg = 'Connection refused or reset. Is the NX-API feature enabled?'
       raise Cisco::ConnectionRefused, emsg
+    rescue EOFError
+      tries -= 1
+      retry if tries > 0
+      raise
     end
     handle_http_response(response)
     output = parse_response(response)
@@ -222,8 +239,9 @@ def req(type, command_or_list)
 
   def build_http_request(type, command_string)
     if @username.nil? || @password.nil?
+      cookie = @cookie.nil? ? 'admin:local' : @cookie
       request = Net::HTTP::Post.new(NXAPI_UDS_URI_PATH)
-      request['Cookie'] = 'nxapi_auth=admin:local'
+      request['Cookie'] = "nxapi_auth=#{cookie}"
     else
       request = Net::HTTP::Post.new(NXAPI_REMOTE_URI_PATH)
       request.basic_auth("#{@username}", "#{@password}")
 
@@ -130,7 +130,7 @@ def self.to_regexp(input)
   # @param keys [Array] lookup sequence
   def self.filter_data(data: nil,
                        keys: nil)
-    return nil if data.nil?
+    return nil if data.nil? || data.empty?
     keys ||= []
     keys.each do |filter|
       # if filter is a Hash and data is an array, check each
 
@@ -81,7 +81,7 @@ needed. In the above, example 'domain' does not have a value defined for
 
 ### Wildcard substitution
 
-The `(get|set)_(context|value)` properties all support two forms of wildcarding - printf-style and key-value. Each has advantages and disadvantages but key-value is generally preferred for a number of reasons as seen below:
+The `(get|set)_(context|value|command)` properties all support two forms of wildcarding - printf-style and key-value. Each has advantages and disadvantages but key-value is generally preferred for a number of reasons as seen below:
 
 <table>
 <tr><th></th><th>Advantages</th><th>Disadvantages</th></tr>
 
@@ -296,6 +296,31 @@ ipv6_dhcp_relay_src_intf:
   set_value: "<state> ipv6 dhcp relay source-interface <intf>"
   default_value: false
 
+load_interval_counter_1_delay:
+  _exclude: [ios_xr]
+  kind: int
+  get_value: '/^load-interval counter 1 (\d+)$/'
+  set_value: "load-interval counter 1 <delay>"
+  default_value: 30
+
+load_interval_counter_1_delay_vlan_bdi:
+  kind: int
+  default_value: 60
+
+load_interval_counter_2_delay:
+  _exclude: [ios_xr]
+  kind: int
+  get_value: '/^load-interval counter 2 (\d+)$/'
+  set_value: "load-interval counter 2 <delay>"
+  default_value: 300
+
+load_interval_counter_3_delay:
+  _exclude: [ios_xr]
+  kind: int
+  get_value: '/^load-interval counter 3 (\d+)$/'
+  set_value: "<state> load-interval counter 3 <delay>"
+  default_value: false
+
 mtu_loopback:
   kind: boolean
   default_only: ~
 
@@ -7,7 +7,7 @@ _template:
     get_command: "show running-config radius-server"
 
 key:
-  get_value: '/^radius-server key \d+\s+(\S+)/'
+  get_value: '/^radius-server key \d+\s+(.*)/'
   set_value: '<state> radius-server key <key>'
 
 key_format:
 
@@ -62,7 +62,7 @@ hosts:
 key:
   default_value: ~
   nexus:
-    get_value: '/^radius-server host <ip>.* key \d+\s+(\S+)/'
+    get_value: '/^radius-server host <ip>.* key \d+\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>"]