cisco_node_utils 1.2.0 → 1.3.0

data/lib/cisco_node_utils/aaa_authorization_service.rb

@@ -117,7 +117,7 @@ module Cisco
     # aaa authorization login <type> <name> /
     #   local | group <group1 [group2, ...]> [local]
     def groups_method_set(grps, m)
-      fail TypeError unless grps.is_a? Array
+      grps = Array(grps) unless grps.is_a? Array
       fail TypeError unless grps.all? { |x| x.is_a? String }
       fail TypeError unless m.is_a? Symbol
       # only the following are supported (unselected = blank)

data/lib/cisco_node_utils/ace.rb

@@ -17,7 +17,7 @@ require_relative 'node_util'
 module Cisco
   # Ace - node utility class for Ace Configuration
   class Ace < NodeUtil
-    attr_reader :afi, :acl_name, :seqno
+    attr_reader :afi, :acl_name
 
     def initialize(afi, acl_name, seqno)
       @afi = Acl.afi_cli(afi)
@@ -70,18 +70,27 @@ module Cisco
       str = config_get('acl', 'ace', @get_args)
       return nil if str.nil?
 
-      # remark is a description field, needs a separate regex
-      # Example: <MatchData "20 remark foo bar" seqno:"20" remark:"foo bar">
       remark = Regexp.new('(?<seqno>\d+) remark (?<remark>.*)').match(str)
       return remark unless remark.nil?
 
       # rubocop:disable Metrics/LineLength
       regexp = Regexp.new('(?<seqno>\d+) (?<action>\S+)'\
                  ' *(?<proto>\d+|\S+)'\
-                 ' *(?<src_addr>any|host \S+|\S+\/\d+|\S+ [:\.0-9a-fA-F]+|addrgroup \S+)*'\
-                 ' *(?<src_port>eq \S+|neq \S+|lt \S+|''gt \S+|range \S+ \S+|portgroup \S+)?'\
-                 ' *(?<dst_addr>any|host \S+|\S+\/\d+|\S+ [:\.0-9a-fA-F]+|addrgroup \S+)'\
-                 ' *(?<dst_port>eq \S+|neq \S+|lt \S+|gt \S+|range \S+ \S+|portgroup \S+)?')
+                 ' *(?<src_addr>any|host \S+|[:\.0-9a-fA-F]+ [:\.0-9a-fA-F]+|[:\.0-9a-fA-F]+\/\d+|addrgroup \S+)'\
+                 ' *(?<src_port>range \S+ \S+|(lt|eq|gt|neq|portgroup) \S+)?'\
+                 ' *(?<dst_addr>any|host \S+|[:\.0-9a-fA-F]+ [:\.0-9a-fA-F]+|[:\.0-9a-fA-F]+\/\d+|addrgroup \S+)'\
+                 ' *(?<dst_port>range \S+ \S+|(lt|eq|gt|neq|portgroup) \S+)?'\
+                 ' *(?<tcp_flags>(ack *|fin *|urg *|syn *|psh *|rst *)*)?'\
+                 ' *(?<established>established)?'\
+                 ' *(?<precedence>precedence \S+)?'\
+                 ' *(?<dscp>dscp \S+)?'\
+                 ' *(?<time_range>time-range \S+)?'\
+                 ' *(?<packet_length>packet-length (range \d+ \d+|(lt|eq|gt|neq) \d+))?'\
+                 ' *(?<ttl>ttl \d+)?'\
+                 ' *(?<http_method>http-method (\d+|connect|delete|get|head|post|put|trace))?'\
+                 ' *(?<tcp_option_length>tcp-option-length \d+)?'\
+                 ' *(?<redirect>redirect \S+)?'\
+                 ' *(?<log>log)?')
       # rubocop:enable Metrics/LineLength
       regexp.match(str)
     end
@@ -99,22 +108,64 @@ module Cisco
 
       if attrs[:remark]
         cmd = 'ace_remark'
+        set_args_keys(attrs)
       else
         cmd = 'ace'
+        set_args_keys_default
+        set_args_keys(attrs)
         [:action,
          :proto,
          :src_addr,
          :src_port,
          :dst_addr,
          :dst_port,
+         :tcp_flags,
+         :established,
+         :precedence,
+         :dscp,
+         :time_range,
+         :packet_length,
+         :ttl,
+         :http_method,
+         :tcp_option_length,
+         :redirect,
+         :log,
         ].each do |p|
           attrs[p] = '' if attrs[p].nil?
+          send(p.to_s + '=', attrs[p])
         end
+        @get_args = @set_args
       end
-      set_args_keys(attrs)
       config_set('acl', cmd, @set_args)
     end
 
