From 51c36cad643a0fca8c980b1655bbe658313ed02e Mon Sep 17 00:00:00 2001
From: Rick Sherman <rick@shermdog.com>
Date: Mon, 13 Nov 2017 15:57:06 -0600
Subject: [PATCH 01/34] (NETDEV-30) Enhance syslog, tacacs, radius (#558)

* (maint) add net-telnet to gemspec
Tests require net-telnet which was not specified

* (NETDEV-30) syslog_server add port
Added port to syslog_server
Updated syslog server to operate as a single item vs multiple calls.
Follows work previously done with ntp types

* (NETDEV-30) Add source_interface to tacacs/radius_global
Added source_interface to tacacs_global and radius_global
Fixed handling of encryption key in tacacs_global
Increased testing in radius_global

* (NETDEV-30) Add console, monitor, source interface to syslog_settings

* (NETDEV-30) Changelog
---
 CHANGELOG.md                                  | 28 +++++++
 cisco_node_utils.gemspec                      |  1 +
 .../cmd_ref/radius_global.yaml                |  7 ++
 .../cmd_ref/syslog_server.yaml                |  5 +-
 .../cmd_ref/syslog_settings.yaml              | 22 ++++-
 .../cmd_ref/tacacs_global.yaml                |  7 ++
 lib/cisco_node_utils/radius_global.rb         | 26 +++++-
 lib/cisco_node_utils/syslog_server.rb         | 80 +++++++++----------
 lib/cisco_node_utils/syslog_settings.rb       | 77 +++++++++++++++++-
 lib/cisco_node_utils/tacacs_global.rb         | 47 ++++++++---
 tests/test_radius_global.rb                   | 24 +++++-
 tests/test_syslog_server.rb                   | 42 +++-------
 tests/test_syslog_settings.rb                 | 51 ++++++++++--
 tests/test_tacacs_global.rb                   | 53 ++++++++----
 14 files changed, 357 insertions(+), 113 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24817152..639166f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,34 @@ Changelog
   * object_group (@saichint)
   * object_group_entry (@saichint)
 
+### Added
+* Extend syslog_server with attributes:
+   * `port`
+* Extend syslog_settings with attributes:
+  * `console`
+  * `monitor`
+  * `source_interface`
+* Extend radius_global with attributes:
+   * `source_interface`
+* Extend tacacs_global with attributes:
+  * `source_interface`
+
+### Changed
+* syslog_server initialize now uses options hash
+ * Prior to this release syslog_server accepted positional arguments for name,
+ level, and vrf.  New behavior is to pass attributes as a hash.
+
+ Example:
+ ```
+ options = { 'name' => '1.1.1.1', 'level' => '4', 'port' => '2154',
+             'vrf' => 'red' }
+ Cisco::SyslogServer.new(options, true)
+ ```
+* tacacs_global key removal fixed
+  * Prior to this release key removal was done by passing in a value of 8.  A
+  nil value is now used.  Added intelligence to determine key format
+  automatically for removal.
+
 ## [v1.7.0]
 
 ### New feature support
diff --git a/cisco_node_utils.gemspec b/cisco_node_utils.gemspec
index 63a2a0ad..858f5511 100644
--- a/cisco_node_utils.gemspec
+++ b/cisco_node_utils.gemspec
@@ -31,6 +31,7 @@ Currently supports NX-OS nodes.
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'kwalify', '~> 0.7.2'
   spec.add_development_dependency 'minitest', '~> 5.0'
+  spec.add_development_dependency 'net-telnet', '~> 0.1.1'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '= 0.35.1'
diff --git a/lib/cisco_node_utils/cmd_ref/radius_global.yaml b/lib/cisco_node_utils/cmd_ref/radius_global.yaml
index f245a0f4..b5f6af0d 100644
--- a/lib/cisco_node_utils/cmd_ref/radius_global.yaml
+++ b/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+).*/'
diff --git a/lib/cisco_node_utils/cmd_ref/syslog_server.yaml b/lib/cisco_node_utils/cmd_ref/syslog_server.yaml
index 1b35f427..256b176a 100644
--- a/lib/cisco_node_utils/cmd_ref/syslog_server.yaml
+++ b/lib/cisco_node_utils/cmd_ref/syslog_server.yaml
@@ -15,8 +15,9 @@ server:
   multiple: true
   nexus:
     get_command: "show running-config all | include '^logging server'"
-    get_value: '/^logging server (\S+).*/'
-    set_value: '<state> logging server <ip> <level> <vrf>'
+    # Returns <ip>, <level>, <port>, <vrf>
+    get_value: '/^(?:logging server )([^\s]+)(?: (\d+))?(?: port (\d+))?(?: use-vrf (\S+))?/'
+    set_value: '<state> logging server <ip> <level> <port> <vrf>'
   ios_xr:
     get_command: "show running-config logging"
     get_value: '/^logging (\S+).*/'
diff --git a/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml b/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml
index 83b5e2ad..c17966e7 100644
--- a/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml
+++ b/lib/cisco_node_utils/cmd_ref/syslog_settings.yaml
@@ -2,8 +2,28 @@
 ---
 _exclude: [ios_xr]
 
+console:
+  default_value: 2
+  get_command: "show running-config all | include 'logging'"
+  # Returns <state> and <severity>
+  get_value: '/^(no)?\s*logging console\s*(\d)?/'
+  set_value: '<state> logging console <severity>'
+
+monitor:
+  default_value: 5
+  get_command: "show running-config all | include 'logging'"
+  # Returns <state> and <severity>
+  get_value: '/^(no)?\s*logging monitor\s*(\d)?/'
+  set_value: '<state> logging monitor <severity>'
+
+source_interface:
+  default_value: ~
+  get_command: "show running-config all | include 'logging'"
+  get_value: '/^logging source-interface\s+(.*)$/'
+  set_value: '<state> logging source-interface <source_interface>'
+
 timestamp:
-  get_command: "show running-config all | include '^logging timestamp'"
+  get_command: "show running-config all | include 'logging'"
   get_value: '/^logging timestamp (.*)$/'
   set_value: '<state> logging timestamp <units>'
   default_value: 'seconds'
diff --git a/lib/cisco_node_utils/cmd_ref/tacacs_global.yaml b/lib/cisco_node_utils/cmd_ref/tacacs_global.yaml
index 7c02d473..53c925a8 100644
--- a/lib/cisco_node_utils/cmd_ref/tacacs_global.yaml
+++ b/lib/cisco_node_utils/cmd_ref/tacacs_global.yaml
@@ -19,6 +19,13 @@ key_format:
   ios_xr:
     get_command: "show running-config tacacs-server"
 
+source_interface:
+  default_value: ~
+  get_value: '/^ip tacacs source-interface\s+(.*)$/'
+  set_value: '<state> ip tacacs source-interface <source_interface>'
+  nexus:
+    get_command: "show running-config all | include '^ip tacacs source-interface'"
+
 timeout:
   kind: int
   get_value: '/tacacs-server timeout\s+(\d+)/'
diff --git a/lib/cisco_node_utils/radius_global.rb b/lib/cisco_node_utils/radius_global.rb
index 6a950c02..2d15d73b 100644
--- a/lib/cisco_node_utils/radius_global.rb
+++ b/lib/cisco_node_utils/radius_global.rb
@@ -2,7 +2,7 @@
 
 # Jonathan Tripathy et al., September 2015
 
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 Cisco and/or its affiliates.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -137,5 +137,29 @@ def key_set(value, format)
                    key:   "#{value}")
       end
     end
+
+    # Get default source interface
+    def default_source_interface
+      config_get_default('radius_global', 'source_interface')
+    end
+
+    # Set source interface
+    def source_interface=(name)
+      if name
+        config_set(
+          'radius_global', 'source_interface',
+          state: '', source_interface: name)
+      else
+        config_set(
+          'radius_global', 'source_interface',
+          state: 'no', source_interface: '')
+      end
+    end
+
+    # Get source interface
+    def source_interface
+      i = config_get('radius_global', 'source_interface')
+      i.nil? ? default_source_interface : i.downcase
+    end
   end # class
 end # module
diff --git a/lib/cisco_node_utils/syslog_server.rb b/lib/cisco_node_utils/syslog_server.rb
index 8f7c7247..7f2e990f 100644
--- a/lib/cisco_node_utils/syslog_server.rb
+++ b/lib/cisco_node_utils/syslog_server.rb
@@ -2,7 +2,7 @@
 #
 # Jonathan Tripathy et al., September 2015
 #
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,11 +17,12 @@
 # limitations under the License.
 
 require_relative 'node_util'
+require 'resolv'
 
 module Cisco
-  # NtpServer - node utility class for NTP Server configuration management
+  # SyslogServer - node utility class for syslog server configuration management
   class SyslogServer < NodeUtil
-    attr_reader :name, :level, :vrf
+    attr_reader :name, :level, :port, :vrf, :severity_level
 
     LEVEL_TO_NUM = { 'emergencies'   => 0,
                      'alerts'        => 1,
@@ -33,45 +34,38 @@ class SyslogServer < NodeUtil
                      'debugging'     => 7 }.freeze
     NUM_TO_LEVEL = LEVEL_TO_NUM.invert.freeze
 
