Merge pull request #480 from cisco/release_1.8.0

Release 1.8.0

.gitignore

@@ -7,3 +7,4 @@ Gemfile.lock
 *~
 *.swp
 hosts.cfg
+vendor/

CHANGELOG.md

@@ -2,6 +2,39 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.8.0] - 2017-12-12
+
+### New feature support
+#### Cisco Resources
+- `cisco_object_group` type and provider.
+- `cisco_object_group_entry` type and provider.
+
+### Added
+
+### Changed
+- `cisco_interface` Refactored to allow physical ethernet interfaces to be managed as ensurable resources.
+  - `ensure => absent` for physical interfaces will put the interface into a default state.
+  - `ensure => absent` for logical interfaces will cause them to be destroyed.
+
+- Extend `syslog_server` with attribute:
+ - `port`
+
+- Extend `syslog_settings` with attributes:
+ - `console`
+ - `monitor`
+ - `source_interface`
+ - `vrf`
+
+- Extend `radius_global` with attribute:
+ - `source_interface`
+
+- Extend `tacacs_global` with attribute:
+ - `source_interface`
+
+### Removed
+
+### Resolved Issues
+
 ## [1.7.0] - 2017-05-31
 
 ### New feature support
@@ -408,6 +441,7 @@ This version was never released.
 - Initial release of puppetlabs-ciscopuppet module, supporting Cisco NX-OS software release 7.0(3)I2(1) on Cisco Nexus switch platforms: N95xx, N93xx, N30xx and N31xx.
 - Please note: 0.9.0 is an EFT pre-release for a limited audience with access to NX-OS 7.0(3)I2(1). Additional code changes may occur in 0.9.x prior to the final 1.0.0 release.
 
+[1.8.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.7.0...v1.8.0
 [1.7.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.6.0...v1.7.0
 [1.6.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.5.0...v1.6.0
 [1.5.0]: https://github.com/cisco/cisco-network-puppet-module/compare/v1.4.1...v1.5.0

Gemfile

@@ -65,6 +65,11 @@ group :development, :unit_tests do
   gem 'pry',                     require: false
   gem 'rubocop', '= 0.35.1',     require: false
   gem 'simplecov',               require: false
+  gem 'puppet-blacksmith', '~> 3.4', require: false
+end
+
+group :puppet_test_env do
+  gem 'beaker-abs',                  require: false
 end
 
 # vim:ft=ruby

Rakefile

@@ -18,6 +18,8 @@
 
 require 'facter'
 require 'rubocop/rake_task'
+require 'puppetlabs_spec_helper/rake_tasks'
+require 'puppet_blacksmith/rake_tasks'
 
 task default: %w(rubocop test)
 

docs/README-agent-install.md

@@ -45,6 +45,7 @@ Cisco Nexus N5k    | NX-OS  | 7.3(0)N1(1) and later
 Cisco Nexus N6k    | NX-OS  | 7.3(0)N1(1) and later
 Cisco Nexus N7k    | NX-OS  | 7.3(0)D1(1) and later
 Cisco Nexus N9k-F  | NX-OS  | 7.0(3)F1(1) and later
+Cisco Nexus N3k-F  | NX-OS  | 7.0(3)F3(2) and later
 <br>
 
 

examples/cisco/demo_acl.pp

@@ -17,7 +17,7 @@
 class ciscopuppet::cisco::demo_acl {
 
   $fragments = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/  => 'permit',
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/  => 'permit',
     default                => undef
   }
 
@@ -38,32 +38,32 @@
   }
 
   $http_method = platform_get() ? {
-    /(n3k|n9k-f|n9k)/  => 'post',
+    /(n3k|n3k-f|n9k-f|n9k)/  => 'post',
     default            => undef
   }
 
   $packet_length = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/  => 'range 80 1000',
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/  => 'range 80 1000',
     default                => undef
   }
 
   $redirect = platform_get() ? {
-    /(n3k|n9k-f|n9k)/  => 'Ethernet1/1,Ethernet1/2,port-channel1',
+    /(n3k|n3k-f|n9k-f|n9k)/  => 'Ethernet1/1,Ethernet1/2,port-channel1',
     default            => undef
   }
 
   $tcp_option_length = platform_get() ? {
-    /(n3k|n9k-f|n9k)/  => '20',
+    /(n3k|n3k-f|n9k-f|n9k)/  => '20',
     default            => undef
   }
 
   $time_range = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/  => 'my_range',
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/  => 'my_range',
     default                => undef
   }
 
   $ttl = platform_get() ? {
-    /(n3k|n9k-f|n9k)/  => '153', 
+    /(n3k|n3k-f|n9k-f|n9k)/  => '153', 
     default            => undef
   }
 

examples/cisco/demo_bfd.pp

@@ -17,7 +17,7 @@
 class ciscopuppet::cisco::demo_bfd {
 
   $echo_rx_interval = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 300,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 300,
     default => undef
   }
 
@@ -43,37 +43,37 @@
   }
 
   $ipv4_echo_rx_interval = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 100,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 100,
     default => undef
   }
 
   $ipv4_interval = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => ['200', '200', '50'],
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => ['200', '200', '50'],
     default => undef
   }
 
   $ipv4_slow_timer = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 10000,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 10000,
     default => undef
   }
 
   $ipv6_echo_rx_interval = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 200,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 200,
     default => undef
   }
 
   $ipv6_interval = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => ['500', '500', '30'],
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => ['500', '500', '30'],
     default => undef
   }
 
   $ipv6_slow_timer = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 25000,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 25000,
     default => undef
   }
 
   $startup_timer = platform_get() ? {
-    /(n3k|n9k-f|n9k)/ => 25,
+    /(n3k|n3k-f|n9k-f|n9k)/ => 25,
     default => undef
   }
 