+    # UTILITY FUNCTIONS
+    # -----------------
+
+    # extract value of property from ace
+    def extract_value(prop, prefix=nil)
+      prefix = prop if prefix.nil?
+      ace_match = ace_get
+
+      # matching ace not found
+      return nil if ace_match.nil? # no matching ace found
+
+      # property not defined for matching ace
+      return nil unless ace_match.names.include?(prop)
+
+      # extract and return value that follows prefix + <space>
+      regexp = Regexp.new("#{Regexp.escape(prefix)} (?<extracted>.*)")
+      value_match = regexp.match(ace_match[prop])
+      return nil if value_match.nil?
+      value_match[:extracted]
+    end
+
+    # prepend property name prefix/keyword to value
+    def attach_prefix(val, prop, prefix=nil)
+      prefix = prop.to_s if prefix.nil?
+      @set_args[prop] = val.to_s.empty? ? val : "#{prefix} #{val}"
+    end
+
     # PROPERTIES
     # ----------
     def seqno
@@ -155,8 +206,11 @@ module Cisco
 
     def src_addr
       match = ace_get
-      return nil if match.nil?
-      match.names.include?('src_addr') ? match[:src_addr] : nil
+      return nil if match.nil? || !match.names.include?('src_addr')
+      addr = match[:src_addr]
+      # Normalize addr. Some platforms zero_pad ipv6 addrs.
+      addr.gsub!(/^0*/, '').gsub!(/:0*/, ':')
+      addr
     end
 
     def src_addr=(src_addr)
@@ -175,8 +229,11 @@ module Cisco
 
     def dst_addr
       match = ace_get
-      return nil if match.nil?
-      match.names.include?('dst_addr') ? match[:dst_addr] : nil
+      return nil if match.nil? || !match.names.include?('dst_addr')
+      addr = match[:dst_addr]
+      # Normalize addr. Some platforms zero_pad ipv6 addrs.
+      addr.gsub!(/^0*/, '').gsub!(/:0*/, ':')
+      addr
     end
 
     def dst_addr=(dst_addr)
@@ -192,5 +249,101 @@ module Cisco
     def dst_port=(src_port)
       @set_args[:dst_port] = src_port
     end
+
+    def tcp_flags
+      match = ace_get
+      return nil if match.nil?
+      match.names.include?('tcp_flags') ? match[:tcp_flags].strip : nil
+    end
+
+    def tcp_flags=(tcp_flags)
+      @set_args[:tcp_flags] = tcp_flags.strip
+    end
+
+    def established
+      match = ace_get
+      return false if match.nil?
+      return false unless match.names.include?('established')
+      match[:established] == 'established' ? true : false
+    end
+
+    def established=(established)
+      @set_args[:established] = established.to_s == 'true' ? 'established' : ''
+    end
+
+    def precedence
+      extract_value('precedence')
+    end
+
+    def precedence=(precedence)
+      attach_prefix(precedence, :precedence)
+    end
+
+    def dscp
+      extract_value('dscp')
+    end
+
+    def dscp=(dscp)
+      attach_prefix(dscp, :dscp)
+    end
+
+    def time_range
+      extract_value('time_range', 'time-range')
+    end
+
+    def time_range=(time_range)
+      attach_prefix(time_range, :time_range, 'time-range')
+    end
+
+    def packet_length
+      extract_value('packet_length', 'packet-length')
+    end
+
+    def packet_length=(packet_length)
+      attach_prefix(packet_length, :packet_length, 'packet-length')
+    end
+
+    def ttl
+      extract_value('ttl')
+    end
+
+    def ttl=(ttl)
+      attach_prefix(ttl, :ttl)
+    end
+
+    def http_method
+      extract_value('http_method', 'http-method')
+    end
+
+    def http_method=(http_method)
+      attach_prefix(http_method, :http_method, 'http-method')
+    end
+
+    def tcp_option_length
+      extract_value('tcp_option_length', 'tcp-option-length')
+    end
+
+    def tcp_option_length=(tcp_option_length)
+      attach_prefix(tcp_option_length, :tcp_option_length, 'tcp-option-length')
+    end
+
+    def redirect
+      extract_value('redirect')
+    end
+
+    def redirect=(redirect)
+      attach_prefix(redirect, :redirect)
+    end
+
+    def log
+      match = ace_get
+      return false if match.nil?
+      return false unless match.names.include?('log')
+      match[:log] == 'log' ? true : false
+    end
+
+    def log=(log)
+      @set_args[:log] = log.to_s == 'true' ? 'log' : ''
+    end
   end
 end

data/lib/cisco_node_utils/acl.rb