-    def initialize(name,
-                   level=nil,
-                   vrf=nil,
-                   instantiate=true)
-      fail TypeError unless name.is_a?(String)
-      fail TypeError unless name.length > 0
-      @name = name
-
-      fail TypeError unless level.is_a?(Integer) || level.nil?
-      @level = level
-
-      fail TypeError unless vrf.is_a?(String) || vrf.nil?
-      @vrf = vrf
+    def initialize(opts, instantiate=true)
+      @name = opts['name']
+      @level = opts['level'] || opts['severity_level']
+      @port = opts['port']
+      @vrf = opts['vrf']
+      @severity_level = opts['severity_level'] || opts['level']
+
+      hostname_regex = /^(?=.{1,255}$)[0-9A-Za-z]
+      (?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?
+      (?:\.[0-9A-Za-z](?:(?:[0-9A-Za-z]|-){0,61}[0-9A-Za-z])?)*\.?$/x
+
+      unless @name =~ Resolv::AddressRegex ||
+             @name =~ hostname_regex
+        fail ArgumentError,
+             "Invalid value '#{@name}' \
+        (Must be valid IPv4/IPv6 address or hostname)"
+      end
 
       create if instantiate
     end
 
     def self.syslogservers
+      keys = %w(name level port vrf severity_level)
       hash = {}
       syslogservers_list = config_get('syslog_server', 'server')
       return hash if syslogservers_list.nil?
 
       syslogservers_list.each do |id|
-        # The YAML regex isn't specific enough for some platforms,
-        # so we have to do further checking.
-        begin
-          IPAddr.new(id)
-        rescue
-          next
-        end
-
-        level = config_get('syslog_server', 'level', id)
-        level = level[0] if level.is_a?(Array)
-        level = LEVEL_TO_NUM[level] if platform == :ios_xr
-
-        vrf = config_get('syslog_server', 'vrf', id)
-        vrf = vrf[0] if vrf.is_a?(Array)
-
-        hash[id] = SyslogServer.new(id, level, vrf, false)
+        value_hash = Hash[keys.zip(id)]
+        value_hash['severity_level'] = value_hash['level']
+        value_hash['vrf'] = 'default' if value_hash['vrf'].nil?
+        hash[id[0]] = SyslogServer.new(value_hash, false)
       end
 
       hash
@@ -92,17 +86,18 @@ def create
         config_set('syslog_server',
                    'server',
                    state: '',
-                   ip:    "#{name}",
-                   level: level.nil? ? '' : "severity #{NUM_TO_LEVEL[level]}",
-                   vrf:   vrf.nil? ? '' : "vrf #{vrf}",
+                   ip:    @name,
+                   level: @level ? "severity #{NUM_TO_LEVEL[@level]}" : '',
+                   vrf:   @vrf ? "vrf #{@vrf}" : '',
                   )
       else
         config_set('syslog_server',
                    'server',
                    state: '',
-                   ip:    "#{name}",
-                   level: level.nil? ? '' : "#{level}",
-                   vrf:   vrf.nil? ? '' : "use-vrf #{vrf}",
+                   ip:    @name,
+                   level: @level ? "#{@level}" : '',
+                   port:  @port ? "port #{@port}" : '',
+                   vrf:   @vrf ? "use-vrf #{@vrf}" : '',
                   )
       end
     end
@@ -113,9 +108,9 @@ def destroy(duplicate_vrfs=[])
           config_set('syslog_server',
                      'server',
                      state: 'no',
-                     ip:    "#{name}",
+                     ip:    @name,
                      level: '',
-                     vrf:   vrf.nil? ? '' : "vrf #{vrf}",
+                     vrf:   @vrf ? "vrf #{@vrf}" : '',
                     )
         else
           warn("#{name} is configured multiple times on the device" \
@@ -125,7 +120,7 @@ def destroy(duplicate_vrfs=[])
             config_set('syslog_server',
                        'server',
                        state: 'no',
-                       ip:    "#{name}",
+                       ip:    @name,
                        level: '',
                        vrf:   "vrf #{dup}",
                       )
@@ -135,8 +130,9 @@ def destroy(duplicate_vrfs=[])
         config_set('syslog_server',
                    'server',
                    state: 'no',
-                   ip:    "#{name}",
+                   ip:    @name,
                    level: '',
+                   port:  '',
                    vrf:   '',
                   )
       end
diff --git a/lib/cisco_node_utils/syslog_settings.rb b/lib/cisco_node_utils/syslog_settings.rb
index 7c0dddaf..d91c39a0 100644
--- a/lib/cisco_node_utils/syslog_settings.rb
+++ b/lib/cisco_node_utils/syslog_settings.rb
@@ -2,7 +2,7 @@
 #
 # Jonathan Tripathy et al., September 2015
 #
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -42,14 +42,82 @@ def ==(other)
       name == other.name
     end
 
+    def default_console
+      config_get_default('syslog_settings', 'console')
+    end
+
+    def console
+      console = config_get('syslog_settings', 'console')
+      if console.is_a?(Array)
+        console = console[0] == 'no' ? 'unset' : console[1]
+      end
+      console
+    end
+
+    def console=(severity)
+      if severity
+        config_set(
+          'syslog_settings', 'console',
+          state: '', severity: severity)
+      else
+        config_set(
+          'syslog_settings', 'console',
+          state: 'no', severity: '')
+      end
+    end
+
+    def default_monitor
+      config_get_default('syslog_settings', 'monitor')
+    end
+
+    def monitor
+      monitor = config_get('syslog_settings', 'monitor')
+      if monitor.is_a?(Array)
+        monitor = monitor[0] == 'no' ? 'unset' : monitor[1]
+      end
+      monitor
+    end
+
+    def monitor=(severity)
+      if severity
+        config_set(
+          'syslog_settings', 'monitor',
+          state: '', severity: severity)
+      else
+        config_set(
+          'syslog_settings', 'monitor',
+          state: 'no', severity: '')
+      end
+    end
+
+    def default_source_interface
+      config_get_default('syslog_settings', 'source_interface')
+    end
+
+    def source_interface
+      i = config_get('syslog_settings', 'source_interface')
+      i.nil? ? default_source_interface : i.downcase
+    end
+
+    def source_interface=(name)
+      if name
+        config_set(
+          'syslog_settings', 'source_interface',
+          state: '', source_interface: name)
+      else
+        config_set(
+          'syslog_settings', 'source_interface',
+          state: 'no', source_interface: '')
+      end
+    end
+
     def timestamp
       config_get('syslog_settings', 'timestamp')
     end
 
     def timestamp=(val)
-      fail TypeError unless val.is_a?(String)
       fail TypeError \
-        unless %w(seconds milliseconds).include?(val)
+        unless %w(seconds milliseconds).include?(val.to_s)
 
       # There is no unset version as timestamp has a default value
       config_set('syslog_settings',
@@ -57,5 +125,8 @@ def timestamp=(val)
                  state: '',
                  units: val)
     end
+
+    alias_method :time_stamp_units, :timestamp
+    alias_method :time_stamp_units=, :timestamp=
   end # class
 end # module
diff --git a/lib/cisco_node_utils/tacacs_global.rb b/lib/cisco_node_utils/tacacs_global.rb
index 89f8ccff..2db86061 100644
--- a/lib/cisco_node_utils/tacacs_global.rb
+++ b/lib/cisco_node_utils/tacacs_global.rb
@@ -1,8 +1,8 @@
 # Tacacs Global provider class
 
-# TP HONEY et al., June 2014-2016
+# TP HONEY et al., June 2014-2017
 
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 Cisco and/or its affiliates.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -20,10 +20,6 @@
 
 # Tacacs Global configuration management
 module Cisco
-  TACACS_GLOVAL_ENC_NONE = 0
-  TACACS_GLOBAL_ENC_CISCO_TYPE_7 = 7
-  TACACS_GLOBAL_ENC_UNKNOWN = 8
-
   # TacacsGlobal - node utility class for
   class TacacsGlobal < NodeUtil
     attr_reader :name
@@ -92,14 +88,47 @@ def self.default_key
     end
 
     def encryption_key_set(key_format, key)
-      key = Utils.add_quotes(key)
-      if key_format == TACACS_GLOBAL_ENC_UNKNOWN
+      # If we get an empty key - remove default if configured
+      if key.nil? || key.to_s.empty?
+        key = self.key
+        return if key.empty?
+        key_format = self.key_format
         config_set('tacacs_server', 'encryption', state: 'no',
                     option: key_format, key: key)
       else
-        config_set('tacacs_server', 'encryption', state: '', option: key_format,
+        key = Utils.add_quotes(key)
+        if key_format.nil? || key_format.to_s.empty?
+          config_set('tacacs_server', 'encryption', state: '', option: '',
                     key: key)
+        else
+          config_set('tacacs_server', 'encryption', state: '',
+                    option: key_format, key: key)
+        end
+      end
+    end
+
+    # Get default source interface
+    def default_source_interface
+      config_get_default('tacacs_global', 'source_interface')
+    end
+
+    # Set source interface
+    def source_interface=(name)
+      if name
+        config_set(
+          'tacacs_global', 'source_interface',
+          state: '', source_interface: name)
+      else
+        config_set(
+          'tacacs_global', 'source_interface',
+          state: 'no', source_interface: '')
       end
     end
+
+    # Get source interface
+    def source_interface
+      i = config_get('tacacs_global', 'source_interface')
+      i.nil? ? default_source_interface : i.downcase
+    end
   end # class
 end # module
diff --git a/tests/test_radius_global.rb b/tests/test_radius_global.rb
index aa79213f..c9bba003 100644
--- a/tests/test_radius_global.rb
+++ b/tests/test_radius_global.rb
@@ -70,6 +70,12 @@ def test_radius_global
       global.key_set(key, nil)
       assert_match(/#{key}/, global.key)
       assert_match(/#{key}/, Cisco::RadiusGlobal.radius_global[id].key)
+      assert_equal(7, global.key_format)
+      # Change to type 6
+      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+      global.key_set(key, 6)
+      assert_match(/#{key}/, global.key)
+      assert_equal(6, global.key_format)
     elsif platform == :ios_xr
       global.key_set('QsEfThUkO', nil)
       assert(!global.key.nil?)
@@ -77,9 +83,23 @@ def test_radius_global
     end
 
     # Setting back to default and re-checking
-    global.timeout = global.default_timeout
-    global.retransmit_count = global.default_retransmit_count
+    global.timeout = nil
+    global.retransmit_count = nil
+    global.key_set(nil, nil)
     assert_equal(global.timeout, global.default_timeout)
     assert_equal(global.retransmit_count, global.default_retransmit_count)
+    assert_nil(global.key)
+
+    # Default source interface
+    assert_nil(global.source_interface)
+
+    # Set source interface
+    interface = 'loopback0'
+    global.source_interface = interface
+    assert_equal(interface, global.source_interface)
+
+    # Remove source interface
+    global.source_interface = nil
+    assert_nil(global.source_interface)
   end
 end
diff --git a/tests/test_syslog_server.rb b/tests/test_syslog_server.rb
index 772bc74c..c101e3bd 100644
--- a/tests/test_syslog_server.rb
+++ b/tests/test_syslog_server.rb
@@ -53,10 +53,9 @@ def test_create_destroy_single_ipv4
     id = '1.2.3.4'
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)
@@ -66,10 +65,9 @@ def test_create_destroy_single_ipv6
     id = '2003::2'
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)
@@ -81,14 +79,13 @@ def test_create_destroy_multiple
     refute_includes(Cisco::SyslogServer.syslogservers, id)
     refute_includes(Cisco::SyslogServer.syslogservers, id2)
 
-    server = Cisco::SyslogServer.new(id, 2, 'default', true)
-    server2 = Cisco::SyslogServer.new(id2, 3, 'default', true)
+    server = Cisco::SyslogServer.new({ 'name' => id, 'vrf' => 'default' }, true)
+    server2 = Cisco::SyslogServer.new({ 'name' => id2, 'vrf' => 'default' },
+                                      true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(2, Cisco::SyslogServer.syslogservers[id].level)
     assert_includes(Cisco::SyslogServer.syslogservers, id2)
     assert_equal(server2, Cisco::SyslogServer.syslogservers[id2])
-    assert_equal(3, Cisco::SyslogServer.syslogservers[id2].level)
 
     server.destroy
     server2.destroy
@@ -96,7 +93,7 @@ def test_create_destroy_multiple
     refute_includes(Cisco::SyslogServer.syslogservers, id2)
   end
 
-  def test_create_destroy_single_vrf_ipv4
+  def test_create_options
     if platform == :ios_xr
       config('vrf red')
     else
@@ -104,33 +101,16 @@ def test_create_destroy_single_vrf_ipv4
     end
 
     id = '1.2.3.4'
+    options = { 'name' => id, 'level' => '4', 'port' => '2154', 'vrf' => 'red' }
 
     refute_includes(Cisco::SyslogServer.syslogservers, id)
 
-    server = Cisco::SyslogServer.new(id, 4, 'red', true)
+    server = Cisco::SyslogServer.new(options, true)
     assert_includes(Cisco::SyslogServer.syslogservers, id)
     assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(4, Cisco::SyslogServer.syslogservers[id].level)
-
-    server.destroy
-    refute_includes(Cisco::SyslogServer.syslogservers, id)
-  end
-
-  def test_create_destroy_single_vrf_ipv6
-    if platform == :ios_xr
-      config('vrf red')
-    else
-      config('vrf context red')
-    end
-
-    id = '2003::2'
-
-    refute_includes(Cisco::SyslogServer.syslogservers, id)
-
-    server = Cisco::SyslogServer.new(id, 5, 'red', true)
-    assert_includes(Cisco::SyslogServer.syslogservers, id)
-    assert_equal(server, Cisco::SyslogServer.syslogservers[id])
-    assert_equal(5, Cisco::SyslogServer.syslogservers[id].level)
+    assert_equal('4', Cisco::SyslogServer.syslogservers[id].level)
+    assert_equal('2154', Cisco::SyslogServer.syslogservers[id].port)
+    assert_equal('red', Cisco::SyslogServer.syslogservers[id].vrf)
 
     server.destroy
     refute_includes(Cisco::SyslogServer.syslogservers, id)
diff --git a/tests/test_syslog_settings.rb b/tests/test_syslog_settings.rb
index 98000368..542e3d54 100644
--- a/tests/test_syslog_settings.rb
+++ b/tests/test_syslog_settings.rb
@@ -24,24 +24,27 @@ def setup
     return if platform != :nexus
     # setup runs at the beginning of each test
     super
-    no_syslogsettings
+    default_syslogsettings
   end
 
   def teardown
     return if platform != :nexus
     # teardown runs at the end of each test
-    no_syslogsettings
+    default_syslogsettings
     super
   end
 
-  def no_syslogsettings
+  def default_syslogsettings
     # Turn the feature off for a clean test.
-    config('no logging timestamp seconds')
+    config('no logging timestamp seconds',
+           'logging console 2',
+           'logging monitor 5',
+           'no logging source-interface')
   end
 
   # TESTS
 
-  def test_create
+  def test_timestamp
     syslog_setting = Cisco::SyslogSettings.new('default')
 
     if platform == :ios_xr
@@ -62,6 +65,44 @@ def test_create
       assert_equal('milliseconds',
                    syslog_setting.timestamp,
                   )
+      syslog_setting.time_stamp_units = 'seconds'
+      assert_equal('seconds',
+                   syslog_setting.time_stamp_units,
+                  )
     end
   end
+
+  def test_console
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    # Some systems return the value and othesr get it from yaml - normalize
+    assert_equal(syslog_setting.default_console, syslog_setting.console.to_i)
+    assert_equal(2, syslog_setting.console)
+    syslog_setting.console = '1'
+    assert_equal('1', syslog_setting.console)
+    syslog_setting.console = nil
+    assert_equal('unset', syslog_setting.console)
+  end
+
+  def test_monitor
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    # Some systems return the value and othesr get it from yaml - normalize
+    assert_equal(syslog_setting.default_monitor, syslog_setting.monitor.to_i)
+    assert_equal('5', syslog_setting.monitor)
+    syslog_setting.monitor = '7'
+    assert_equal('7', syslog_setting.monitor)
+    syslog_setting.monitor = nil
+    assert_equal('unset', syslog_setting.monitor)
+  end
+
+  def test_source_interface
+    syslog_setting = Cisco::SyslogSettings.new('default')
+
+    assert_nil(syslog_setting.source_interface)
+    syslog_setting.source_interface = 'mgmt0'
+    assert_equal('mgmt0', syslog_setting.source_interface)
+    syslog_setting.source_interface = nil
+    assert_nil(syslog_setting.source_interface)
+  end
 end
diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb
index 6b50f815..17f37c3f 100644
--- a/tests/test_tacacs_global.rb
+++ b/tests/test_tacacs_global.rb
@@ -1,7 +1,7 @@
 #
 # Minitest for TacacsGlobal class
 #
-# Copyright (c) 2014-2016 Cisco and/or its affiliates.
+# Copyright (c) 2014-2017 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -50,31 +50,50 @@ def test_tacacs_global
     assert_includes(Cisco::TacacsGlobal.tacacs_global, id)
     assert_equal(global, Cisco::TacacsGlobal.tacacs_global[id])
 
-    # Default Checking
+    # Default timeout
     assert_equal(global.default_timeout, global.timeout)
 
-    global.timeout = 5
-    assert_equal(5, Cisco::TacacsGlobal.tacacs_global[id].timeout)
-    assert_equal(5, global.timeout)
+    # Timeout update
+    global.timeout = 10
+    assert_equal(10, Cisco::TacacsGlobal.tacacs_global[id].timeout)
+    assert_equal(10, global.timeout)
 
-    # first change
-    key_format = 0
+    # Remove timeout
+    global.timeout = nil
+    assert_equal(global.default_timeout, global.timeout)
+
+    # Check there is no default key
+    assert_equal('', global.key)
+
+    # first key change - unencrypted key
     key = 'TEST_NEW'
-    global.encryption_key_set(key_format, key)
-    assert(!global.key.nil?)
-    assert(key_format, global.key_format)
+    global.encryption_key_set(nil, key)
+    # Device encypts key - verify return value
+    assert_equal(7, global.key_format)
+    assert_equal('"WAWY_NZB"', global.key)
 
-    # second change
+    # second key change - modify key to type6
     key_format = 6
-
     # Must use a valid type6 password: CSCvb36266
     key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
     global.encryption_key_set(key_format, key)
-    assert(!global.key.nil?)
-    assert(key_format, global.key_format)
+    assert_equal(key_format, global.key_format)
+    assert_equal("\"#{key}\"", global.key)
 
-    # Setting back to default and re-checking
-    global.timeout = global.default_timeout
-    assert_equal(global.default_timeout, global.timeout)
+    # Remove global key
+    global.encryption_key_set('', '')
+    assert_equal('', global.key)
+
+    # Default source interface
+    assert_nil(global.source_interface)
+
+    # Set source interface
+    interface = 'loopback0'
+    global.source_interface = interface
+    assert_equal(interface, global.source_interface)
+
+    # Remove source interface
+    global.source_interface = nil
+    assert_nil(global.source_interface)
   end
 end

From a23980b8580718885cff9d747c29d331daee8db5 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Tue, 14 Nov 2017 17:57:05 -0500
Subject: [PATCH 02/34] Feature/evpn multisite (#565)

* add multisite command reference

* add tests and more logic to evpn_multisite

* add evpn_stormcontrol NU module

* add interface_evpn_multisite cmd_ref + nu + tests

* add perr_type property for bgp_neighbor

* add rewrite_rt_asn property to bgp_neighbor_af

* add multisite_bg_interface property to vxlan_vtep

* add multisite_ingress_replication property to vxlan_vtep_vni

* recalibrate tests to skip for non-relevant platforms

* Fix rubocop errors

* Incorporate feedback comments

* Update Changelog
---
 CHANGELOG.md                                  | 21 +++++
 lib/cisco_node_utils/bgp_neighbor.rb          | 19 +++++
 lib/cisco_node_utils/bgp_neighbor_af.rb       | 14 ++++
 .../cmd_ref/bgp_neighbor.yaml                 |  7 ++
 .../cmd_ref/bgp_neighbor_af.yaml              |  7 ++
 .../cmd_ref/evpn_multisite.yaml               | 17 ++++
 .../cmd_ref/evpn_stormcontrol.yaml            | 18 +++++
 .../cmd_ref/interface_evpn_multisite.yaml     | 12 +++
 lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml  |  6 ++
 .../cmd_ref/vxlan_vtep_vni.yaml               |  7 ++
 lib/cisco_node_utils/evpn_multisite.rb        | 70 ++++++++++++++++
 lib/cisco_node_utils/evpn_stormcontrol.rb     | 81 +++++++++++++++++++
 .../interface_evpn_multisite.rb               | 46 +++++++++++
 lib/cisco_node_utils/vxlan_vtep.rb            | 17 ++++
 lib/cisco_node_utils/vxlan_vtep_vni.rb        | 13 +++
 tests/test_bgp_neighbor.rb                    | 15 ++++
 tests/test_bgp_neighbor_af.rb                 | 27 +++++++
 tests/test_evpn_multisite.rb                  | 70 ++++++++++++++++
 tests/test_evpn_stormcontrol.rb               | 56 +++++++++++++
 tests/test_interface_evpn_multisite.rb        | 59 ++++++++++++++
 tests/test_vxlan_vtep.rb                      | 23 ++++++
 tests/test_vxlan_vtep_vni.rb                  | 31 +++++++
 22 files changed, 636 insertions(+)
 create mode 100644 lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
 create mode 100644 lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml
 create mode 100644 lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
 create mode 100644 lib/cisco_node_utils/evpn_multisite.rb
 create mode 100644 lib/cisco_node_utils/evpn_stormcontrol.rb
 create mode 100644 lib/cisco_node_utils/interface_evpn_multisite.rb
 create mode 100644 tests/test_evpn_multisite.rb
 create mode 100644 tests/test_evpn_stormcontrol.rb
 create mode 100644 tests/test_interface_evpn_multisite.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 639166f2..18772380 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@ Changelog
 
 ## [Unreleased]
 
+### New feature support
+
+#### Cisco Resources
+* EVPN Multisite
+  * evpn_multisite (@rahushen)
+  * evpn_stormcontrol (@rahushen)
+  * interface_evpn_multisite (@rahushen)
+
+### Added
+* Extend vxlan_vtep with attributes:
+   * `multisite_bg_interface`
+
+* Extend vxlan_vtep_vni with attributes:
+   * `multisite_ingress_replication`
+
+* Extend bgp_neighbor with attributes:
+   * `peer_type`
+
+* Extend bgp_neighbor_af with attributes:
+   * `rewrite_rt_asn`
+
 #### Cisco Resources
 * ObjectGroup
   * object_group (@saichint)
diff --git a/lib/cisco_node_utils/bgp_neighbor.rb b/lib/cisco_node_utils/bgp_neighbor.rb
index ecf136f9..ac25c36e 100644
--- a/lib/cisco_node_utils/bgp_neighbor.rb
+++ b/lib/cisco_node_utils/bgp_neighbor.rb
@@ -503,5 +503,24 @@ def mode_cli_to_symbol(cli)
         fail KeyError
       end
     end
+
+    def default_peer_type
+      config_get_default('bgp_neighbor', 'peer_type')
+    end
+
+    def peer_type=(val)
+      if val == default_peer_type
+        @set_args[:state] = 'no'
+      else
+        Feature.nv_overlay_evpn_enable
+        @set_args[:peer_type] = val
+        @set_args[:state] = ''
+      end
+      config_set('bgp_neighbor', 'peer_type', @set_args)
+    end
+
+    def peer_type
+      config_get('bgp_neighbor', 'peer_type', @get_args)
+    end
   end # class
 end # module
diff --git a/lib/cisco_node_utils/bgp_neighbor_af.rb b/lib/cisco_node_utils/bgp_neighbor_af.rb
index 15d3b5b4..ef38792f 100644
--- a/lib/cisco_node_utils/bgp_neighbor_af.rb
+++ b/lib/cisco_node_utils/bgp_neighbor_af.rb
@@ -756,5 +756,19 @@ def weight=(int)
     def default_weight
       config_get_default('bgp_neighbor_af', 'weight')
     end
+
+    def rewrite_rt_asn
+      config_get('bgp_neighbor_af', 'rewrite_rt_asn', @get_args)
+    end
+
+    def rewrite_rt_asn=(state)
+      Feature.nv_overlay_evpn_enable if state
+      set_args_keys(state: (state ? '' : 'no'))
+      config_set('bgp_neighbor_af', 'rewrite_rt_asn', @set_args)
+    end
+
+    def default_rewrite_rt_asn
+      config_get_default('bgp_neighbor_af', 'rewrite_rt_asn')
+    end
   end
 end
diff --git a/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml b/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
index 23aaeb62..231290de 100644
--- a/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
+++ b/lib/cisco_node_utils/cmd_ref/bgp_neighbor.yaml
@@ -114,6 +114,13 @@ password_type:
     get_value: '/^password (\d+)/'
     default_value: 0
 
+peer_type:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: string
+  get_value: '/^peer-type (\S+)$/'
+  set_value: '<state> peer-type <peer_type>'
+  default_value: ""
+
 remote_as:
   get_value: '/^remote-as (\d*?.?\d+?)$/'
   set_value: '<state> remote-as <remote_as>'
diff --git a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
index 5cfc937d..eb3ce8c3 100644
--- a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
@@ -146,6 +146,13 @@ prefix_list_out:
   set_value: '<state> prefix-list <str> out'
   default_value: ''
 
+rewrite_rt_asn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^rewrite-rt-asn$/'
+  set_value: '<state> rewrite-rt-asn'
+  default_value: false
+
 route_map_in:
   kind: string
   default_value: ''
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
new file mode 100644
index 00000000..a0c8bd3b
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
@@ -0,0 +1,17 @@
+# evpn_multisite.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section multisite"
+
+delay_restore:
+  get_context: ['/^evpn multisite border-gateway <multisiteid>$/']
+  get_value: '/^delay-restore\s+time\s+(\d+)$/'
+  set_context: ['evpn multisite border-gateway <multisiteid>']
+  set_value: "<state> delay-restore time <time>"
+
+multisite:
+  context: ~
+  get_value: 'evpn multisite border-gateway ([\d.]+)'
+  set_value: "<state> evpn multisite border-gateway <multisiteid>"
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml b/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml
new file mode 100644
index 00000000..f229494b
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_stormcontrol.yaml
@@ -0,0 +1,18 @@
+# evpn_stormcontrol.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section storm-control"
+
+broadcast:
+  get_value: 'evpn storm-control broadcast level ([\d.]+)'
+  set_value: "<state> evpn storm-control broadcast level <level>"
+
+multicast:
+  get_value: 'evpn storm-control multicast level ([\d.]+)'
+  set_value: "<state> evpn storm-control multicast level <level>"
+
+unicast:
+  get_value: 'evpn storm-control unicast level ([\d.]+)'
+  set_value: "<state> evpn storm-control unicast level <level>"
diff --git a/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
new file mode 100644
index 00000000..3623e453
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
@@ -0,0 +1,12 @@
+# interface_evpn_multisite
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running interface all"
+  context:
+    - "interface <interface>"
+
+evpn_multisite:
+  get_value: '/^evpn multisite (\S+)$/'
+  set_value: "<state> evpn multisite <tracking>"
diff --git a/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml b/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
index 7ad817d5..14ac75fc 100644
--- a/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vxlan_vtep.yaml
@@ -39,6 +39,12 @@ mt_lite_support:
     # this feature is always off on these platforms and cannot be changed
     default_only: false
 
+multisite_bg_intf:
+    _exclude: [N3k-F, N5k, N6k, N7k, N9k-F]
+    get_value: '/^multisite border\-gateway interface (\S+)$/'
+    set_value: '<state> multisite border-gateway interface <lpbk_intf>'
+    default_value: ''
+
 shutdown:
   kind: boolean
   get_value: '/^no shutdown$/'
diff --git a/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml b/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
index 0e45fcf0..65bf23b3 100644
--- a/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vxlan_vtep_vni.yaml
@@ -27,6 +27,13 @@ multicast_group:
   set_value: '<state> mcast-group <ip_start> <ip_end>'
   default_value: ''
 
+multisite_ingress_replication:
+  _exclude: [N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^multisite ingress-replication$/'
+  set_value: '<state> multisite ingress-replication'
+  default_value: false
+
 peer_list:
   _exclude: [N5k, N6k, N7k]
   multiple:
diff --git a/lib/cisco_node_utils/evpn_multisite.rb b/lib/cisco_node_utils/evpn_multisite.rb
new file mode 100644
index 00000000..d4bf6f6f
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_multisite.rb
@@ -0,0 +1,70 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class EvpnMultisite < NodeUtil
+    attr_reader :multisiteid, :time
+
+    def initialize(multisiteid, instantiate=true)
+      err_msg = "multisiteid must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless multisiteid.is_a?(Integer) ||
+                                         multisiteid.is_a?(String)
+      @multisiteid = multisiteid.to_i
+      @get_args = @set_args = { multisiteid: @multisiteid }
+      create if instantiate
+    end
+
+    def create
+      Feature.nv_overlay_enable
+      @set_args[:state] = ''
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def self.multisite
+      config_get('evpn_multisite', 'multisite')
+    end
+
+    def multisite=(multisiteid)
+      err_msg = "multisiteid must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless multisiteid.is_a?(Integer) ||
+                                         multisiteid.is_a?(String)
+      @multisiteid = multisiteid.to_i
+      @set_args[:multisiteid] = @multisiteid
+      config_set('evpn_multisite', 'multisite', @set_args)
+    end
+
+    def delay_restore
+      config_get('evpn_multisite', 'delay_restore', @get_args)
+    end
+
+    def delay_restore=(time)
+      @set_args[:time] = time
+      config_set('evpn_multisite', 'delay_restore', @set_args)
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/evpn_stormcontrol.rb b/lib/cisco_node_utils/evpn_stormcontrol.rb
new file mode 100644
index 00000000..c709fa2c
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_stormcontrol.rb
@@ -0,0 +1,81 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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'
+
+module Cisco
+  # node_utils class for evpn_stormcontrol
+  class EvpnStormcontrol < NodeUtil
+    attr_reader :stormcontrol_type, :level
+
+    def initialize(stormcontrol_type, level, instantiate=true)
+      err_msg = 'storm control type must be one of the following:' \
+                ' broadcast, multicast or unicast'
+      type_list = %w(broadcast multicast unicast)
+      fail ArgumentError, err_msg unless type_list.include?(stormcontrol_type)
+      @stormcontrol_type = stormcontrol_type
+
+      err_msg = "level must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless level.is_a?(Integer) ||
+                                         level.is_a?(String)
+      @level = level.to_i
+      @get_args = @set_args = { stormcontrol_type: @stormcontrol_type,
+                                level:             @level }
+      create if instantiate
+    end
+
+    def config_stormcontrol
+      stormcontrol_type = @set_args[:stormcontrol_type]
+      config_set('evpn_stormcontrol', stormcontrol_type, @set_args)
+    end
+
+    def create
+      @set_args[:state] = ''
+      config_stormcontrol
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_stormcontrol
+    end
+
+    def self.broadcast
+      config_get('evpn_stormcontrol', 'broadcast')
+    end
+
+    def self.multicast
+      config_get('evpn_stormcontrol', 'multicast')
+    end
+
+    def self.unicast
+      config_get('evpn_stormcontrol', 'unicast')
+    end
+
+    def level=(level)
+      err_msg = "level must be either a 'String' or an" \
+                " 'Integer' object"
+      fail ArgumentError, err_msg unless level.is_a?(Integer) ||
+                                         level.is_a?(String)
+      @level = level.to_i
+      @set_args[:level] = @level
+      @set_args[:state] = ''
+      config_stormcontrol
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/interface_evpn_multisite.rb b/lib/cisco_node_utils/interface_evpn_multisite.rb
new file mode 100644
index 00000000..8eedaca3
--- /dev/null
+++ b/lib/cisco_node_utils/interface_evpn_multisite.rb
@@ -0,0 +1,46 @@
+# October 2017, Rahul Shenoy
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'node_util'
+
+module Cisco
+  # node_utils class for interface_evpn_multisite
+  class InterfaceEvpnMultisite < NodeUtil
+    attr_reader :interface, :tracking
+
+    def initialize(interface)
+      fail TypeError unless interface.is_a?(String)
+      @interface = interface.downcase
+      @get_args = @set_args = { interface: @interface }
+    end
+
+    def enable(tracking)
+      @set_args[:tracking] = tracking
+      @set_args[:state] = ''
+      config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
+    end
+
+    def disable(tracking)
+      @set_args[:tracking] = tracking
+      @set_args[:state] = 'no'
+      config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
+    end
+
+    def tracking
+      config_get('interface_evpn_multisite', 'evpn_multisite', @get_args)
+    end
+  end # class
+end # module
diff --git a/lib/cisco_node_utils/vxlan_vtep.rb b/lib/cisco_node_utils/vxlan_vtep.rb
index e5a9ba5e..a886470e 100644
--- a/lib/cisco_node_utils/vxlan_vtep.rb
+++ b/lib/cisco_node_utils/vxlan_vtep.rb
@@ -173,5 +173,22 @@ def shutdown=(bool)
     def default_shutdown
       config_get_default('vxlan_vtep', 'shutdown')
     end
+
+    def multisite_bg_interface
+      config_get('vxlan_vtep', 'multisite_bg_intf', name: @name)
+    end
+
+    def multisite_bg_interface=(val)
+      set_args = { name: @name }
+      set_args[:state] = val.empty? ? 'no' : ''
+      # 'no multisite border-gateway' doesn't work with interface
+      # defaulting to 'loopback0' still clears any configuration
+      set_args[:lpbk_intf] = val.empty? ? 'loopback0' : val
+      config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+    end
+
+    def default_multisite_bg_interface
+      config_get_default('vxlan_vtep', 'multisite_bg_intf')
+    end
   end  # Class
 end    # Module
diff --git a/lib/cisco_node_utils/vxlan_vtep_vni.rb b/lib/cisco_node_utils/vxlan_vtep_vni.rb
index 8901defa..67ccfa07 100644
--- a/lib/cisco_node_utils/vxlan_vtep_vni.rb
+++ b/lib/cisco_node_utils/vxlan_vtep_vni.rb
@@ -262,5 +262,18 @@ def suppress_uuc=(state)
     def default_suppress_uuc
       config_get_default('vxlan_vtep_vni', 'suppress_uuc')
     end
+
+    def multisite_ingress_replication
+      config_get('vxlan_vtep_vni', 'multisite_ingress_replication', @get_args)
+    end
+
+    def multisite_ingress_replication=(state)
+      @set_args[:state] = state ? '' : 'no'
+      config_set('vxlan_vtep_vni', 'multisite_ingress_replication', @set_args)
+    end
+
+    def default_multisite_ingress_replication
+      config_get_default('vxlan_vtep_vni', 'multisite_ingress_replication')
+    end
   end
 end
diff --git a/tests/test_bgp_neighbor.rb b/tests/test_bgp_neighbor.rb
index f89d7c58..7ea260e7 100644
--- a/tests/test_bgp_neighbor.rb
+++ b/tests/test_bgp_neighbor.rb
@@ -578,4 +578,19 @@ def test_update_source
       neighbor.destroy
     end
   end
+
+  def test_peer_type
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    %w(default test_vrf).each do |vrf|
+      neighbor = RouterBgpNeighbor.new(ASN, vrf, ADDR)
+      check = ['fabric-border-leaf', 'fabric-external',
+               neighbor.default_peer_type]
+      check.each do |val|
+        neighbor.peer_type = val
+        assert_equal(val, neighbor.peer_type)
+      end
+      neighbor.destroy
+    end
+  end
 end
diff --git a/tests/test_bgp_neighbor_af.rb b/tests/test_bgp_neighbor_af.rb
index b32c4969..d6f95734 100644
--- a/tests/test_bgp_neighbor_af.rb
+++ b/tests/test_bgp_neighbor_af.rb
@@ -747,4 +747,31 @@ def weight(af, dbg)
     assert_equal(af.default_weight, af.weight,
                  "Test 3. #{dbg} Failed to remove weight")
   end
+
+  def test_rewrite_rt_asn
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    af_args = @@matrix[:evpn]
+    # clean_af needs true since rewrite_rt_asn is ebgp only
+    af, dbg = clean_af(af_args, true)
+    rewrite_rt_asn(af, dbg)
+  end
+
+  def rewrite_rt_asn(af, dbg)
+    # eBGP only
+    af.rewrite_rt_asn = true
+    assert(af.rewrite_rt_asn,
+           "Test 1. #{dbg} Did not set true")
+
+    af.rewrite_rt_asn = false
+    refute(af.rewrite_rt_asn,
+           "Test 2. #{dbg} Did not set false")
+
+    af.rewrite_rt_asn = true
+
+    def_val = af.default_rewrite_rt_asn
+    af.rewrite_rt_asn = def_val
+    assert_equal(def_val, af.rewrite_rt_asn,
+                 "Test 3. #{dbg} Did not set to default")
+  end
 end
diff --git a/tests/test_evpn_multisite.rb b/tests/test_evpn_multisite.rb
new file mode 100644
index 00000000..a6f88890
--- /dev/null
+++ b/tests/test_evpn_multisite.rb
@@ -0,0 +1,70 @@
+# Evpn Multisite Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
+
+# TestEvpnMultisite - Minitest for EvpnMultisite class
+class TestEvpnMultisite < CiscoTestCase
+  @skip_unless_supported = 'evpn_multisite'
+
+  def setup
+    # Disable feature nv overlay before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    config('no feature nv overlay')
+  end
+
+  def test_create_and_destroy
+    ms = EvpnMultisite.new(100)
+    ms_id = EvpnMultisite.multisite
+    assert_equal('100', ms_id,
+                 'Error: failed to create multisite border-gateway 100')
+    ms.destroy
+    ms_id = EvpnMultisite.multisite
+    assert_nil(ms_id, 'Error: failed to destroy multisite border-gateway 100')
+  end
+
+  def test_delay_restore
+    ms = EvpnMultisite.new(100)
+    ms.delay_restore = 31
+    assert_equal('31', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 31')
+    ms.delay_restore = 1000
+    assert_equal('1000', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 1000')
+    ms.destroy
+  end
+
+  def test_update_multisiteid
+    ms = EvpnMultisite.new(100)
+    ms.delay_restore = 50
+    assert_equal('100', EvpnMultisite.multisite,
+                 'Error: failed to create multisite border-gateway 100')
+    assert_equal('50', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 50')
+    ms.multisite = 200
+    assert_equal('200', EvpnMultisite.multisite,
+                 'Error: failed to create multisite border-gateway 200')
+    assert_equal('50', ms.delay_restore,
+                 'multisite border-gateway delay_restore should be 50')
+    ms.destroy
+  end
+end
diff --git a/tests/test_evpn_stormcontrol.rb b/tests/test_evpn_stormcontrol.rb
new file mode 100644
index 00000000..52e28595
--- /dev/null
+++ b/tests/test_evpn_stormcontrol.rb
@@ -0,0 +1,56 @@
+# Evpn Stormcontrol Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_stormcontrol'
+
+# TestEvpnStormcontrol - Minitest for EvpnStormcontrol class
+class TestEvpnStormcontrol < CiscoTestCase
+  @skip_unless_supported = 'evpn_stormcontrol'
+
+  def setup
+    # Ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    config('no evpn storm-control broadcast level 50')
+    config('no evpn storm-control multicast level 50')
+    config('no evpn storm-control unicast level 50')
+  end
+
+  def test_create_and_destroy
+    sc = EvpnStormcontrol.new('broadcast', 50)
+    sc_level = EvpnStormcontrol.broadcast
+    assert_equal('50', sc_level,
+                 'Error: failed to configure evpn storm-control broadcast ' \
+                 'level 50')
+    sc.destroy
+    sc_level = EvpnStormcontrol.broadcast
+    assert_nil(sc_level, 'Error: failed to destroy storm-control config')
+  end
+
+  def test_update_level
+    sc = EvpnStormcontrol.new('multicast', 50)
+    assert_equal('50', EvpnStormcontrol.multicast,
+                 'Error: multicast storm-control level should be 50')
+    sc.level = 51
+    assert_equal('51', EvpnStormcontrol.multicast,
+                 'Error: failed to create multisite border-gateway 200')
+    sc.destroy
+  end
+end
diff --git a/tests/test_interface_evpn_multisite.rb b/tests/test_interface_evpn_multisite.rb
new file mode 100644
index 00000000..409f6c97
--- /dev/null
+++ b/tests/test_interface_evpn_multisite.rb
@@ -0,0 +1,59 @@
+# Interface Evpn Multisite Unit Tests
+#
+# Rahul Shenoy, October, 2017
+#
+# Copyright (c) 2017 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/interface_evpn_multisite'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
+
+# TestInterfaceEvpnMultisite - Minitest for InterfaceEvpnMultisite class
+class TestInterfaceEvpnMultisite < CiscoTestCase
+  @skip_unless_supported = 'interface_evpn_multisite'
+
+  def setup
+    # ensure we are starting with a clean slate for each test.
+    super
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    interface_ethernet_default(interfaces[0])
+  end
+
+  def interface_ethernet_default(intf)
+    config("default interface #{intf}")
+  end
+
+  def test_enable_disable
+    interface = interfaces[0]
+    intf_ms = InterfaceEvpnMultisite.new(interface)
+    ms = EvpnMultisite.new(100)
+    intf_ms.enable('dci-tracking')
+    assert_equal('dci-tracking', intf_ms.tracking)
+    intf_ms.disable('dci-tracking')
+    assert_nil(intf_ms.tracking)
+    ms.destroy
+  end
+
+  def test_enable_with_no_multisite_bordergateway
+    interface = interfaces[0]
+    intf_ms = InterfaceEvpnMultisite.new(interface)
+    ms = EvpnMultisite.new(100)
+    ms.destroy
+    assert_raises(CliError, 'Invalid command') do
+      intf_ms.enable('dci-tracking')
+    end
+  end
+end
diff --git a/tests/test_vxlan_vtep.rb b/tests/test_vxlan_vtep.rb
index 49712acc..e1f6e116 100755
--- a/tests/test_vxlan_vtep.rb
+++ b/tests/test_vxlan_vtep.rb
@@ -16,6 +16,7 @@
 require_relative '../lib/cisco_node_utils/feature'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vdc'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -182,6 +183,28 @@ def test_source_interface
     assert_equal(val, vtep.source_interface)
   end
 
+  def test_multisite_bg_interface
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+    vtep = VxlanVtep.new('nve1')
+
+    # Set multisite_bg_interface to non-default value
+    val = 'loopback55'
+    ms = EvpnMultisite.new(100)
+    vtep.multisite_bg_interface = val
+    assert_equal(val, vtep.multisite_bg_interface)
+
+    vtep.multisite_bg_interface = vtep.default_multisite_bg_interface
+    assert_equal(vtep.default_multisite_bg_interface,
+                 vtep.multisite_bg_interface)
+
+    # Should Error when no 'evpn multisite border-gateway' set
+    ms.destroy
+    assert_raises(Cisco::CliError) do
+      vtep.multisite_bg_interface = val
+    end
+  end
+
   def test_source_interface_hold_down_time
     vtep = VxlanVtep.new('nve1')
     if validate_property_excluded?('vxlan_vtep', 'source_intf_hold_down_time')
diff --git a/tests/test_vxlan_vtep_vni.rb b/tests/test_vxlan_vtep_vni.rb
index 9415a882..4ec522fb 100644
--- a/tests/test_vxlan_vtep_vni.rb
+++ b/tests/test_vxlan_vtep_vni.rb
@@ -15,6 +15,7 @@
 require_relative 'ciscotest'
 require_relative '../lib/cisco_node_utils/vxlan_vtep'
 require_relative '../lib/cisco_node_utils/vxlan_vtep_vni'
+require_relative '../lib/cisco_node_utils/evpn_multisite'
 
 include Cisco
 
@@ -258,4 +259,34 @@ def test_suppress_uuc
     vni.suppress_uuc = vni.default_suppress_uuc
     refute(vni.suppress_uuc, 'suppress_uuc should be disabled')
   end
+
+  def test_multisite_ingress_replication
+    skip("#{node.product_id} doesn't support this feature") unless
+      node.product_id[/N9K.*EX/]
+
+    vni = VxlanVtepVni.new('nve1', '6000')
+    ms = EvpnMultisite.new(100)
+
+    # Test: Default
+    vni.multisite_ingress_replication =
+      vni.default_multisite_ingress_replication
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    # Test: Enable multisite_ingress_replication
+    vni.multisite_ingress_replication = true
+    assert(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be enabled')
+
+    # Test: Disable multisite_ingress_replication
+    vni.multisite_ingress_replication = false
+    refute(vni.multisite_ingress_replication,
+           'multisite ingress-replication should be disabled')
+
+    ms.destroy
+    # Test: enabling multisite ingress-replication without a multisite bg errors
+    assert_raises(Cisco::CliError) do
+      vni.multisite_ingress_replication = true
+    end
+  end
 end

From c22eeceb3e77cb5ac79927c72b7a0107dc635b19 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Fri, 1 Dec 2017 17:35:26 -0500
Subject: [PATCH 03/34] Update with new tacacs+ server IP

---
 tests/tacacs_server.yaml.example | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/tacacs_server.yaml.example b/tests/tacacs_server.yaml.example
index bb953764..5e6d3353 100644
--- a/tests/tacacs_server.yaml.example
+++ b/tests/tacacs_server.yaml.example
@@ -1,6 +1,6 @@
 # Tacacs server configuration for test_aaa_authorization_service.rb
 # Tacacs server must be set up with external access for test to run
-host: '10.122.197.197'
+host: '10.122.197.184'
 key:  'testing123'
 vrf:  'management'
 intf: 'mgmt0'

From ef7b5bd6cf73c51b34625ea0704f785ad5ad22f2 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Tue, 5 Dec 2017 09:49:18 -0500
Subject: [PATCH 04/34] Fix n56k support (#568)

---
 lib/cisco_node_utils/cmd_ref/inventory.yaml    |  9 +++++++++
 lib/cisco_node_utils/cmd_ref/show_version.yaml | 10 +++++++++-
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/lib/cisco_node_utils/cmd_ref/inventory.yaml b/lib/cisco_node_utils/cmd_ref/inventory.yaml
index 5abfa6f3..d7a5905c 100644
--- a/lib/cisco_node_utils/cmd_ref/inventory.yaml
+++ b/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
diff --git a/lib/cisco_node_utils/cmd_ref/show_version.yaml b/lib/cisco_node_utils/cmd_ref/show_version.yaml
index 7a43252d..da478b90 100644
--- a/lib/cisco_node_utils/cmd_ref/show_version.yaml
+++ b/lib/cisco_node_utils/cmd_ref/show_version.yaml
@@ -1,7 +1,15 @@
 # show_version
 ---
 _template:
-  get_command: 'sh hardware'
+  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:

From f842edf22cba0081feffbb26bb6ce2cc3cd9e4cb Mon Sep 17 00:00:00 2001
From: saichint <saichint@cisco.com>
Date: Tue, 5 Dec 2017 09:14:46 -0800
Subject: [PATCH 05/34] fix for virtual platforms and tacacs_global (#567)

* fixes for tacacs global and virtual platforms

* review comments

* add the skip for I2
---
 tests/ciscotest.rb          |  4 ++++
 tests/test_node_ext.rb      |  3 ++-
 tests/test_tacacs_global.rb | 16 +++++++++-------
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/tests/ciscotest.rb b/tests/ciscotest.rb
index 3d83c7ca..56b2f3c8 100644
--- a/tests/ciscotest.rb
+++ b/tests/ciscotest.rb
@@ -226,6 +226,10 @@ def skip_legacy_defect?(pattern, msg)
     skip(msg) if Utils.image_version?(Regexp.new(pattern))
   end
 
+  def virtual_platform?
+    node.product_id[/N9K-NXOSV|N9K-9000v/] ? true : false
+  end
+
   def interfaces
     unless @@interfaces
       # Build the platform_info, used for interface lookup
diff --git a/tests/test_node_ext.rb b/tests/test_node_ext.rb
index 7357c471..696fa021 100644
--- a/tests/test_node_ext.rb
+++ b/tests/test_node_ext.rb
@@ -345,7 +345,8 @@ def test_get_last_reset_reason
     assert_output_check(command: 'show version',
                         pattern: /.*\nLast reset.*\n\n?  Reason: (.*)\n/,
                         check:   node.last_reset_reason,
-                        msg:     'Error, Last reset reason does not match')
+                        msg:     'Error, Last reset reason does not match') unless
+      virtual_platform?
   end
 
   def test_get_system_cpu_utilization
diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb
index 17f37c3f..addd8c58 100644
--- a/tests/test_tacacs_global.rb
+++ b/tests/test_tacacs_global.rb
@@ -72,13 +72,15 @@ def test_tacacs_global
     assert_equal(7, global.key_format)
     assert_equal('"WAWY_NZB"', global.key)
 
-    # second key change - modify key to type6
-    key_format = 6
-    # Must use a valid type6 password: CSCvb36266
-    key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-    global.encryption_key_set(key_format, key)
-    assert_equal(key_format, global.key_format)
-    assert_equal("\"#{key}\"", global.key)
+    unless Platform.image_version[/I2/]
+      # second key change - modify key to type6
+      key_format = 6
+      # Must use a valid type6 password: CSCvb36266
+      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+      global.encryption_key_set(key_format, key)
+      assert_equal(key_format, global.key_format)
+      assert_equal("\"#{key}\"", global.key)
+    end
 
     # Remove global key
     global.encryption_key_set('', '')

From dbbdf209eeaa4a2b20a960883bbb59cf17d867d3 Mon Sep 17 00:00:00 2001
From: Rick Sherman <rick@shermdog.com>
Date: Mon, 11 Dec 2017 13:16:41 -0600
Subject: [PATCH 06/34] (CISCO-60) Do not enable TACACS feature at init (#569)

Prior to this commit `feature tacacs+` was being enabled simply by initilizing the providers.

Moved enabling of TACACS to appropriate setters and stopped trying to query status for resources when disabled.
---
 lib/cisco_node_utils/tacacs_global.rb | 14 +++++++++-----
 tests/test_tacacs_global.rb           | 15 ++++++++++-----
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/lib/cisco_node_utils/tacacs_global.rb b/lib/cisco_node_utils/tacacs_global.rb
index 2db86061..28a9398a 100644
--- a/lib/cisco_node_utils/tacacs_global.rb
+++ b/lib/cisco_node_utils/tacacs_global.rb
@@ -29,7 +29,6 @@ def initialize(name)
       fail ArgumentError,
            "This provider only accepts an id of 'default'" \
            unless name.eql?('default')
-      Feature.tacacs_enable unless Feature.tacacs_enabled?
       @name = name
     end
 
@@ -44,6 +43,7 @@ def ==(other)
     end
 
     def timeout
+      return nil unless Feature.tacacs_enabled?
       config_get('tacacs_global', 'timeout')
     end
 
@@ -58,11 +58,11 @@ def timeout=(val)
       end
 
       if val.nil?
-        config_set('tacacs_global',
-                   'timeout',
-                   state:   'no',
-                   timeout: timeout)
+        fail ArgumentError, 'timeout cannot be unset if TACACS enabled - ' \
+        "use default value #{default_timeout}" \
+          if Feature.tacacs_enabled?
       else
+        Feature.tacacs_enable
         config_set('tacacs_global',
                    'timeout',
                    state:   '',
@@ -76,6 +76,7 @@ def key_format
     end
 
     def key
+      return nil unless Feature.tacacs_enabled?
       str = config_get('tacacs_global', 'key')
       return TacacsGlobal.default_key if str.empty?
       str = str[1].strip
@@ -96,6 +97,7 @@ def encryption_key_set(key_format, key)
         config_set('tacacs_server', 'encryption', state: 'no',
                     option: key_format, key: key)
       else
+        Feature.tacacs_enable
         key = Utils.add_quotes(key)
         if key_format.nil? || key_format.to_s.empty?
           config_set('tacacs_server', 'encryption', state: '', option: '',
@@ -115,6 +117,7 @@ def default_source_interface
     # Set source interface
     def source_interface=(name)
       if name
+        Feature.tacacs_enable
         config_set(
           'tacacs_global', 'source_interface',
           state: '', source_interface: name)
@@ -127,6 +130,7 @@ def source_interface=(name)
 
     # Get source interface
     def source_interface
+      return nil unless Feature.tacacs_enabled?
       i = config_get('tacacs_global', 'source_interface')
       i.nil? ? default_source_interface : i.downcase
     end
diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb
index addd8c58..e7f4999d 100644
--- a/tests/test_tacacs_global.rb
+++ b/tests/test_tacacs_global.rb
@@ -31,7 +31,7 @@ def setup
 
   def teardown
     # teardown runs at the end of each test
-    no_tacacs_global
+    no_tacacs_global if platform == :ios_xr
     config_no_warn('no feature tacacs+') if platform == :nexus
     super
   end
@@ -50,7 +50,11 @@ def test_tacacs_global
     assert_includes(Cisco::TacacsGlobal.tacacs_global, id)
     assert_equal(global, Cisco::TacacsGlobal.tacacs_global[id])
 
-    # Default timeout
+    # No timeout when TACACS is not enabled
+    assert_nil(global.timeout)
+
+    # Turn on TACACS and verify default Timeout
+    config_no_warn('feature tacacs+') if platform == :nexus
     assert_equal(global.default_timeout, global.timeout)
 
     # Timeout update
@@ -58,9 +62,10 @@ def test_tacacs_global
     assert_equal(10, Cisco::TacacsGlobal.tacacs_global[id].timeout)
     assert_equal(10, global.timeout)
 
-    # Remove timeout
-    global.timeout = nil
-    assert_equal(global.default_timeout, global.timeout)
+    # Do not unset timout if TACACS is enabled
+    assert_raises(ArgumentError) do
+      global.timeout = nil
+    end
 
     # Check there is no default key
     assert_equal('', global.key)

From b4de0a90ccc076e24aff72278079d1a3d6e38110 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Wed, 13 Dec 2017 12:17:42 -0500
Subject: [PATCH 07/34] Add back Unreleased tag in changelog.

---
 CHANGELOG.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5f006af..ad0d0eb5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,18 @@
 Changelog
 =========
 
+## [Unreleased]
+
+### New feature support
+
+### Added
+
+### Changed
+
+### Removed
+
+### Issues Addressed
+
 ## [v1.8.0]
 
 ### New feature support
@@ -534,6 +546,7 @@ Changelog
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
+[Unreleased]: https://github.com/cisco/cisco-network-node-utils/compare/master...develop
 [v1.8.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.6.0...v1.7.0
 [v1.6.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.5.0...v1.6.0

From d0317d2af4d1a9a03d232b2e383e7d9f1d1b1119 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Wed, 13 Dec 2017 12:21:25 -0500
Subject: [PATCH 08/34] Update CHANGELOG.md

---
 CHANGELOG.md | 26 ++++++++++----------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad0d0eb5..6a0cc244 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,21 +3,7 @@ Changelog
 
 ## [Unreleased]
 
-### New feature support
-
-### Added
-
-### Changed
-
-### Removed
-
-### Issues Addressed
-
-## [v1.8.0]
-
-### New feature support
-
-#### Cisco Resources
+### New Cisco Resources
 * EVPN Multisite
   * evpn_multisite (@rahushen)
   * evpn_stormcontrol (@rahushen)
@@ -35,8 +21,16 @@ Changelog
 
 * Extend bgp_neighbor_af with attributes:
    * `rewrite_rt_asn`
+   
+### Changed
 
-#### Cisco Resources
+### Removed
+
+### Issues Addressed
+
+## [v1.8.0]
+
+### New Cisco Resources
 * ObjectGroup
   * object_group (@saichint)
   * object_group_entry (@saichint)

From 60070c28cc24c237b3b923ef9cc801b651b63200 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Wed, 13 Dec 2017 12:27:04 -0500
Subject: [PATCH 09/34] Remove trailing whitespace.

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a0cc244..1632a26b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,7 +21,7 @@ Changelog
 
 * Extend bgp_neighbor_af with attributes:
    * `rewrite_rt_asn`
-   
+
 ### Changed
 
 ### Removed

From 685d643b8b010132e343df85c0288ad759327a89 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Thu, 14 Dec 2017 09:08:31 -0500
Subject: [PATCH 10/34] Create version 1.9.0-dev (#571)

* lib/cisco_node_utils/version.rb

* Change version to match puppet

* Use proper semantic versioning format.
---
 lib/cisco_node_utils/version.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb
index 0b08f418..8f606832 100644
--- a/lib/cisco_node_utils/version.rb
+++ b/lib/cisco_node_utils/version.rb
@@ -14,7 +14,7 @@
 
 # Container module for version number only.
 module CiscoNodeUtils
-  VERSION = '1.8.0'
+  VERSION = '1.9.0-dev'
   gem_version = Gem::Version.new(Gem::VERSION)
   min_gem_version = Gem::Version.new('2.1.0')
   fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version

From bfc11f72102a2ae9494f4aad1124a296fa3906b9 Mon Sep 17 00:00:00 2001
From: saichint <saichint@cisco.com>
Date: Fri, 12 Jan 2018 08:08:58 -0800
Subject: [PATCH 11/34] fixes for nu minitest failures (#573)

---
 tests/test_node_ext.rb      |  2 +-
 tests/test_radius_global.rb | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/tests/test_node_ext.rb b/tests/test_node_ext.rb
index 696fa021..590a411e 100644
--- a/tests/test_node_ext.rb
+++ b/tests/test_node_ext.rb
@@ -333,7 +333,7 @@ def test_get_last_reset_time
     if validate_property_excluded?('show_version', 'last_reset_time')
       assert_nil(node.last_reset_time)
     else
-      refute_nil(node.last_reset_time)
+      refute_nil(node.last_reset_time) unless virtual_platform?
     end
   end
 
diff --git a/tests/test_radius_global.rb b/tests/test_radius_global.rb
index c9bba003..dca2abe8 100644
--- a/tests/test_radius_global.rb
+++ b/tests/test_radius_global.rb
@@ -71,11 +71,13 @@ def test_radius_global
       assert_match(/#{key}/, global.key)
       assert_match(/#{key}/, Cisco::RadiusGlobal.radius_global[id].key)
       assert_equal(7, global.key_format)
-      # Change to type 6
-      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-      global.key_set(key, 6)
-      assert_match(/#{key}/, global.key)
-      assert_equal(6, global.key_format)
+      unless Platform.image_version[/I2|I4/] # legacy defect CSCvb57180
+        # Change to type 6
+        key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+        global.key_set(key, 6)
+        assert_match(/#{key}/, global.key)
+        assert_equal(6, global.key_format)
+      end
     elsif platform == :ios_xr
       global.key_set('QsEfThUkO', nil)
       assert(!global.key.nil?)

From e408c1af022b0b8047dbb0db04264f337eedbe84 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Fri, 12 Jan 2018 16:05:18 -0500
Subject: [PATCH 12/34] Part 2: More modifications for evpn_multisite (#572)

* add multisite command reference

* add tests and more logic to evpn_multisite

* add evpn_stormcontrol NU module

* add interface_evpn_multisite cmd_ref + nu + tests

* add perr_type property for bgp_neighbor

* add rewrite_rt_asn property to bgp_neighbor_af

* add multisite_bg_interface property to vxlan_vtep

* add multisite_ingress_replication property to vxlan_vtep_vni

* recalibrate tests to skip for non-relevant platforms

* Fix rubocop errors

* Incorporate feedback comments

* Update Changelog

* add stormcontrol method to evpn_stormcontrol

* add level function to evpn_stormcontrol

* modify level function in evpn_stormcontrol

* misc. fixes

* Add class method for multisite

* add default value and method for delay_restore

* add default method for interface_evpn_multisite

* remove default method as it is not needed

* rename rewrite_rt_asn as rewrite_evpn_rt_asn

* rename multisite_bg_interface as multisite_border_gateway_interface

* Make Minitests Work Again(MMWA)

* fix rubocop errors

* using config_set instead of Feature.nv_overlay_enable

* handle default case

* make rubocop happy

* add default check for multisite_ingress_replication

* support default behavior for rewrite_evpn_rt_asn

* support default for peer_type
---
 CHANGELOG.md                                  |  4 +--
 lib/cisco_node_utils/bgp_neighbor.rb          |  1 +
 lib/cisco_node_utils/bgp_neighbor_af.rb       | 18 +++++++----
 .../cmd_ref/bgp_neighbor_af.yaml              |  6 ++--
 .../cmd_ref/evpn_multisite.yaml               |  1 +
 .../cmd_ref/interface_evpn_multisite.yaml     |  5 ++++
 lib/cisco_node_utils/evpn_multisite.rb        | 30 +++++++++++++++++--
 lib/cisco_node_utils/evpn_stormcontrol.rb     | 19 +++++++-----
 .../interface_evpn_multisite.rb               | 19 +++++++++++-
 lib/cisco_node_utils/vxlan_vtep.rb            | 19 ++++++++----
 lib/cisco_node_utils/vxlan_vtep_vni.rb        | 10 ++++++-
 tests/test_bgp_neighbor_af.rb                 | 22 +++++++-------
 tests/test_evpn_multisite.rb                  |  8 ++---
 tests/test_evpn_stormcontrol.rb               |  8 ++---
 tests/test_vxlan_vtep.rb                      | 12 ++++----
 15 files changed, 128 insertions(+), 54 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1632a26b..04d67b32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,7 +11,7 @@ Changelog
 
 ### Added
 * Extend vxlan_vtep with attributes:
-   * `multisite_bg_interface`
+   * `multisite_border_gateway_interface`
 
 * Extend vxlan_vtep_vni with attributes:
    * `multisite_ingress_replication`
@@ -20,7 +20,7 @@ Changelog
    * `peer_type`
 
 * Extend bgp_neighbor_af with attributes:
-   * `rewrite_rt_asn`
+   * `rewrite_evpn_rt_asn`
 
 ### Changed
 
diff --git a/lib/cisco_node_utils/bgp_neighbor.rb b/lib/cisco_node_utils/bgp_neighbor.rb
index ac25c36e..dd41c471 100644
--- a/lib/cisco_node_utils/bgp_neighbor.rb
+++ b/lib/cisco_node_utils/bgp_neighbor.rb
@@ -511,6 +511,7 @@ def default_peer_type
     def peer_type=(val)
       if val == default_peer_type
         @set_args[:state] = 'no'
+        @set_args[:peer_type] = ''
       else
         Feature.nv_overlay_evpn_enable
         @set_args[:peer_type] = val
diff --git a/lib/cisco_node_utils/bgp_neighbor_af.rb b/lib/cisco_node_utils/bgp_neighbor_af.rb
index ef38792f..4ec4d317 100644
--- a/lib/cisco_node_utils/bgp_neighbor_af.rb
+++ b/lib/cisco_node_utils/bgp_neighbor_af.rb
@@ -757,18 +757,24 @@ def default_weight
       config_get_default('bgp_neighbor_af', 'weight')
     end
 
-    def rewrite_rt_asn
-      config_get('bgp_neighbor_af', 'rewrite_rt_asn', @get_args)
+    def rewrite_evpn_rt_asn
+      config_get('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @get_args)
     end
 
-    def rewrite_rt_asn=(state)
+    def rewrite_evpn_rt_asn=(state)
       Feature.nv_overlay_evpn_enable if state
       set_args_keys(state: (state ? '' : 'no'))
-      config_set('bgp_neighbor_af', 'rewrite_rt_asn', @set_args)
+      if @set_args[:state] == 'no'
+        unless rewrite_evpn_rt_asn == default_rewrite_evpn_rt_asn
+          config_set('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @set_args)
+        end
+      else
+        config_set('bgp_neighbor_af', 'rewrite_evpn_rt_asn', @set_args)
+      end
     end
 
-    def default_rewrite_rt_asn
-      config_get_default('bgp_neighbor_af', 'rewrite_rt_asn')
+    def default_rewrite_evpn_rt_asn
+      config_get_default('bgp_neighbor_af', 'rewrite_evpn_rt_asn')
     end
   end
 end
diff --git a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
index eb3ce8c3..a93daf78 100644
--- a/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/bgp_neighbor_af.yaml
@@ -146,11 +146,11 @@ prefix_list_out:
   set_value: '<state> prefix-list <str> out'
   default_value: ''
 
-rewrite_rt_asn:
+rewrite_evpn_rt_asn:
   _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
   kind: boolean
-  get_value: '/^rewrite-rt-asn$/'
-  set_value: '<state> rewrite-rt-asn'
+  get_value: '/^rewrite-evpn-rt-asn$/'
+  set_value: '<state> rewrite-evpn-rt-asn'
   default_value: false
 
 route_map_in:
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
index a0c8bd3b..118a4848 100644
--- a/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
+++ b/lib/cisco_node_utils/cmd_ref/evpn_multisite.yaml
@@ -6,6 +6,7 @@ _template:
   get_command: "show running-config | section multisite"
 
 delay_restore:
+  default_value: ""
   get_context: ['/^evpn multisite border-gateway <multisiteid>$/']
   get_value: '/^delay-restore\s+time\s+(\d+)$/'
   set_context: ['evpn multisite border-gateway <multisiteid>']
diff --git a/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
index 3623e453..52ec3e5e 100644
--- a/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
+++ b/lib/cisco_node_utils/cmd_ref/interface_evpn_multisite.yaml
@@ -7,6 +7,11 @@ _template:
   context:
     - "interface <interface>"
 
+all_interfaces:
+  multiple:
+  get_context: ~
+  get_value: '/^interface (.*)/'
+
 evpn_multisite:
   get_value: '/^evpn multisite (\S+)$/'
   set_value: "<state> evpn multisite <tracking>"
diff --git a/lib/cisco_node_utils/evpn_multisite.rb b/lib/cisco_node_utils/evpn_multisite.rb
index d4bf6f6f..b64bfd0b 100644
--- a/lib/cisco_node_utils/evpn_multisite.rb
+++ b/lib/cisco_node_utils/evpn_multisite.rb
@@ -34,17 +34,31 @@ def initialize(multisiteid, instantiate=true)
     end
 
     def create
-      Feature.nv_overlay_enable
+      # There is an issue with EX platform using
+      # Feature.nv_overlay_enable generating error code '400'
+      # Using config_set for enabling nv overlay
+      config_set('feature', 'nv_overlay', state: '')
+      sleep 1
       @set_args[:state] = ''
       config_set('evpn_multisite', 'multisite', @set_args)
     end
 
     def destroy
       @set_args[:state] = 'no'
+      # HACK: set time to a dummy value
+      @set_args[:time] = 30
+      config_set('evpn_multisite', 'delay_restore', @set_args)
       config_set('evpn_multisite', 'multisite', @set_args)
     end
 
     def self.multisite
+      nu_obj = nil
+      ms_id = config_get('evpn_multisite', 'multisite')
+      nu_obj = EvpnMultisite.new(ms_id, false) if ms_id
+      nu_obj
+    end
+
+    def multisite
       config_get('evpn_multisite', 'multisite')
     end
 
@@ -63,8 +77,20 @@ def delay_restore
     end
 
     def delay_restore=(time)
-      @set_args[:time] = time
+      # HACK: set a dummy time value when removing the property
+      dummy_time = 30
+      if time == default_delay_restore
+        @set_args[:state] = 'no'
+        @set_args[:time] = dummy_time
+      else
+        @set_args[:time] = time
+        @set_args[:state] = '' unless @set_args[:state]
+      end
       config_set('evpn_multisite', 'delay_restore', @set_args)
     end
+
+    def default_delay_restore
+      config_get_default('evpn_multisite', 'delay_restore')
+    end
   end
 end
diff --git a/lib/cisco_node_utils/evpn_stormcontrol.rb b/lib/cisco_node_utils/evpn_stormcontrol.rb
index c709fa2c..4e8d9d31 100644
--- a/lib/cisco_node_utils/evpn_stormcontrol.rb
+++ b/lib/cisco_node_utils/evpn_stormcontrol.rb
@@ -55,16 +55,19 @@ def destroy
       config_stormcontrol
     end
 
-    def self.broadcast
-      config_get('evpn_stormcontrol', 'broadcast')
-    end
-
-    def self.multicast
-      config_get('evpn_stormcontrol', 'multicast')
+    # Create a hash of all stormcontrol instances
+    def self.stormcontrol
+      hash = {}
+      type_list = %w(broadcast multicast unicast)
+      type_list.each do |type|
+        level = config_get('evpn_stormcontrol', type)
+        hash[type] = EvpnStormcontrol.new(type, level, false) if level
+      end
+      hash
     end
 
-    def self.unicast
-      config_get('evpn_stormcontrol', 'unicast')
+    def level
+      config_get('evpn_stormcontrol', @get_args[:stormcontrol_type])
     end
 
     def level=(level)
diff --git a/lib/cisco_node_utils/interface_evpn_multisite.rb b/lib/cisco_node_utils/interface_evpn_multisite.rb
index 8eedaca3..2182541b 100644
--- a/lib/cisco_node_utils/interface_evpn_multisite.rb
+++ b/lib/cisco_node_utils/interface_evpn_multisite.rb
@@ -27,13 +27,26 @@ def initialize(interface)
       @get_args = @set_args = { interface: @interface }
     end
 
+    def self.interfaces
+      hash = {}
+      intf_list = config_get('interface_evpn_multisite', 'all_interfaces')
+      return hash if intf_list.nil?
+
+      intf_list.each do |id|
+        id = id.downcase
+        intf = InterfaceEvpnMultisite.new(id)
+        hash[id] = intf if intf.tracking
+      end
+      hash
+    end
+
     def enable(tracking)
       @set_args[:tracking] = tracking
       @set_args[:state] = ''
       config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
     end
 
-    def disable(tracking)
+    def disable(tracking='dci-tracking')
       @set_args[:tracking] = tracking
       @set_args[:state] = 'no'
       config_set('interface_evpn_multisite', 'evpn_multisite', @set_args)
@@ -42,5 +55,9 @@ def disable(tracking)
     def tracking
       config_get('interface_evpn_multisite', 'evpn_multisite', @get_args)
     end
+
+    def tracking=(tracking)
+      enable(tracking)
+    end
   end # class
 end # module
diff --git a/lib/cisco_node_utils/vxlan_vtep.rb b/lib/cisco_node_utils/vxlan_vtep.rb
index a886470e..0beb61c7 100644
--- a/lib/cisco_node_utils/vxlan_vtep.rb
+++ b/lib/cisco_node_utils/vxlan_vtep.rb
@@ -174,20 +174,27 @@ def default_shutdown
       config_get_default('vxlan_vtep', 'shutdown')
     end
 
-    def multisite_bg_interface
+    def multisite_border_gateway_interface
       config_get('vxlan_vtep', 'multisite_bg_intf', name: @name)
     end
 
-    def multisite_bg_interface=(val)
+    def multisite_border_gateway_interface=(val)
       set_args = { name: @name }
       set_args[:state] = val.empty? ? 'no' : ''
-      # 'no multisite border-gateway' doesn't work with interface
-      # defaulting to 'loopback0' still clears any configuration
       set_args[:lpbk_intf] = val.empty? ? 'loopback0' : val
-      config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+      if set_args[:state] == 'no'
+        # 'no multisite border-gateway' doesn't work without interface
+        # defaulting to 'loopback0' still clears any configuration
+        intf = multisite_border_gateway_interface
+        unless intf == default_multisite_border_gateway_interface
+          config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+        end
+      else
+        config_set('vxlan_vtep', 'multisite_bg_intf', set_args)
+      end
     end
 
-    def default_multisite_bg_interface
+    def default_multisite_border_gateway_interface
       config_get_default('vxlan_vtep', 'multisite_bg_intf')
     end
   end  # Class
diff --git a/lib/cisco_node_utils/vxlan_vtep_vni.rb b/lib/cisco_node_utils/vxlan_vtep_vni.rb
index 67ccfa07..ace6784b 100644
--- a/lib/cisco_node_utils/vxlan_vtep_vni.rb
+++ b/lib/cisco_node_utils/vxlan_vtep_vni.rb
@@ -269,7 +269,15 @@ def multisite_ingress_replication
 
     def multisite_ingress_replication=(state)
       @set_args[:state] = state ? '' : 'no'
-      config_set('vxlan_vtep_vni', 'multisite_ingress_replication', @set_args)
+      if @set_args[:state] == 'no'
+        unless multisite_ingress_replication ==
+               default_multisite_ingress_replication
+          config_set('vxlan_vtep_vni', 'multisite_ingress_replication',
+                     @set_args)
+        end
+      else
+        config_set('vxlan_vtep_vni', 'multisite_ingress_replication', @set_args)
+      end
     end
 
     def default_multisite_ingress_replication
diff --git a/tests/test_bgp_neighbor_af.rb b/tests/test_bgp_neighbor_af.rb
index fcd27b72..3c4ef610 100644
--- a/tests/test_bgp_neighbor_af.rb
+++ b/tests/test_bgp_neighbor_af.rb
@@ -752,30 +752,30 @@ def weight(af, dbg)
                  "Test 3. #{dbg} Failed to remove weight")
   end
 
-  def test_rewrite_rt_asn
+  def test_rewrite_evpn_rt_asn
     skip("#{node.product_id} doesn't support this feature") unless
       node.product_id[/N9K.*EX/]
     af_args = @@matrix[:evpn]
     # clean_af needs true since rewrite_rt_asn is ebgp only
     af, dbg = clean_af(af_args, true)
-    rewrite_rt_asn(af, dbg)
+    rewrite_evpn_rt_asn(af, dbg)
   end
 
-  def rewrite_rt_asn(af, dbg)
+  def rewrite_evpn_rt_asn(af, dbg)
     # eBGP only
-    af.rewrite_rt_asn = true
-    assert(af.rewrite_rt_asn,
+    af.rewrite_evpn_rt_asn = true
+    assert(af.rewrite_evpn_rt_asn,
            "Test 1. #{dbg} Did not set true")
 
-    af.rewrite_rt_asn = false
-    refute(af.rewrite_rt_asn,
+    af.rewrite_evpn_rt_asn = false
+    refute(af.rewrite_evpn_rt_asn,
            "Test 2. #{dbg} Did not set false")
 
-    af.rewrite_rt_asn = true
+    af.rewrite_evpn_rt_asn = true
 
-    def_val = af.default_rewrite_rt_asn
-    af.rewrite_rt_asn = def_val
-    assert_equal(def_val, af.rewrite_rt_asn,
+    def_val = af.default_rewrite_evpn_rt_asn
+    af.rewrite_evpn_rt_asn = def_val
+    assert_equal(def_val, af.rewrite_evpn_rt_asn,
                  "Test 3. #{dbg} Did not set to default")
   end
 end
diff --git a/tests/test_evpn_multisite.rb b/tests/test_evpn_multisite.rb
index a6f88890..a2ca5bdd 100644
--- a/tests/test_evpn_multisite.rb
+++ b/tests/test_evpn_multisite.rb
@@ -34,11 +34,11 @@ def setup
 
   def test_create_and_destroy
     ms = EvpnMultisite.new(100)
-    ms_id = EvpnMultisite.multisite
+    ms_id = ms.multisite
     assert_equal('100', ms_id,
                  'Error: failed to create multisite border-gateway 100')
     ms.destroy
-    ms_id = EvpnMultisite.multisite
+    ms_id = ms.multisite
     assert_nil(ms_id, 'Error: failed to destroy multisite border-gateway 100')
   end
 
@@ -56,12 +56,12 @@ def test_delay_restore
   def test_update_multisiteid
     ms = EvpnMultisite.new(100)
     ms.delay_restore = 50
-    assert_equal('100', EvpnMultisite.multisite,
+    assert_equal('100', ms.multisite,
                  'Error: failed to create multisite border-gateway 100')
     assert_equal('50', ms.delay_restore,
                  'multisite border-gateway delay_restore should be 50')
     ms.multisite = 200
-    assert_equal('200', EvpnMultisite.multisite,
+    assert_equal('200', ms.multisite,
                  'Error: failed to create multisite border-gateway 200')
     assert_equal('50', ms.delay_restore,
                  'multisite border-gateway delay_restore should be 50')
diff --git a/tests/test_evpn_stormcontrol.rb b/tests/test_evpn_stormcontrol.rb
index 52e28595..9c39fb18 100644
--- a/tests/test_evpn_stormcontrol.rb
+++ b/tests/test_evpn_stormcontrol.rb
@@ -35,21 +35,21 @@ def setup
 
   def test_create_and_destroy
     sc = EvpnStormcontrol.new('broadcast', 50)
-    sc_level = EvpnStormcontrol.broadcast
+    sc_level = sc.level
     assert_equal('50', sc_level,
                  'Error: failed to configure evpn storm-control broadcast ' \
                  'level 50')
     sc.destroy
-    sc_level = EvpnStormcontrol.broadcast
+    sc_level = sc.level
     assert_nil(sc_level, 'Error: failed to destroy storm-control config')
   end
 
   def test_update_level
     sc = EvpnStormcontrol.new('multicast', 50)
-    assert_equal('50', EvpnStormcontrol.multicast,
+    assert_equal('50', sc.level,
                  'Error: multicast storm-control level should be 50')
     sc.level = 51
-    assert_equal('51', EvpnStormcontrol.multicast,
+    assert_equal('51', sc.level,
                  'Error: failed to create multisite border-gateway 200')
     sc.destroy
   end
diff --git a/tests/test_vxlan_vtep.rb b/tests/test_vxlan_vtep.rb
index e1f6e116..a46a2757 100755
--- a/tests/test_vxlan_vtep.rb
+++ b/tests/test_vxlan_vtep.rb
@@ -191,17 +191,17 @@ def test_multisite_bg_interface
     # Set multisite_bg_interface to non-default value
     val = 'loopback55'
     ms = EvpnMultisite.new(100)
-    vtep.multisite_bg_interface = val
-    assert_equal(val, vtep.multisite_bg_interface)
+    vtep.multisite_border_gateway_interface = val
+    assert_equal(val, vtep.multisite_border_gateway_interface)
 
-    vtep.multisite_bg_interface = vtep.default_multisite_bg_interface
-    assert_equal(vtep.default_multisite_bg_interface,
-                 vtep.multisite_bg_interface)
+    vtep.multisite_border_gateway_interface = vtep.default_multisite_border_gateway_interface
+    assert_equal(vtep.default_multisite_border_gateway_interface,
+                 vtep.multisite_border_gateway_interface)
 
     # Should Error when no 'evpn multisite border-gateway' set
     ms.destroy
     assert_raises(Cisco::CliError) do
-      vtep.multisite_bg_interface = val
+      vtep.multisite_border_gateway_interface = val
     end
   end
 

From 3b254e740769b700e15000196be5dd19065b2c75 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Fri, 26 Jan 2018 15:28:11 -0500
Subject: [PATCH 13/34] Fix legacy tacacs global failure (#574)

---
 tests/ciscotest.rb          | 14 ++++++++++++++
 tests/test_tacacs_global.rb | 17 ++++++++++-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/tests/ciscotest.rb b/tests/ciscotest.rb
index 56b2f3c8..ea3388b2 100644
--- a/tests/ciscotest.rb
+++ b/tests/ciscotest.rb
@@ -226,6 +226,20 @@ def skip_legacy_defect?(pattern, msg)
     skip(msg) if Utils.image_version?(Regexp.new(pattern))
   end
 
+  def step_unless_legacy_defect(pattern, msg)
+    if pattern.is_a?(String)
+      pattern = [pattern]
+    elsif !pattern.is_a?(Array)
+      fail 'Argument: pattern must be a String or Array object'
+    end
+    pattern.each do |pat|
+      if Utils.image_version?(Regexp.new(pat))
+        puts "Skip Step: Defect in legacy image: [#{msg}]"
+        return false
+      end
+    end
+  end
+
   def virtual_platform?
     node.product_id[/N9K-NXOSV|N9K-9000v/] ? true : false
   end
diff --git a/tests/test_tacacs_global.rb b/tests/test_tacacs_global.rb
index 429f42a2..a232e7d5 100644
--- a/tests/test_tacacs_global.rb
+++ b/tests/test_tacacs_global.rb
@@ -77,13 +77,16 @@ def test_tacacs_global
     assert_equal(7, global.key_format)
     assert_equal('"WAWY_NZB"', global.key)
 
-    # second key change - modify key to type6
-    key_format = 6
-    # Must use a valid type6 password: CSCvb36266
-    key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
-    global.encryption_key_set(key_format, key)
-    assert_equal(key_format, global.key_format)
-    assert_equal("\"#{key}\"", global.key)
+    skip_versions = ['7.0.3.(I2|I3)', '7.0.3.I4.[1-7]']
+    if step_unless_legacy_defect(skip_versions, 'CSCvh72911: Cannot configure tacacs-server key 6')
+      # second key change - modify key to type6
+      key_format = 6
+      # Must use a valid type6 password: CSCvb36266
+      key = 'JDYkqyIFWeBvzpljSfWmRZrmRSRE8'
+      global.encryption_key_set(key_format, key)
+      assert_equal(key_format, global.key_format)
+      assert_equal("\"#{key}\"", global.key)
+    end
 
     # Remove global key
     global.encryption_key_set('', '')

From d5a83151f7e0cd9d559f635183abee1bef454455 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Thu, 1 Feb 2018 08:14:52 -0500
Subject: [PATCH 14/34] TRM - Evpn multicast (#575)

* adding new module evpn_multicast and modify vrf_af for mvpn

* add tests for vrf_af route_target mvpn

* add documentation

* add teardown method for test_evpn_multicast

* add ip_multicast for TRM
---
 CHANGELOG.md                                  | 14 ++++
 .../cmd_ref/evpn_multicast.yaml               | 12 +++
 lib/cisco_node_utils/cmd_ref/feature.yaml     |  6 ++
 .../cmd_ref/ip_multicast.yaml                 | 18 +++++
 lib/cisco_node_utils/cmd_ref/vrf_af.yaml      | 21 ++++++
 lib/cisco_node_utils/evpn_multicast.rb        | 61 +++++++++++++++
 lib/cisco_node_utils/feature.rb               | 19 +++++
 lib/cisco_node_utils/ip_multicast.rb          | 75 +++++++++++++++++++
 lib/cisco_node_utils/vrf_af.rb                | 59 ++++++++++++++-
 tests/test_evpn_multicast.rb                  | 64 ++++++++++++++++
 tests/test_ip_multicast.rb                    | 68 +++++++++++++++++
 tests/test_vrf_af.rb                          | 36 +++++++++
 12 files changed, 449 insertions(+), 4 deletions(-)
 create mode 100644 lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml
 create mode 100644 lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
 create mode 100644 lib/cisco_node_utils/evpn_multicast.rb
 create mode 100644 lib/cisco_node_utils/ip_multicast.rb
 create mode 100644 tests/test_evpn_multicast.rb
 create mode 100644 tests/test_ip_multicast.rb

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04d67b32..b038a5e3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,10 @@ Changelog
   * evpn_stormcontrol (@rahushen)
   * interface_evpn_multisite (@rahushen)
 
+* TRM
+  * evpn_multicast (@rahushen)
+  * ip_multicast (@rahushen)
+
 ### Added
 * Extend vxlan_vtep with attributes:
    * `multisite_border_gateway_interface`
@@ -22,6 +26,16 @@ Changelog
 * Extend bgp_neighbor_af with attributes:
    * `rewrite_evpn_rt_asn`
 
+* Extend vrf_af with attributes:
+   * `route_target_both_auto_mvpn`
+   * `route_target_export_mvpn`
+   * `route_target_import_mvpn`
+
+* Extend feature with attributes:
+  * `ngmvpn_enable`
+  * `ngmvpn_disable`
+  * `ngmvpn_enabled?`
+
 ### Changed
 
 ### Removed
diff --git a/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml b/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml
new file mode 100644
index 00000000..cff05cc9
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/evpn_multicast.yaml
@@ -0,0 +1,12 @@
+# evpn_multicast.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section advertise"
+
+multicast:
+  context: ~
+  get_value: '^advertise evpn multicast$'
+  set_value: "<state> advertise evpn multicast"
+  default_value: ''
diff --git a/lib/cisco_node_utils/cmd_ref/feature.yaml b/lib/cisco_node_utils/cmd_ref/feature.yaml
index 81b869a7..d72e7f62 100644
--- a/lib/cisco_node_utils/cmd_ref/feature.yaml
+++ b/lib/cisco_node_utils/cmd_ref/feature.yaml
@@ -52,6 +52,12 @@ lacp:
   get_value: '/^feature lacp$/'
   set_value: "feature lacp"
 
+ngmvpn:
+  _exclude: [N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^feature ngmvpn$/'
+  set_value: "feature ngmvpn"
+
 nv_overlay:
   # N3k - native vxlan support in a future release
   _exclude: [N3k]
diff --git a/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
new file mode 100644
index 00000000..947f028e
--- /dev/null
+++ b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
@@ -0,0 +1,18 @@
+# ip_multicast.yaml
+---
+_exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+
+_template:
+  get_command: "show running-config | section 'ip multicast'"
+
+overlay_distributed_dr:
+  context: ~
+  get_value: '^ip multicast overlay-distributed-dr$'
+  set_value: "<state> ip multicast overlay-distributed-dr"
+  default_value: ''
+
+overlay_spt_only:
+  context: ~
+  get_value: '^ip multicast overlay-spt-only$'
+  set_value: "<state> ip multicast overlay-spt-only"
+  default_value: ''
diff --git a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
index 1d7ca892..a6efee6b 100644
--- a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
@@ -52,6 +52,13 @@ route_target_both_auto_evpn:
   set_value: '<state> route-target both auto evpn'
   default_value: false
 
+route_target_both_auto_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  kind: boolean
+  get_value: '/^route-target both auto mvpn$/'
+  set_value: '<state> route-target both auto mvpn'
+  default_value: false
+
 route_target_export:
   multiple: true
   default_value: []
@@ -73,6 +80,13 @@ route_target_export_evpn:
   set_value: '<state> route-target export <community> evpn'
   default_value: []
 
+route_target_export_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  multiple: true
+  get_value: '/^route-target export (\S+) evpn$/'
+  set_value: '<state> route-target export <community> mvpn'
+  default_value: []
+
 route_target_export_stitching:
   _exclude: [nexus]
   multiple: true
@@ -105,6 +119,13 @@ route_target_import_evpn:
   set_value: '<state> route-target import <community> evpn'
   default_value: []
 
+route_target_import_mvpn:
+  _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  multiple: true
+  get_value: '/^route-target import (\S+) mvpn$/'
+  set_value: '<state> route-target import <community> mvpn'
+  default_value: []
+
 route_target_import_stitching:
   _exclude: [nexus]
   multiple: true
diff --git a/lib/cisco_node_utils/evpn_multicast.rb b/lib/cisco_node_utils/evpn_multicast.rb
new file mode 100644
index 00000000..bc7f5d42
--- /dev/null
+++ b/lib/cisco_node_utils/evpn_multicast.rb
@@ -0,0 +1,61 @@
+# January 2018, Rahul Shenoy
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class EvpnMulticast < NodeUtil
+    def initialize
+      @get_args = @set_args = {}
+      create
+    end
+
+    def create
+      return unless multicast == default_multicast
+      Feature.ngmvpn_enable
+      @set_args[:state] = ''
+      config_set('evpn_multicast', 'multicast', @set_args)
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_set('evpn_multicast', 'multicast', @set_args)
+    end
+
+    def multicast
+      config_get('evpn_multicast', 'multicast')
+    end
+
+    def multicast=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless multicast == default_multicast
+          config_set('evpn_multicast', 'multicast', @set_args)
+        end
+      else
+        config_set('evpn_multicast', 'multicast', @set_args)
+      end
+    end
+
+    def default_multicast
+      config_get_default('evpn_multicast', 'multicast')
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/feature.rb b/lib/cisco_node_utils/feature.rb
index 09976722..72d5d4ee 100644
--- a/lib/cisco_node_utils/feature.rb
+++ b/lib/cisco_node_utils/feature.rb
@@ -160,6 +160,25 @@ def self.lacp_enabled?
       return false
     end
 
+    # ---------------------------
+    def self.ngmvpn_enable
+      return if ngmvpn_enabled?
+      config_set('feature', 'ngmvpn')
+    end
+
+    def self.ngmvpn_enabled?
+      config_get('feature', 'ngmvpn')
+    rescue Cisco::CliError => e
+      # cmd will syntax reject when feature is not enabled.
+      raise unless e.clierror =~ /Syntax error/
+      return false
+    end
+
+    def self.ngmvpn_disable
+      return unless ngmvpn_enabled?
+      config_set('feature', 'ngmvpn', state: 'no')
+    end
+
     # ---------------------------
     def self.nv_overlay_enable
       # Note: vdc platforms restrict this feature to F3 or newer linecards
diff --git a/lib/cisco_node_utils/ip_multicast.rb b/lib/cisco_node_utils/ip_multicast.rb
new file mode 100644
index 00000000..1f6eae9d
--- /dev/null
+++ b/lib/cisco_node_utils/ip_multicast.rb
@@ -0,0 +1,75 @@
+# January 2018, Rahul Shenoy
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# 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'
+
+module Cisco
+  # node_utils class for evpn_multisite
+  class IpMulticast < NodeUtil
+    def initialize
+      @get_args = @set_args = {}
+      Feature.ngmvpn_enable
+    end
+
+    def destroy
+      @set_args[:state] = 'no'
+      config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+      config_set('ip_multicast', 'overlay_spt_only', @set_args)
+    end
+
+    def overlay_distributed_dr
+      config_get('ip_multicast', 'overlay_distributed_dr')
+    end
+
+    def overlay_distributed_dr=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless overlay_distributed_dr == default_overlay_distributed_dr
+          config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+        end
+      else
+        config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
+      end
+    end
+
+    def default_overlay_distributed_dr
+      config_get_default('ip_multicast', 'overlay_distributed_dr')
+    end
+
+    def overlay_spt_only
+      config_get('ip_multicast', 'overlay_spt_only')
+    end
+
+    def overlay_spt_only=(bool)
+      fail TypeError unless [true, false].include?(bool)
+      @set_args[:state] = bool ? '' : 'no'
+      if @set_args[:state] == 'no'
+        unless overlay_spt_only == default_overlay_spt_only
+          config_set('ip_multicast', 'overlay_spt_only', @set_args)
+        end
+      else
+        config_set('ip_multicast', 'overlay_spt_only', @set_args)
+      end
+    end
+
+    def default_overlay_spt_only
+      config_get_default('ip_multicast', 'overlay_spt_only')
+    end
+  end
+end
diff --git a/lib/cisco_node_utils/vrf_af.rb b/lib/cisco_node_utils/vrf_af.rb
index 2a46d4c9..6396489d 100644
--- a/lib/cisco_node_utils/vrf_af.rb
+++ b/lib/cisco_node_utils/vrf_af.rb
@@ -75,16 +75,20 @@ def set_args_keys(hash={}) # rubocop:disable Style/AccessorMethodName
       @set_args = @get_args.merge!(hash) unless hash.empty?
     end
 
-    def route_target_feature_enable(require_nv_overlay=nil)
+    def route_target_feature_enable(require_nv_overlay=nil, require_ngmvpn=nil)
       return unless platform == :nexus
 
       # All NX route-target properties require feature bgp
       Feature.bgp_enable
 
       # Some platforms/versions also require nv overlay for some properties
-      return unless require_nv_overlay
-      Feature.nv_overlay_enable if Feature.nv_overlay_supported?
-      Feature.nv_overlay_evpn_enable if Feature.nv_overlay_evpn_supported?
+      if require_nv_overlay
+        Feature.nv_overlay_enable if Feature.nv_overlay_supported?
+        Feature.nv_overlay_evpn_enable if Feature.nv_overlay_evpn_supported?
+      end
+
+      # ngmvpn feature is required for 'mvpn' enablement
+      Feature.ngmvpn_enable if require_ngmvpn
     end
 
     ########################################################
@@ -163,6 +167,21 @@ def default_route_target_both_auto_evpn
       config_get_default('vrf_af', 'route_target_both_auto_evpn')
     end
 
+    # --------------------------
+    def route_target_both_auto_mvpn
+      config_get('vrf_af', 'route_target_both_auto_mvpn', @get_args)
+    end
+
+    def route_target_both_auto_mvpn=(state)
+      route_target_feature_enable(:require_ngmvpn)
+      set_args_keys(state: (state ? '' : 'no'))
+      config_set('vrf_af', 'route_target_both_auto_mvpn', @set_args)
+    end
+
+    def default_route_target_both_auto_mvpn
+      config_get_default('vrf_af', 'route_target_both_auto_mvpn')
+    end
+
     # --------------------------
     def route_target_export
       cmds = config_get('vrf_af', 'route_target_export', @get_args)
@@ -194,6 +213,22 @@ def default_route_target_export_evpn
       config_get_default('vrf_af', 'route_target_export_evpn')
     end
 
+    # --------------------------
+    def route_target_export_mvpn
+      cmds = config_get('vrf_af', 'route_target_export_mvpn', @get_args)
+      cmds.nil? ? nil : cmds.sort
+    end
+
+    def route_target_export_mvpn=(should)
+      route_target_feature_enable(:require_ngmvpn)
+      route_target_delta(should, route_target_export_mvpn,
+                         'route_target_export_mvpn')
+    end
+
+    def default_route_target_export_mvpn
+      config_get_default('vrf_af', 'route_target_export_mvpn')
+    end
+
     # --------------------------
     def route_target_export_stitching
       cmds = config_get('vrf_af', 'route_target_export_stitching', @get_args)
@@ -240,6 +275,22 @@ def default_route_target_import_evpn
       config_get_default('vrf_af', 'route_target_import_evpn')
     end
 
+    # --------------------------
+    def route_target_import_mvpn
+      route_target_feature_enable(:require_ngmvpn)
+      cmds = config_get('vrf_af', 'route_target_import_mvpn', @get_args)
+      cmds.nil? ? nil : cmds.sort
+    end
+
+    def route_target_import_mvpn=(should)
+      route_target_delta(should, route_target_import_mvpn,
+                         'route_target_import_mvpn')
+    end
+
+    def default_route_target_import_mvpn
+      config_get_default('vrf_af', 'route_target_import_mvpn')
+    end
+
     # --------------------------
     def route_target_import_stitching
       cmds = config_get('vrf_af', 'route_target_import_stitching', @get_args)
diff --git a/tests/test_evpn_multicast.rb b/tests/test_evpn_multicast.rb
new file mode 100644
index 00000000..c16a3b32
--- /dev/null
+++ b/tests/test_evpn_multicast.rb
@@ -0,0 +1,64 @@
+# Evpn Multicast Unit Tests
+#
+# Rahul Shenoy, January, 2018
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/evpn_multicast'
+require_relative '../lib/cisco_node_utils/feature'
+
+# TestEvpnMulticast - Minitest for EvpnMulticast class
+class TestEvpnMulticast < CiscoTestCase
+  @skip_unless_supported = 'evpn_multicast'
+
+  def setup
+    # Disable feature ngmvpn before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    config('no feature ngmvpn')
+    config('no advertise evpn multicast')
+  end
+
+  def teardown
+    # disable feature ngmvpn and advertise evpn multicast
+    # after each test
+    config('no feature ngmvpn')
+    config('no advertise evpn multicast')
+    super
+  end
+
+  def test_create_and_destroy
+    mc = EvpnMulticast.new
+    assert_equal('advertise evpn multicast', mc.multicast,
+                 'Error: failed to enable evpn multicast')
+    assert(Feature.ngmvpn_enabled?,
+           'Error: failed to enable feature ngmvpn')
+    mc.destroy
+    assert_equal('', mc.multicast,
+                 'Error: failed to disable evpn multicast')
+  end
+
+  def test_multicast
+    mc = EvpnMulticast.new
+    mc.multicast = false
+    assert_equal('', mc.multicast,
+                 'Error: failed to disable evpn multicast')
+    mc.multicast = true
+    assert_equal('advertise evpn multicast', mc.multicast,
+                 'Error: failed to enable evpn multicast')
+    mc.destroy
+  end
+end
diff --git a/tests/test_ip_multicast.rb b/tests/test_ip_multicast.rb
new file mode 100644
index 00000000..61baaab7
--- /dev/null
+++ b/tests/test_ip_multicast.rb
@@ -0,0 +1,68 @@
+# IP Multicast Unit Tests
+#
+# Rahul Shenoy, January, 2018
+#
+# Copyright (c) 2018 Cisco and/or its affiliates.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+require_relative 'ciscotest'
+require_relative '../lib/cisco_node_utils/ip_multicast'
+require_relative '../lib/cisco_node_utils/feature'
+
+# TestIpMulticast - Minitest for IpMulticast class
+class TestIpMulticast < CiscoTestCase
+  @skip_unless_supported = 'ip_multicast'
+
+  def setup
+    # Disable feature ngmvpn before each test to
+    # ensure we are starting with a clean slate for each test.
+    super
+    config('no feature ngmvpn')
+  end
+
+  def teardown
+    # Disable feature ngmvpn after each test
+    config('no feature ngmvpn')
+    super
+  end
+
+  def test_ip_multicast
+    ipm = IpMulticast.new
+    opts = %w(overlay_distributed_dr overlay_spt_only)
+
+    # test defaults
+    opts.each do |opt|
+      have = ipm.send("#{opt}")
+      should = ipm.send("default_#{opt}")
+      assert_equal(have, should, "#{opt} doesn't match the default")
+    end
+
+    # test property set
+    opts.each do |opt|
+      ipm.send("#{opt}=", true)
+      should = 'ip multicast ' + opt.tr('_', '-')
+      assert_equal(ipm.send("#{opt}"), should, "#{opt} was not set")
+    end
+
+    # unset property
+    opts.each do |opt|
+      ipm.send("#{opt}=", false)
+      should = ''
+      assert_equal(ipm.send("#{opt}"), should, "#{opt} was not unset")
+      assert_equal(ipm.send("#{opt}"), ipm.send("default_#{opt}"), "#{opt} doesn't match default")
+    end
+
+    ipm.destroy
+  end
+end
diff --git a/tests/test_vrf_af.rb b/tests/test_vrf_af.rb
index 4a8f1b31..c4ca9830 100755
--- a/tests/test_vrf_af.rb
+++ b/tests/test_vrf_af.rb
@@ -120,10 +120,13 @@ def route_target(af)
     # Common tester for route-target properties. Tests evpn and non-evpn.
     #   route_target_both_auto
     #   route_target_both_auto_evpn
+    #   route_target_both_auto_mvpn
     #   route_target_export
     #   route_target_export_evpn
+    #   route_target_export_mvpn
     #   route_target_import
     #   route_target_import_evpn
+    #   route_target_import_mvpn
     vrf = 'orange'
     v = VrfAF.new(vrf, af)
 
@@ -134,6 +137,9 @@ def route_target(af)
     refute(v.default_route_target_both_auto_evpn,
            'default value for route target both auto evpn should be false')
 
+    refute(v.default_route_target_both_auto_mvpn,
+           'default value for route target both auto mvpn should be false')
+
     if validate_property_excluded?('vrf_af', 'route_target_both_auto')
       assert_raises(Cisco::UnsupportedError) { v.route_target_both_auto = true }
     else
@@ -160,6 +166,20 @@ def route_target(af)
              'v route-target both auto evpn should be disabled')
     end
 
+    if validate_property_excluded?('vrf_af', 'route_target_both_auto_mvpn')
+      assert_raises(Cisco::UnsupportedError) do
+        v.route_target_both_auto_mvpn = true
+      end
+    else
+      v.route_target_both_auto_mvpn = true
+      assert(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+             'v route-target both auto mvpn should be enabled')
+
+      v.route_target_both_auto_mvpn = false
+      refute(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+             'v route-target both auto mvpn should be disabled')
+    end
+
     opts = [:import, :export]
 
     # Master list of communities to test against
@@ -197,6 +217,14 @@ def route_target_tester(v, af, opts, should, test_id)
       else
         v.send("route_target_#{opt}_evpn=", should)
       end
+      # mvpn
+      if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+        assert_raises(Cisco::UnsupportedError, "route_target_#{opt}_mvpn=") do
+          v.send("route_target_#{opt}_mvpn=", should)
+        end
+      else
+        v.send("route_target_#{opt}_mvpn=", should)
+      end
       # stitching
       if platform == :nexus
         assert_raises(Cisco::UnsupportedError,
@@ -222,6 +250,14 @@ def route_target_tester(v, af, opts, should, test_id)
         assert_equal(should, result,
                      "#{test_id} : #{af} : route_target_#{opt}_evpn")
       end
+      # mvpn
+      result = v.send("route_target_#{opt}_mvpn")
+      if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+        assert_nil(result)
+      else
+        assert_equal(should, result,
+                     "#{test_id} : #{af} : route_target_#{opt}_mvpn")
+      end
       # stitching
       result = v.send("route_target_#{opt}_stitching")
       if platform == :nexus

From e3e3c635de97564c4ab284b1576668f175c4ac45 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Tue, 6 Feb 2018 16:07:14 -0500
Subject: [PATCH 15/34] Resolve few issues with evpn_multicast NU
 implementation (#576)

* adding new module evpn_multicast and modify vrf_af for mvpn

* add tests for vrf_af route_target mvpn

* add documentation

* add teardown method for test_evpn_multicast

* add ip_multicast for TRM

* add class method for use in provider

* resolve issue while grabbing mvpn community info
---
 lib/cisco_node_utils/cmd_ref/vrf_af.yaml | 2 +-
 lib/cisco_node_utils/evpn_multicast.rb   | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
index a6efee6b..87ed344c 100644
--- a/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
+++ b/lib/cisco_node_utils/cmd_ref/vrf_af.yaml
@@ -83,7 +83,7 @@ route_target_export_evpn:
 route_target_export_mvpn:
   _exclude: [ios_xr, N3k, N3k-F, N5k, N6k, N7k, N9k-F]
   multiple: true
-  get_value: '/^route-target export (\S+) evpn$/'
+  get_value: '/^route-target export (\S+) mvpn$/'
   set_value: '<state> route-target export <community> mvpn'
   default_value: []
 
diff --git a/lib/cisco_node_utils/evpn_multicast.rb b/lib/cisco_node_utils/evpn_multicast.rb
index bc7f5d42..35a91627 100644
--- a/lib/cisco_node_utils/evpn_multicast.rb
+++ b/lib/cisco_node_utils/evpn_multicast.rb
@@ -38,6 +38,10 @@ def destroy
       config_set('evpn_multicast', 'multicast', @set_args)
     end
 
+    def self.multicast
+      config_get('evpn_multicast', 'multicast')
+    end
+
     def multicast
       config_get('evpn_multicast', 'multicast')
     end

From b62d38946b0489bf639349d04a0ebfc0627a8162 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Wed, 14 Feb 2018 15:30:57 -0500
Subject: [PATCH 16/34] Add cupertino 8.3 release support

---
 tests/test_bgp_af.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_bgp_af.rb b/tests/test_bgp_af.rb
index 162809a8..120167cc 100644
--- a/tests/test_bgp_af.rb
+++ b/tests/test_bgp_af.rb
@@ -170,7 +170,7 @@ def check_test_exceptions(test_, os_, vrf_, af_)
       # triggers a version check below.
       if expect == :runtime
         case Platform.image_version
-        when /8.0|8.1|8.2|F3.2/
+        when /8.0|8.1|8.2|8.3|F3.2/
           expect = :success
           expect = :runtime if test == :additional_paths_receive && Platform.image_version[/8.0|8.1/]
         when /I5.2|I5.3|I6/

From 2af001cbd6a37b62f84a1e4b51cad5703f7e5b02 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Wed, 14 Feb 2018 15:35:20 -0500
Subject: [PATCH 17/34] TRM : Ip multicast redesign to handle default case 
 (#577)

* adding new module evpn_multicast and modify vrf_af for mvpn

* add tests for vrf_af route_target mvpn

* add documentation

* add teardown method for test_evpn_multicast

* add ip_multicast for TRM

* add class method for use in provider

* resolve issue while grabbing mvpn community info

* modify return for property functions

* change default value from empty string to false

* redesign ip_multicast NU to track feature ngmvpn

* control feature ngmvpn with <state>

* apply state to feature ngmvpn enable as well

* modify tests according to redesign
---
 lib/cisco_node_utils/cmd_ref/feature.yaml      | 2 +-
 lib/cisco_node_utils/cmd_ref/ip_multicast.yaml | 4 ++--
 lib/cisco_node_utils/feature.rb                | 2 +-
 lib/cisco_node_utils/ip_multicast.rb           | 9 +++++++--
 tests/test_ip_multicast.rb                     | 2 +-
 5 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/lib/cisco_node_utils/cmd_ref/feature.yaml b/lib/cisco_node_utils/cmd_ref/feature.yaml
index d72e7f62..5dc3cb84 100644
--- a/lib/cisco_node_utils/cmd_ref/feature.yaml
+++ b/lib/cisco_node_utils/cmd_ref/feature.yaml
@@ -56,7 +56,7 @@ ngmvpn:
   _exclude: [N3k, N3k-F, N5k, N6k, N7k, N9k-F]
   kind: boolean
   get_value: '/^feature ngmvpn$/'
-  set_value: "feature ngmvpn"
+  set_value: "<state> feature ngmvpn"
 
 nv_overlay:
   # N3k - native vxlan support in a future release
diff --git a/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
index 947f028e..bfd0e330 100644
--- a/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
+++ b/lib/cisco_node_utils/cmd_ref/ip_multicast.yaml
@@ -9,10 +9,10 @@ overlay_distributed_dr:
   context: ~
   get_value: '^ip multicast overlay-distributed-dr$'
   set_value: "<state> ip multicast overlay-distributed-dr"
-  default_value: ''
+  default_value: false
 
 overlay_spt_only:
   context: ~
   get_value: '^ip multicast overlay-spt-only$'
   set_value: "<state> ip multicast overlay-spt-only"
-  default_value: ''
+  default_value: false
diff --git a/lib/cisco_node_utils/feature.rb b/lib/cisco_node_utils/feature.rb
index 72d5d4ee..575b90af 100644
--- a/lib/cisco_node_utils/feature.rb
+++ b/lib/cisco_node_utils/feature.rb
@@ -163,7 +163,7 @@ def self.lacp_enabled?
     # ---------------------------
     def self.ngmvpn_enable
       return if ngmvpn_enabled?
-      config_set('feature', 'ngmvpn')
+      config_set('feature', 'ngmvpn', state: '')
     end
 
     def self.ngmvpn_enabled?
diff --git a/lib/cisco_node_utils/ip_multicast.rb b/lib/cisco_node_utils/ip_multicast.rb
index 1f6eae9d..e42cfa5c 100644
--- a/lib/cisco_node_utils/ip_multicast.rb
+++ b/lib/cisco_node_utils/ip_multicast.rb
@@ -21,15 +21,20 @@
 module Cisco
   # node_utils class for evpn_multisite
   class IpMulticast < NodeUtil
-    def initialize
+    def initialize(instantiate=true)
       @get_args = @set_args = {}
-      Feature.ngmvpn_enable
+      Feature.ngmvpn_enable if instantiate
     end
 
     def destroy
       @set_args[:state] = 'no'
       config_set('ip_multicast', 'overlay_distributed_dr', @set_args)
       config_set('ip_multicast', 'overlay_spt_only', @set_args)
+      Feature.ngmvpn_disable
+    end
+
+    def ip_multicast
+      Feature.ngmvpn_enabled?
     end
 
     def overlay_distributed_dr
diff --git a/tests/test_ip_multicast.rb b/tests/test_ip_multicast.rb
index 61baaab7..9520ff78 100644
--- a/tests/test_ip_multicast.rb
+++ b/tests/test_ip_multicast.rb
@@ -58,7 +58,7 @@ def test_ip_multicast
     # unset property
     opts.each do |opt|
       ipm.send("#{opt}=", false)
-      should = ''
+      should = false
       assert_equal(ipm.send("#{opt}"), should, "#{opt} was not unset")
       assert_equal(ipm.send("#{opt}"), ipm.send("default_#{opt}"), "#{opt} doesn't match default")
     end

From 167ded30e7fb1b1c55c4295be271d3dc6d9d10b7 Mon Sep 17 00:00:00 2001
From: rahushen <rahul.shenoy.86@gmail.com>
Date: Thu, 15 Feb 2018 13:24:27 -0500
Subject: [PATCH 18/34] TRM: IP multicast (#578)

* adding new module evpn_multicast and modify vrf_af for mvpn

* add tests for vrf_af route_target mvpn

* add documentation

* add teardown method for test_evpn_multicast

* add ip_multicast for TRM

* add class method for use in provider

* resolve issue while grabbing mvpn community info

* modify return for property functions

* change default value from empty string to false

* redesign ip_multicast NU to track feature ngmvpn

* control feature ngmvpn with <state>

* apply state to feature ngmvpn enable as well

* modify tests according to redesign

* add feature nv overlay also to enable spt
---
 lib/cisco_node_utils/ip_multicast.rb | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/lib/cisco_node_utils/ip_multicast.rb b/lib/cisco_node_utils/ip_multicast.rb
index e42cfa5c..56e5f8db 100644
--- a/lib/cisco_node_utils/ip_multicast.rb
+++ b/lib/cisco_node_utils/ip_multicast.rb
@@ -23,7 +23,7 @@ module Cisco
   class IpMulticast < NodeUtil
     def initialize(instantiate=true)
       @get_args = @set_args = {}
-      Feature.ngmvpn_enable if instantiate
+      enable_features if instantiate
     end
 
     def destroy
@@ -33,6 +33,12 @@ def destroy
       Feature.ngmvpn_disable
     end
 
+    def enable_features
+      Feature.nv_overlay_enable
+      Feature.nv_overlay_evpn_enable
+      Feature.ngmvpn_enable
+    end
+
     def ip_multicast
       Feature.ngmvpn_enabled?
     end

From f25ac1d7122a74c3bc79ae1fdfc34412fe93ee02 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Thu, 29 Mar 2018 13:38:08 -0400
Subject: [PATCH 19/34] Add v1.9.0 release tag info

---
 CHANGELOG.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b038a5e3..38ce9a64 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,7 @@
 Changelog
 =========
 
-## [Unreleased]
+## [v1.9.0]
 
 ### New Cisco Resources
 * EVPN Multisite
@@ -554,7 +554,7 @@ Changelog
 [git-flow]: https://github.com/petervanderdoes/gitflow-avh
 [SimpleCov]: https://github.com/colszowka/simplecov
 
-[Unreleased]: https://github.com/cisco/cisco-network-node-utils/compare/master...develop
+[v1.9.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.8.0...v1.9.0
 [v1.8.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.7.0...v1.8.0
 [v1.7.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.6.0...v1.7.0
 [v1.6.0]: https://github.com/cisco/cisco-network-node-utils/compare/v1.5.0...v1.6.0

From aa162a3caf3d0303080ca81ad70d83d70c314ae1 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Thu, 29 Mar 2018 13:43:19 -0400
Subject: [PATCH 20/34] Update version to be 1.9.0

---
 lib/cisco_node_utils/version.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cisco_node_utils/version.rb b/lib/cisco_node_utils/version.rb
index 8f606832..5d761ab4 100644
--- a/lib/cisco_node_utils/version.rb
+++ b/lib/cisco_node_utils/version.rb
@@ -1,4 +1,4 @@
-# Copyright (c) 2015-2017 Cisco and/or its affiliates.
+# Copyright (c) 2015-2018 Cisco and/or its affiliates.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
 
 # Container module for version number only.
 module CiscoNodeUtils
-  VERSION = '1.9.0-dev'
+  VERSION = '1.9.0'
   gem_version = Gem::Version.new(Gem::VERSION)
   min_gem_version = Gem::Version.new('2.1.0')
   fail 'Required rubygems version >= 2.1.0' if gem_version < min_gem_version

From 8ed02dbd531fdea043d3d6b64e8552d308f56a41 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Fri, 30 Mar 2018 14:43:19 -0400
Subject: [PATCH 21/34] Added step_unless_legacy_defect call for I7.3

---
 tests/test_router_ospf_vrf.rb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/tests/test_router_ospf_vrf.rb b/tests/test_router_ospf_vrf.rb
index e1d36991..0e5e0862 100644
--- a/tests/test_router_ospf_vrf.rb
+++ b/tests/test_router_ospf_vrf.rb
@@ -300,9 +300,12 @@ def test_default_metric
     assert_equal(metric, vrf.default_metric,
                  "Error: #{vrf.name} vrf, default-metric get value mismatch")
 
-    vrf.default_metric = vrf.default_default_metric
-    refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
-    vrf.parent.destroy
+    skip_versions = ['7.0.3.I7.3']
+    if step_unless_legacy_defect(skip_versions, 'CSCvi74876: Cannot remove default metric')
+      vrf.default_metric = vrf.default_default_metric
+      refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
+      vrf.parent.destroy
+    end
   end
 
   def test_default_metric_multiple_vrf

From 77cf64d2a17bef065800bf3d32bf7d3a437135e0 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Fri, 30 Mar 2018 15:23:33 -0400
Subject: [PATCH 22/34] Add terminal dont-ask for feature-set fex

---
 tests/test_feature.rb | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/test_feature.rb b/tests/test_feature.rb
index a4f8905f..14026b94 100755
--- a/tests/test_feature.rb
+++ b/tests/test_feature.rb
@@ -31,7 +31,6 @@ def teardown
      'no feature bgp',
      'no feature dhcp',
      'no feature fabric forwarding',
-     'no feature-set fex',
      'no feature hsrp',
      'no feature itd',
      'no feature nv overlay',
@@ -42,6 +41,11 @@ def teardown
      'no feature vn-segment-vlan-based',
      'no feature vni',
      'no feature vtp'].each { |f| config_no_warn(f) }
+
+    # Special case for 'no feature-set fex'
+    # Some image versions prompt y/n to remove the feature-set.
+    config_no_warn('terminal dont-ask')
+    config_no_warn('no feature-set fex')
   end
 
   ###########
@@ -226,6 +230,7 @@ def test_feature_set_fex
 
     # clean
     if Feature.fex_installed?
+      config_no_warn('terminal dont-ask')
       config_no_warn("no #{fs}")
       config_no_warn("no install #{fs}")
     end

From c032ae75499c9f15c2d8dc7bdc7a941d7d4ac57d Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Fri, 30 Mar 2018 15:26:32 -0400
Subject: [PATCH 23/34] Fix rubocop error

---
 tests/test_router_ospf_vrf.rb | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/tests/test_router_ospf_vrf.rb b/tests/test_router_ospf_vrf.rb
index 0e5e0862..60c646e4 100644
--- a/tests/test_router_ospf_vrf.rb
+++ b/tests/test_router_ospf_vrf.rb
@@ -301,11 +301,10 @@ def test_default_metric
                  "Error: #{vrf.name} vrf, default-metric get value mismatch")
 
     skip_versions = ['7.0.3.I7.3']
-    if step_unless_legacy_defect(skip_versions, 'CSCvi74876: Cannot remove default metric')
-      vrf.default_metric = vrf.default_default_metric
-      refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
-      vrf.parent.destroy
-    end
+    return unless step_unless_legacy_defect(skip_versions, 'CSCvi74876: Cannot remove default metric')
+    vrf.default_metric = vrf.default_default_metric
+    refute_match_vrf_line(vrf.parent.name, vrf.name, pattern)
+    vrf.parent.destroy
   end
 
   def test_default_metric_multiple_vrf

From 54b0cc77d66e11f61999b9400d1b14e13c19dd3e Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Mon, 9 Apr 2018 15:03:09 -0400
Subject: [PATCH 24/34] Query stp_port_type for removal

---
 lib/cisco_node_utils/interface.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/cisco_node_utils/interface.rb b/lib/cisco_node_utils/interface.rb
index 954d8c2e..6f3a2149 100644
--- a/lib/cisco_node_utils/interface.rb
+++ b/lib/cisco_node_utils/interface.rb
@@ -1228,7 +1228,7 @@ def stp_port_type=(val)
         state = ''
       else
         state = 'no'
-        val = ''
+        val = stp_port_type
       end
       config_set('interface', 'stp_port_type', name: @name,
                  state: state, type: val)

From ae75f867c4f125d62ccce58df3e28af48f55eee2 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Mon, 9 Apr 2018 15:30:56 -0400
Subject: [PATCH 25/34] Add os_version in device under test output

---
 tests/ciscotest.rb | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/tests/ciscotest.rb b/tests/ciscotest.rb
index ea3388b2..761bd755 100644
--- a/tests/ciscotest.rb
+++ b/tests/ciscotest.rb
@@ -83,9 +83,10 @@ def self.node
       @@node.cache_auto = true
       # Record the platform we're running on
       puts "\nNode under test:"
-      puts "  - name  - #{@@node.host_name}"
-      puts "  - type  - #{@@node.product_id}"
-      puts "  - image - #{@@node.system}\n\n"
+      puts "  - name    - #{@@node.host_name}"
+      puts "  - type    - #{@@node.product_id}"
+      puts "  - image   - #{@@node.system}"
+      puts "  - version - #{@@node.os_version}\n\n"
     end
     @@node
   rescue Cisco::AuthenticationFailed

From 5e41887cf126febb1d2bf0626ec9a51360d24319 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Mon, 9 Apr 2018 15:56:57 -0400
Subject: [PATCH 26/34] Add yum test support for I7.2 and I7.3 images

---
 tests/yum_package.yaml | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tests/yum_package.yaml b/tests/yum_package.yaml
index 05aacfe8..1d674469 100644
--- a/tests/yum_package.yaml
+++ b/tests/yum_package.yaml
@@ -68,6 +68,16 @@
   name:     'nxos.sample-n9k_ALL'
   version:  '1.0.0-7.0.3.I7.1'
 
+7_0_3_I7_2_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.2.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.2'
+
+7_0_3_I7_3_:
+  filename: 'nxos.sample-n9k_ALL-1.0.0-7.0.3.I7.3.lib32_n9000.rpm'
+  name:     'nxos.sample-n9k_ALL'
+  version:  '1.0.0-7.0.3.I7.3'
+
 7_0_3_F1_1_:
   filename: 'nxos.sample-n8k_EOR-1.0.0-7.0.3.F1.1.lib32_nxos.rpm'
   name:     'nxos.sample-n8k_EOR'

From a79bfb6d2b7687137f3ebd0c457f9a751a7ed2f1 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Tue, 10 Apr 2018 10:25:01 -0400
Subject: [PATCH 27/34] Fix stp_port_type bug

---
 lib/cisco_node_utils/interface.rb | 1 +
 tests/test_stp_global.rb          | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/lib/cisco_node_utils/interface.rb b/lib/cisco_node_utils/interface.rb
index 6f3a2149..a25d8e1a 100644
--- a/lib/cisco_node_utils/interface.rb
+++ b/lib/cisco_node_utils/interface.rb
@@ -1227,6 +1227,7 @@ def stp_port_type=(val)
       if val
         state = ''
       else
+        return unless stp_port_type
         state = 'no'
         val = stp_port_type
       end
diff --git a/tests/test_stp_global.rb b/tests/test_stp_global.rb
index e09db678..b774fdd6 100644
--- a/tests/test_stp_global.rb
+++ b/tests/test_stp_global.rb
@@ -492,6 +492,13 @@ def test_intf_stp_port_type_change
     @intf.stp_port_type = @intf.default_stp_port_type
     assert_equal(@intf.default_stp_port_type,
                  @intf.stp_port_type)
+    # Set default again and check. This is needed since
+    # we query the stp_port_type to use with the 'no'
+    # form of the command and false is not a valid
+    # stp_port_type
+    @intf.stp_port_type = @intf.default_stp_port_type
+    assert_equal(@intf.default_stp_port_type,
+                 @intf.stp_port_type)
   end
 
   def test_intf_stp_mst_cost_change

From 58a9c03abf35e35c8e6a38bc784af509fb1e6796 Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Tue, 10 Apr 2018 13:43:58 -0400
Subject: [PATCH 28/34] Update README-maintainers.md

---
 docs/README-maintainers.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/README-maintainers.md b/docs/README-maintainers.md
index c47096b5..205c0d17 100644
--- a/docs/README-maintainers.md
+++ b/docs/README-maintainers.md
@@ -25,6 +25,7 @@ When we are considering publishing a new release, all of the following steps mus
 1. Run full minitest regression on [supported platforms.](https://github.com/cisco/cisco-network-node-utils#overview)
     * Fix All Bugs.
     * Make sure proper test case skips are in place for unsupported platforms.
+    * Make sure [yum_package.yaml](../tests/yum_package.yaml) is updated with all versions that need to be tested.
 
 1. Build gem and test it in combination with the latest released Puppet module (using Beaker and demo manifests) to make sure no backward compatibility issues have been introduced.
 

From 42cc28bef62383dcc232f8704e76b178234f5359 Mon Sep 17 00:00:00 2001
From: Rahul Shenoy <rahushen@cisco.com>
Date: Wed, 11 Apr 2018 19:51:26 -0400
Subject: [PATCH 29/34] fix require_ngmvpn

---
 lib/cisco_node_utils/vrf_af.rb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/cisco_node_utils/vrf_af.rb b/lib/cisco_node_utils/vrf_af.rb
index 6396489d..90706d84 100644
--- a/lib/cisco_node_utils/vrf_af.rb
+++ b/lib/cisco_node_utils/vrf_af.rb
@@ -173,7 +173,7 @@ def route_target_both_auto_mvpn
     end
 
     def route_target_both_auto_mvpn=(state)
-      route_target_feature_enable(:require_ngmvpn)
+      route_target_feature_enable(nil, :require_ngmvpn)
       set_args_keys(state: (state ? '' : 'no'))
       config_set('vrf_af', 'route_target_both_auto_mvpn', @set_args)
     end
@@ -220,7 +220,7 @@ def route_target_export_mvpn
     end
 
     def route_target_export_mvpn=(should)
-      route_target_feature_enable(:require_ngmvpn)
+      route_target_feature_enable(nil, :require_ngmvpn)
       route_target_delta(should, route_target_export_mvpn,
                          'route_target_export_mvpn')
     end
@@ -277,7 +277,7 @@ def default_route_target_import_evpn
 
     # --------------------------
     def route_target_import_mvpn
-      route_target_feature_enable(:require_ngmvpn)
+      route_target_feature_enable(nil, :require_ngmvpn)
       cmds = config_get('vrf_af', 'route_target_import_mvpn', @get_args)
       cmds.nil? ? nil : cmds.sort
     end

From a750c566882b9b938d01a7f540e8e8a5f49c1fcd Mon Sep 17 00:00:00 2001
From: Rahul Shenoy <rahushen@cisco.com>
Date: Thu, 12 Apr 2018 10:39:34 -0400
Subject: [PATCH 30/34] enable feature nv overlay before evpn multicast

---
 lib/cisco_node_utils/evpn_multicast.rb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/cisco_node_utils/evpn_multicast.rb b/lib/cisco_node_utils/evpn_multicast.rb
index 35a91627..3ae0421d 100644
--- a/lib/cisco_node_utils/evpn_multicast.rb
+++ b/lib/cisco_node_utils/evpn_multicast.rb
@@ -29,6 +29,7 @@ def initialize
     def create
       return unless multicast == default_multicast
       Feature.ngmvpn_enable
+      config_set('feature', 'nv_overlay', state: '')
       @set_args[:state] = ''
       config_set('evpn_multicast', 'multicast', @set_args)
     end

From 5a2ef8bf1f12f60e5cad718393c2f3e8f2ec044d Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Fri, 13 Apr 2018 12:38:51 -0400
Subject: [PATCH 31/34] Fix unsupported evpn and mvpn issues

---
 lib/cisco_node_utils/cmd_ref/feature.yaml |  1 +
 tests/ciscotest.rb                        | 14 ++++++
 tests/test_evpn_multicast.rb              |  9 ++--
 tests/test_ip_multicast.rb                |  5 +-
 tests/test_vrf_af.rb                      | 61 ++++++++++++++---------
 5 files changed, 61 insertions(+), 29 deletions(-)

diff --git a/lib/cisco_node_utils/cmd_ref/feature.yaml b/lib/cisco_node_utils/cmd_ref/feature.yaml
index 5dc3cb84..bd0fde8a 100644
--- a/lib/cisco_node_utils/cmd_ref/feature.yaml
+++ b/lib/cisco_node_utils/cmd_ref/feature.yaml
@@ -54,6 +54,7 @@ lacp:
 
 ngmvpn:
   _exclude: [N3k, N3k-F, N5k, N6k, N7k, N9k-F]
+  os_version: 'N9k:7.0.3.I7.1'
   kind: boolean
   get_value: '/^feature ngmvpn$/'
   set_value: "<state> feature ngmvpn"
diff --git a/tests/ciscotest.rb b/tests/ciscotest.rb
index 761bd755..a3225f39 100644
--- a/tests/ciscotest.rb
+++ b/tests/ciscotest.rb
@@ -241,6 +241,20 @@ def step_unless_legacy_defect(pattern, msg)
     end
   end
 
+  def step_unless_version_unsupported(pattern)
+    if pattern.is_a?(String)
+      pattern = [pattern]
+    elsif !pattern.is_a?(Array)
+      fail 'Argument: pattern must be a String or Array object'
+    end
+    pattern.each do |pat|
+      if Utils.image_version?(Regexp.new(pat))
+        puts "Skip Step: Feature not supported in this image version: [#{Platform.image_version}]"
+        return false
+      end
+    end
+  end
+
   def virtual_platform?
     node.product_id[/N9K-NXOSV|N9K-9000v/] ? true : false
   end
diff --git a/tests/test_evpn_multicast.rb b/tests/test_evpn_multicast.rb
index c16a3b32..a456a00f 100644
--- a/tests/test_evpn_multicast.rb
+++ b/tests/test_evpn_multicast.rb
@@ -28,15 +28,16 @@ def setup
     # Disable feature ngmvpn before each test to
     # ensure we are starting with a clean slate for each test.
     super
-    config('no feature ngmvpn')
-    config('no advertise evpn multicast')
+    skip_incompat_version?('feature', 'ngmvpn')
+    config_no_warn('no feature ngmvpn')
+    config_no_warn('no advertise evpn multicast')
   end
 
   def teardown
     # disable feature ngmvpn and advertise evpn multicast
     # after each test
-    config('no feature ngmvpn')
-    config('no advertise evpn multicast')
+    config_no_warn('no feature ngmvpn')
+    config_no_warn('no advertise evpn multicast')
     super
   end
 
diff --git a/tests/test_ip_multicast.rb b/tests/test_ip_multicast.rb
index 9520ff78..4d3391b6 100644
--- a/tests/test_ip_multicast.rb
+++ b/tests/test_ip_multicast.rb
@@ -28,12 +28,13 @@ def setup
     # Disable feature ngmvpn before each test to
     # ensure we are starting with a clean slate for each test.
     super
-    config('no feature ngmvpn')
+    skip_incompat_version?('feature', 'ngmvpn')
+    config_no_warn('no feature ngmvpn')
   end
 
   def teardown
     # Disable feature ngmvpn after each test
-    config('no feature ngmvpn')
+    config_no_warn('no feature ngmvpn')
     super
   end
 
diff --git a/tests/test_vrf_af.rb b/tests/test_vrf_af.rb
index c4ca9830..12c22341 100755
--- a/tests/test_vrf_af.rb
+++ b/tests/test_vrf_af.rb
@@ -116,7 +116,7 @@ def test_route_target
     vdc_limit_f3_no_intf_needed(:clear)
   end
 
-  def route_target(af)
+  def route_target(af, _test_mvpn=false)
     # Common tester for route-target properties. Tests evpn and non-evpn.
     #   route_target_both_auto
     #   route_target_both_auto_evpn
@@ -127,6 +127,10 @@ def route_target(af)
     #   route_target_import
     #   route_target_import_evpn
     #   route_target_import_mvpn
+
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     vrf = 'orange'
     v = VrfAF.new(vrf, af)
 
@@ -137,8 +141,10 @@ def route_target(af)
     refute(v.default_route_target_both_auto_evpn,
            'default value for route target both auto evpn should be false')
 
-    refute(v.default_route_target_both_auto_mvpn,
-           'default value for route target both auto mvpn should be false')
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      refute(v.default_route_target_both_auto_mvpn,
+             'default value for route target both auto mvpn should be false')
+    end
 
     if validate_property_excluded?('vrf_af', 'route_target_both_auto')
       assert_raises(Cisco::UnsupportedError) { v.route_target_both_auto = true }
@@ -166,18 +172,20 @@ def route_target(af)
              'v route-target both auto evpn should be disabled')
     end
 
-    if validate_property_excluded?('vrf_af', 'route_target_both_auto_mvpn')
-      assert_raises(Cisco::UnsupportedError) do
+    if step_unless_version_unsupported(mvpn_skip_versions)
+      if validate_property_excluded?('vrf_af', 'route_target_both_auto_mvpn')
+        assert_raises(Cisco::UnsupportedError) do
+          v.route_target_both_auto_mvpn = true
+        end
+      else
         v.route_target_both_auto_mvpn = true
-      end
-    else
-      v.route_target_both_auto_mvpn = true
-      assert(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
-             'v route-target both auto mvpn should be enabled')
+        assert(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be enabled')
 
-      v.route_target_both_auto_mvpn = false
-      refute(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
-             'v route-target both auto mvpn should be disabled')
+        v.route_target_both_auto_mvpn = false
+        refute(v.route_target_both_auto_mvpn, "vrf context #{vrf} af #{af}: "\
+               'v route-target both auto mvpn should be disabled')
+      end
     end
 
     opts = [:import, :export]
@@ -205,6 +213,9 @@ def route_target(af)
   end
 
   def route_target_tester(v, af, opts, should, test_id)
+    # mvpn tests are only supported on 7.0.3.I7.1 and later
+    mvpn_skip_versions = ['7.0.3.(I2|I3|I4|I5|I6)']
+
     # First configure all four property types
     opts.each do |opt|
       # non-evpn
@@ -218,12 +229,14 @@ def route_target_tester(v, af, opts, should, test_id)
         v.send("route_target_#{opt}_evpn=", should)
       end
       # mvpn
-      if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
-        assert_raises(Cisco::UnsupportedError, "route_target_#{opt}_mvpn=") do
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_raises(Cisco::UnsupportedError, "route_target_#{opt}_mvpn=") do
+            v.send("route_target_#{opt}_mvpn=", should)
+          end
+        else
           v.send("route_target_#{opt}_mvpn=", should)
         end
-      else
-        v.send("route_target_#{opt}_mvpn=", should)
       end
       # stitching
       if platform == :nexus
@@ -251,12 +264,14 @@ def route_target_tester(v, af, opts, should, test_id)
                      "#{test_id} : #{af} : route_target_#{opt}_evpn")
       end
       # mvpn
-      result = v.send("route_target_#{opt}_mvpn")
-      if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
-        assert_nil(result)
-      else
-        assert_equal(should, result,
-                     "#{test_id} : #{af} : route_target_#{opt}_mvpn")
+      if step_unless_version_unsupported(mvpn_skip_versions)
+        result = v.send("route_target_#{opt}_mvpn")
+        if validate_property_excluded?('vrf_af', "route_target_#{opt}_mvpn")
+          assert_nil(result)
+        else
+          assert_equal(should, result,
+                       "#{test_id} : #{af} : route_target_#{opt}_mvpn")
+        end
       end
       # stitching
       result = v.send("route_target_#{opt}_stitching")

From cbb06ec7854fc3a3bfe3447f3594568040dcff25 Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Fri, 13 Apr 2018 13:47:35 -0400
Subject: [PATCH 32/34] Fix mvpn and evpn getters

---
 lib/cisco_node_utils/vrf_af.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/cisco_node_utils/vrf_af.rb b/lib/cisco_node_utils/vrf_af.rb
index 90706d84..2817ad69 100644
--- a/lib/cisco_node_utils/vrf_af.rb
+++ b/lib/cisco_node_utils/vrf_af.rb
@@ -261,12 +261,12 @@ def default_route_target_import
 
     # --------------------------
     def route_target_import_evpn
-      route_target_feature_enable(:require_nv_overlay)
       cmds = config_get('vrf_af', 'route_target_import_evpn', @get_args)
       cmds.nil? ? nil : cmds.sort
     end
 
     def route_target_import_evpn=(should)
+      route_target_feature_enable(:require_nv_overlay)
       route_target_delta(should, route_target_import_evpn,
                          'route_target_import_evpn')
     end
@@ -277,12 +277,12 @@ def default_route_target_import_evpn
 
     # --------------------------
     def route_target_import_mvpn
-      route_target_feature_enable(nil, :require_ngmvpn)
       cmds = config_get('vrf_af', 'route_target_import_mvpn', @get_args)
       cmds.nil? ? nil : cmds.sort
     end
 
     def route_target_import_mvpn=(should)
+      route_target_feature_enable(nil, :require_ngmvpn)
       route_target_delta(should, route_target_import_mvpn,
                          'route_target_import_mvpn')
     end

From 1c3a0f4514777be322d31ce422164bdd2360004b Mon Sep 17 00:00:00 2001
From: mikewiebe <mwiebe@cisco.com>
Date: Mon, 16 Apr 2018 09:48:16 -0400
Subject: [PATCH 33/34] Update minimum supported version

---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index c00ed6ac..c5c6827c 100644
--- a/README.md
+++ b/README.md
@@ -42,8 +42,8 @@ This CiscoNodeUtils gem release supports the following:
 
 Platform          | OS     | OS Version           |
 ------------------|--------|----------------------|
-Cisco Nexus N9k   | NX-OS  | 7.0(3)I2(1) and later
-Cisco Nexus N3k   | NX-OS  | 7.0(3)I2(1) and later
+Cisco Nexus N9k   | NX-OS  | 7.0(3)I2(5) and later
+Cisco Nexus N3k   | NX-OS  | 7.0(3)I2(5) and later
 Cisco Nexus N3K-F | NX-OS  | 7.0(3)F3(2) and later
 Cisco Nexus N5k   | NX-OS  | 7.3(0)N1(1) and later
 Cisco Nexus N6k   | NX-OS  | 7.3(0)N1(1) and later
@@ -91,7 +91,7 @@ An example configuration file (illustrating each of the above scenarios) is prov
 
 The `Client` class provides a low-level interface for communicating with the Cisco network node. It provides the base APIs `create`, `get`, and `set`.
 
-* `Cisco::Client::NXAPI` - client for communicating with NX-OS 7.0(3)I2(1) and later, using NX-API.
+* `Cisco::Client::NXAPI` - client for communicating with NX-OS 7.0(3)I2(5) and later, using NX-API.
 
 For a greater level of abstraction, the `Node` class is generally used, but the `Client` classes can be invoked directly if desired.
 

From c2927b8640e5ae69d6b2412f5474c41c12a0764e Mon Sep 17 00:00:00 2001
From: Mike Wiebe <mwiebe@cisco.com>
Date: Wed, 18 Apr 2018 13:24:26 -0400
Subject: [PATCH 34/34] Update copyright.

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index c5c6827c..c441d9eb 100644
--- a/README.md
+++ b/README.md
@@ -217,7 +217,7 @@ See [CHANGELOG](CHANGELOG.md) for a list of changes.
 ## <a name="license_info">License Information</a>
 
 
-Copyright (c) 2013-2017 Cisco and/or its affiliates.
+Copyright (c) 2013-2018 Cisco and/or its affiliates.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.