examples/cisco/demo_bgp.pp

@@ -59,15 +59,15 @@
   }
 
   $event_history_errors = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => 'size_small'
     },
     default => undef
   }
 
   $event_history_objstore = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => 'size_small'
     },

examples/cisco/demo_dhcp_relay_global.pp

@@ -17,12 +17,12 @@
 class ciscopuppet::cisco::demo_dhcp_relay_global {
 
   $ipv4_information_option_trust = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => true,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => true,
     default => undef
   }
 
   $ipv4_information_trust_all = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => true,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => true,
     default => undef
   }
 
@@ -42,7 +42,7 @@
   }
 
   $ipv6_option_cisco = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => true,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => true,
     default => undef
   }
 

examples/cisco/demo_interface.pp

@@ -37,7 +37,7 @@
     }
 
     $ipv4_dhcp_relay_info_trust = platform_get() ? {
-      /(n3k|n7k|n9k-f|n9k)/ => true,
+      /(n3k|n7k|n3k-f|n9k-f|n9k)/ => true,
       default => undef
     }
 
@@ -100,12 +100,12 @@
       ipv6_dhcp_relay_src_intf         => 'ethernet 2/2',
     }
     $storm_control_broadcast = platform_get() ? {
-      /(n3k|n5k|n6k|n9k-f|n9k)/ => '77.77',
+      /(n3k|n5k|n6k|n3k-f|n9k-f|n9k)/ => '77.77',
       default => undef
     }
 
     $storm_control_multicast = platform_get() ? {
-      /(n3k|n5k|n6k|n9k-f|n9k)/ => '22.22',
+      /(n3k|n5k|n6k|n3k-f|n9k-f|n9k)/ => '22.22',
       default => undef
     }
 

examples/cisco/demo_object_group.pp

@@ -0,0 +1,65 @@
+# Manifest to demo cisco_acl providers
+#
+# 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.
+
+class ciscopuppet::cisco::demo_object_group {
+
+  cisco_object_group { 'ipv4 address my_addr1':
+    ensure                 => 'present',
+  }
+
+  cisco_object_group_entry { 'ipv4 address my_addr1 10':
+    ensure  => 'present',
+    address => '1.2.3.4 2.3.4.5',
+  }
+
+  cisco_object_group_entry { 'ipv4 address my_addr1 20':
+    ensure  => 'present',
+    address => '3.3.3.3/24',
+  }
+
+  cisco_object_group_entry { 'ipv4 address my_addr1 30':
+    ensure  => 'present',
+    address => 'host 4.4.4.4',
+  }
+
+  cisco_object_group { 'ipv6 address my_addr2':
+    ensure                 => 'present'
+  }
+
+  cisco_object_group_entry { 'ipv6 address my_addr2 20':
+    ensure  => 'present',
+    address => '2000::1/64',
+  }
+
+  cisco_object_group_entry { 'ipv6 address my_addr2 30':
+    ensure  => 'present',
+    address => 'host 2001::10',
+  }
+
+  cisco_object_group { 'ipv4 port my_port':
+    ensure                 => 'present'
+  }
+
+  cisco_object_group_entry { 'ipv4 port my_port 20':
+    ensure => 'present',
+    port   => 'range 100 200',
+  }
+
+  cisco_object_group_entry { 'ipv4 port my_port 30':
+    ensure => 'present',
+    port   => 'neq 154',
+  }
+}

examples/cisco/demo_portchannel.pp

@@ -42,12 +42,12 @@
   }
 
   $port_hash_distribution = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => 'adaptive',
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => 'adaptive',
     default => undef
   }
 
   $port_load_defer = platform_get() ? {
-    /(n3k|n7k|n9k-f|n9k)/ => true,
+    /(n3k|n7k|n3k-f|n9k-f|n9k)/ => true,
     default => undef
   }
 
@@ -57,7 +57,7 @@
   }
 
   $rotate = platform_get() ? {
-    /(n7k|n9k-f|n9k)/ => '4',
+    /(n7k|n3k-f|n9k-f|n9k)/ => '4',
     default => undef
   }
 

examples/cisco/demo_route_map.pp

@@ -72,7 +72,7 @@
   }
 
   $match_ospf_area = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => ['10', '7', '222']
     },
@@ -95,7 +95,7 @@
   }
 
   $set_ipv4_next_hop_load_share = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => true
     },
@@ -119,23 +119,23 @@
   }
 
   $set_ipv4_next_hop_redist = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => true
     },
     default => true
   }
 
   $set_ipv6_next_hop_redist = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => true
     },
     default => true
   }
 
   $set_ipv6_next_hop_load_share = platform_get() ? {
-    /(n3k|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
+    /(n3k$|n9k$)/ => $facts['cisco']['images']['system_image'] ? {
       /(I2|I3|I4)/ => undef,
       default => true
     },
@@ -261,7 +261,7 @@
     }
   }
 
-  if platform_get() =~ /n9k-f/ {
+  if platform_get() =~ /n(3|9)k-f/ {
     cisco_route_map {'MyRouteMap1 123 permit':
       ensure                                 => 'present',
       description                            => 'Testing',