@@ -45,7 +45,8 @@ module Cisco
     def self.afi_cli(afi)
       fail ArgumentError, "Argument afi must be 'ipv4' or 'ipv6'" unless
         afi[/(ipv4|ipv6)/]
-      afi[/ipv4/] ? 'ip' : afi
+      afi = 'ip' if platform == :nexus && afi[/ipv4/]
+      afi
     end
 
     def create

data/lib/cisco_node_utils/bgp.rb

@@ -14,9 +14,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require_relative 'cisco_cmn_utils'
 require_relative 'node_util'
 require_relative 'feature'
-require_relative 'bgp_af'
+require_relative 'logger'
 
 module Cisco
   # RouterBgp - node utility class for BGP general config management
@@ -32,6 +33,10 @@ module Cisco
       create if instantiate
     end
 
+    def to_s
+      "BGP #{asnum} VRF '#{vrf}'"
+    end
+
     # Create a hash of all router bgp default and non-default
     # vrf instances
     def self.routers
@@ -80,8 +85,9 @@ module Cisco
 
     # Create one router bgp instance
     def create
-      Feature.bgp_enable
+      Feature.bgp_enable if platform == :nexus
       router_bgp
+      wait_for_process_initialized
     end
 
     # Destroy router bgp instance
@@ -89,6 +95,24 @@ module Cisco
       router_bgp('no')
     end
 
+    def process_initialized?
+      config_get('bgp', 'process_initialized')
+    end
+
+    def wait_for_process_initialized
+      return unless node.product_id[/N(5|6)/]
+
+      # Hack for slow-start platforms which will have setter failures if the
+      # bgp instance is still initializing. To see this problem in a sandbox
+      # do 'router bgp 1 ; router bgp 1 ; shutdown'.
+      4.times do
+        return if process_initialized?
+        sleep 1
+        node.cache_flush
+      end
+      fail 'BGP process is not initialized yet'
+    end
+
     # Helper method to delete @set_args hash keys
     def set_args_keys_default
       @set_args = { asnum: @asnum }
@@ -98,6 +122,12 @@ module Cisco
 
     # Attributes:
 
+    # nsr Getter
+    def nsr
+      return nil if platform == :ios_xr && @vrf != 'default'
+      config_get('bgp', 'nsr', @get_args)
+    end
+
     # Bestpath Getters
     def bestpath_always_compare_med
       config_get('bgp', 'bestpath_always_compare_med', @get_args)
@@ -116,6 +146,7 @@ module Cisco
     end
 
     def bestpath_med_confed
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'bestpath_med_confed', @get_args)
     end
 
@@ -127,6 +158,17 @@ module Cisco
       config_get('bgp', 'bestpath_med_non_deterministic', @get_args)
     end
 
+    # nsr Setter
+    def nsr=(enable)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'nsr', 'set', 'nsr is not ' \
+                  'configurable on a per-VRF basis on ios_xr')
+      end
+      @set_args[:state] = (enable ? '' : 'no')
+      config_set('bgp', 'nsr', @set_args)
+      set_args_keys_default
+    end
+
     # Bestpath Setters
     def bestpath_always_compare_med=(enable)
       @set_args[:state] = (enable ? '' : 'no')
@@ -153,6 +195,12 @@ module Cisco
     end
 
     def bestpath_med_confed=(enable)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'bestpath_med_confed', 'set',
+                                         'bestpath_med_confed is not ' \
+                                         'configurable on a per-VRF basis ' \
+                                         'on IOS XR')
+      end
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'bestpath_med_confed', @set_args)
       set_args_keys_default
@@ -170,6 +218,12 @@ module Cisco
       set_args_keys_default
     end
 
+    # nsr Default
+    def default_nsr
+      return nil if platform == :ios_xr && @vrf != 'default'
+      config_get_default('bgp', 'nsr')
+    end
+
     # Bestpath Defaults
     def default_bestpath_always_compare_med
       config_get_default('bgp', 'bestpath_always_compare_med')
@@ -188,6 +242,7 @@ module Cisco
     end
 
     def default_bestpath_med_confed
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'bestpath_med_confed')
     end
 
@@ -201,6 +256,7 @@ module Cisco
 
     # Cluster Id (Getter/Setter/Default)
     def cluster_id
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'cluster_id', @get_args)
     end
 
@@ -208,7 +264,11 @@ module Cisco
       # In order to remove a bgp cluster_id you cannot simply issue
       # 'no bgp cluster-id'.  IMO this should be possible because you
       # can only configure a single bgp cluster-id.
-      #
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'cluster_id', 'set',
+                                         'cluster-id is not configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       # HACK: specify a dummy id when removing the property.
       dummy_id = 1
       if id == default_cluster_id
@@ -223,11 +283,13 @@ module Cisco
     end
 
     def default_cluster_id
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'cluster_id')
     end
 
     # Confederation Id (Getter/Setter/Default)
     def confederation_id
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'confederation_id', @get_args)
     end
 
@@ -235,7 +297,12 @@ module Cisco
       # In order to remove a bgp confed id you cannot simply issue
       # 'no bgp confederation id'.  IMO this should be possible
       # because you can only configure a single bgp confed id.
-      #
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'confederation_id', 'set',
+                                         'confederation-id is not ' \
+                                         'configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       # HACK: specify a dummy id when removing the property.
       dummy_id = 1
       if id == default_confederation_id
@@ -250,6 +317,7 @@ module Cisco
     end
 
     def default_confederation_id
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'confederation_id')
     end
 
@@ -324,6 +392,14 @@ module Cisco
     end
 
     def enforce_first_as=(enable)
+      # TODO: write a helper method for this repeated logic
+      # enforce_first_as is on by default (=>true)
+      # XR=>true  = enable enforce_first_as  = 'no bgp enforce-first-as disable'
+      # XR=>false = disable enforce_first_as = 'bgp enforce-first-as disable'
+      # Nexus nvgens the 'no' command.
+      # Nexus=>true  = enable enforce_first_as  = 'enforce-first-as'
+      # Nexus=>false = disable enforce_first_as = 'no enforce-first-as'
+      enable = !enable if platform == :ios_xr
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'enforce_first_as', @set_args)
       set_args_keys_default
@@ -433,6 +509,14 @@ module Cisco
     end
 
     def fast_external_fallover=(enable)
+      # TODO: write a helper method for this repeated logic
+      # fast_external_fallover is on by default (=>true)
+      # XR=>true  = 'no bgp fast-external-fallover disable'
+      # XR=>false = 'bgp fast-external-fallover disable'
+      # Nexus nvgens the 'no' command.
+      # Nexus=>true  = 'fast-external-fallover'
+      # Nexus=>false = 'no fast-external-fallover'
+      enable = !enable if platform == :ios_xr
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'fast_external_fallover', @set_args)
       set_args_keys_default
@@ -459,54 +543,92 @@ module Cisco
 
     # Confederation Peers (Getter/Setter/Default)
     def confederation_peers
-      config_get('bgp', 'confederation_peers', @get_args)
-    end
-
-    def confederation_peers_set(peers)
-      # The confederation peers command is additive so we first need to
-      # remove any existing peers.
-      unless confederation_peers.empty?
-        @set_args[:state] = 'no'
-        @set_args[:peer_list] = confederation_peers
-        config_set('bgp', 'confederation_peers', @set_args)
+      # NX: confederation peers is retrieved as a string '1 2 3'
+      # XR: retrieved as an array.
+      # So make it an array in the NX case.
+      # Sort the end results to make it consistent across both platforms.
+      return nil if platform == :ios_xr && @vrf != 'default'
+      peers = config_get('bgp', 'confederation_peers', @get_args)
+      peers = peers.split(' ') if peers.is_a?(String)
+      peers.sort
+    end
+
+    def confederation_peers=(should)
+      # confederation peers are additive. So create a delta hash of entries
+      # and only apply the changes
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'confederation_peers', 'set',
+                                         'confederation-peers is not ' \
+                                         'configurable ' \
+                                         'on a per-VRF basis on IOS XR')
       end
-      unless peers == default_confederation_peers
-        @set_args[:state] = ''
-        @set_args[:peer_list] = peers
-        config_set('bgp', 'confederation_peers', @set_args)
+      should = should.flatten
+      is = confederation_peers
+
+      delta_hash = Utils.delta_add_remove(should, is)
+      return if delta_hash.values.flatten.empty?
+      [:add, :remove].each do |action|
+        Cisco::Logger.debug('confederation_peers delta ' \
+                            "#{@get_args}\n #{action}: " \
+                            "#{delta_hash[action]}")
+        delta_hash[action].each do |peer|
+          state = (action == :add) ? '' : 'no'
+          @set_args[:state] = state
+          @set_args[:peer] = peer
+
+          config_set('bgp', 'confederation_peers', @set_args)
+        end
       end
-      set_args_keys_default
     end
 
     def default_confederation_peers
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'confederation_peers')
     end
 
     # Graceful Restart Getters
     def graceful_restart
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'graceful_restart', @get_args)
     end
 
     def graceful_restart_timers_restart
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'graceful_restart_timers_restart', @get_args)
     end
 
     def graceful_restart_timers_stalepath_time
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'graceful_restart_timers_stalepath_time', @get_args)
     end
 
     def graceful_restart_helper
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get('bgp', 'graceful_restart_helper', @get_args)
     end
 
     # Graceful Restart Setters
     def graceful_restart=(enable)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'graceful_restart', 'set',
+                                         'graceful_restart is not ' \
+                                         'configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'graceful_restart', @set_args)
       set_args_keys_default
     end
 
     def graceful_restart_timers_restart=(seconds)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp',
+                                         'graceful_restart_timers_restart',
+                                         'set',
+                                         'graceful_restart_timers_restart is ' \
+                                         'not configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       if seconds == default_graceful_restart_timers_restart
         @set_args[:state] = 'no'
         @set_args[:seconds] = ''
@@ -519,6 +641,14 @@ module Cisco
     end
 
     def graceful_restart_timers_stalepath_time=(seconds)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp',
+                                         'graceful_restart_timers_' \
+                                         'stalepath_time', 'set',
+                                         'graceful_restart_timers_' \
+                                         'stalepath_time is not configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       if seconds == default_graceful_restart_timers_stalepath_time
         @set_args[:state] = 'no'
         @set_args[:seconds] = ''
@@ -531,6 +661,13 @@ module Cisco
     end
 
     def graceful_restart_helper=(enable)
+      if platform == :ios_xr && @vrf != 'default'
+        fail Cisco::UnsupportedError.new('bgp',
+                                         'graceful_restart_helper', 'set',
+                                         'graceful_restart_helper ' \
+                                         'is not configurable ' \
+                                         'on a per-VRF basis on IOS XR')
+      end
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'graceful_restart_helper', @set_args)
       set_args_keys_default
@@ -538,18 +675,22 @@ module Cisco
 
     # Graceful Restart Defaults
     def default_graceful_restart
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'graceful_restart')
     end
 
     def default_graceful_restart_timers_restart
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'graceful_restart_timers_restart')
     end
 
     def default_graceful_restart_timers_stalepath_time
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'graceful_restart_timers_stalepath_time')
     end
 
     def default_graceful_restart_helper
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'graceful_restart_helper')
     end
 
@@ -595,6 +736,13 @@ module Cisco
     end
 
     def log_neighbor_changes=(enable)
+      # XR logging is on by default (=>true)
+      # XR=>true  = enable logging  = 'no bgp log neighbor changes disable'
+      # XR=>false = disable logging = 'bgp log neighbor changes disable'
+      # Nexus logging is off by default (=>false)
+      # Nexus=>true  = enable logging  = 'log-neighbor-changes'
+      # Nexus=>false = disable logging = 'no log-neighbor-changes'
+      enable = !enable if platform == :ios_xr
       @set_args[:state] = (enable ? '' : 'no')
       config_set('bgp', 'log_neighbor_changes', @set_args)
       set_args_keys_default
@@ -643,14 +791,26 @@ module Cisco
     # route_distinguisher
     # Note that this property is supported by both bgp and vrf providers.
     def route_distinguisher
+      return nil if @vrf.nil? || @vrf == 'default'
       config_get('bgp', 'route_distinguisher', @get_args)
     end
 
     def route_distinguisher=(rd)
-      Feature.nv_overlay_evpn_enable
+      if @vrf.nil? || @vrf == 'default'
+        fail Cisco::UnsupportedError.new('bgp', 'route_distinguisher', 'set',
+                                         'route_distinguisher is not ' \
+                                         'configurable on a default VRF')
+      end
+
+      # N3k I2 images require 'nv overlay evpn' for rd and also require
+      # explicit values when removing the rd command. These restrictions are
+      # not not needed in I3 and newer images.
+      Feature.nv_overlay_evpn_enable if Utils.nexus_i2_image
+
       if rd == default_route_distinguisher
+        return if route_distinguisher.empty?
         @set_args[:state] = 'no'
-        @set_args[:rd] = ''
+        @set_args[:rd] = route_distinguisher
       else
         @set_args[:state] = ''
         @set_args[:rd] = rd
@@ -660,6 +820,7 @@ module Cisco
     end
 
     def default_route_distinguisher
+      return nil if @vrf.nil? || @vrf == 'default'
       config_get_default('bgp', 'route_distinguisher')
     end
 
@@ -792,10 +953,12 @@ module Cisco
     end
 
     def default_timer_bestpath_limit
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'timer_bestpath_limit')
     end
 
     def default_timer_bestpath_limit_always
+      return nil if platform == :ios_xr && @vrf != 'default'
       config_get_default('bgp', 'timer_bestpath_limit_always')
     end
   end