Merge pull request #21 from cisco/release_1.1.0

Release 1.1.0

Author: chrisvanheuveln

.gitignore

@@ -1,4 +1,7 @@
+.bundle
 .chef/
 .vagrant/
 .kitchen/
 .kitchen.local.yml
+Gemfile.lock
+vendor/bundle/

.kitchen.yml

@@ -1,17 +1,27 @@
 ---
 driver:
   name: vagrant
+  provider: virtualbox
+  vm_hostname: false
+  provision: true
 
 provisioner:
   name: chef_zero
+  require_chef_omnibus: 12.6.0
+  command_prefix: sudo ip netns exec management sudo -u vagrant
+
+verifier:
+  command_prefix: sudo ip netns exec management sudo -u vagrant
 
 platforms:
-  - name: packer-wrl-x86_64
-  driver_config:
-    box: packer-wrl-x86_64
-    box_url: /Users/rkailas/packer/packer-wrl.box
+  - name: nexus
+    driver:
+      box: n9kv
+      vagrantfiles:
+        - vagrantfiles/nexus.rb
+
 suites:
   - name: default
     run_list:
-      - recipe[ciscolib_nxos::cisco_package_test_all]
+      - recipe[cisco-test::default]
     attributes:

.rubocop.yml

@@ -8,203 +8,82 @@ AllCops:
   Exclude:
     - metadata.rb
     - files/**/*
+    - vendor/**/*
 
-# This configuration was generated by `rubocop --auto-gen-config`
-# on 2015-08-11 22:43:57 -0500 using RuboCop version 0.32.1.
-# The point is for the user to remove these configuration records
-# one by one as the offenses are removed from the code base.
-# Note that changes in the inspected code, or installation of new
-# versions of RuboCop, may require this file to be generated again.
-
-# Offense count: 15
+# Baseline code complexity metrics - we should try and reduce these over time
 Metrics/AbcSize:
-  Max: 169
+  Max: 157
 
-# Offense count: 2
-# Configuration parameters: CountComments.
 Metrics/ClassLength:
-  Max: 135
+  Max: 132
 
-# Offense count: 10
 Metrics/CyclomaticComplexity:
   Max: 31
 
-# Offense count: 64
-# Configuration parameters: AllowURI, URISchemes.
 Metrics/LineLength:
-  Max: 158
+  Max: 118
 
-# Offense count: 16
-# Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 110
 
-# Offense count: 11
 Metrics/PerceivedComplexity:
   Max: 32
 
-# Offense count: 1
-Style/AccessorMethodName:
-  Enabled: false
-
-# Offense count: 32
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/AndOr:
-  Enabled: false
+#
+# Team preferences different from Rubocop defaults:
+#
 
-# Offense count: 12
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-Style/BlockDelimiters:
-  Enabled: false
+# We like table alignment for readability
+Style/AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
 
-# Offense count: 4
+# Template files have wildcard strings in class names
 Style/ClassAndModuleCamelCase:
-  Enabled: false
-
-# Offense count: 30
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/ClassAndModuleChildren:
-  Enabled: false
+  Exclude:
+    - docs/*.rb
 
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Use is_a? and kind_of? interchangeably
 Style/ClassCheck:
   Enabled: false
 
-# Offense count: 12
-Style/ClassVars:
-  Enabled: false
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/ColonMethodCall:
-  Enabled: false
-
-# Offense count: 32
-Style/Documentation:
-  Enabled: false
+# Template files have atypical file names on purpose
+Style/FileName:
+  Exclude:
+    - docs/*.rb
 
-# Offense count: 20
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Enabled: false
+# As a team we like 'sprintf' rather than 'format'
+Style/FormatString:
+  EnforcedStyle: sprintf
 
-# Offense count: 84
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, UseHashRocketsWithSymbolValues.
+# Mixed keys are ugly. Use one or the other as needed
 Style/HashSyntax:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-# Configuration parameters: MaxLineLength.
-Style/IfUnlessModifier:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-Style/Lambda:
-  Enabled: false
+  EnforcedStyle: ruby19_no_mixed_keys
 
-# Offense count: 49
-# Cop supports --auto-correct.
-Style/LineEndConcatenation:
-  Enabled: false
-
-# Offense count: 2
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Template files have wildcard strings in method names
 Style/MethodName:
-  Enabled: false
-
-# Offense count: 10
-# Cop supports --auto-correct.
-Style/MultilineBlockLayout:
-  Enabled: false
-
-# Offense count: 3
-Style/MultilineTernaryOperator:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, MinBodyLength, SupportedStyles.
-Style/Next:
-  Enabled: false
-
-# Offense count: 6
-# Cop supports --auto-correct.
-Style/Not:
-  Enabled: false
+  Exclude:
+    - docs/*.rb
 
-# Offense count: 2
-# Cop supports --auto-correct.
+# Recipes shouldn't use underscores in numeric literals
 Style/NumericLiterals:
-  MinDigits: 6
-
-# Offense count: 5
-# Cop supports --auto-correct.
-Style/PerlBackrefs:
-  Enabled: false
-
-# Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/RaiseArgs:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Enabled: false
-
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowInnerSlashes.
-Style/RegexpLiteral:
-  Enabled: false
-
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: AllowAsExpressionSeparator.
-Style/Semicolon:
-  Enabled: false
-
-# Offense count: 1
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/SignalException:
-  Enabled: false
+  Exclude:
+    - recipes/*.rb
 
-# Offense count: 16
-# Cop supports --auto-correct.
-Style/SpecialGlobalVars:
-  Enabled: false
+# "def foo(bar=baz)" not "def foo(bar = baz)"
+Style/SpaceAroundEqualsInParameterDefault:
+  EnforcedStyle: no_space
 
-# Offense count: 75
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles.
-Style/StringLiterals:
-  Enabled: false
+# Let us use table-style formatting in our recipes
+Style/SingleSpaceBeforeFirstArg:
+  Exclude:
+    - recipes/*.rb
 
-# Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStyles.
+# Make it neater to extend multi-line arrays and hashes
 Style/TrailingComma:
-  Enabled: false
-
-# Offense count: 1
-Style/UnlessElse:
-  Enabled: false
+  EnforcedStyleForMultiline: comma
 
-# Offense count: 3
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Template files have wildcard strings in variable names
 Style/VariableName:
-  Enabled: false
-
-# Offense count: 7
-# Cop supports --auto-correct.
-# Configuration parameters: WordRegex.
-Style/WordArray:
-  MinSize: 6
+  Exclude:
+    - docs/*.rb

.travis.yml

@@ -0,0 +1,11 @@
+sudo: false
+cache: bundler
+language: ruby
+bundler_args: --without kitchen_vagrant
+rvm:
+  - 2.0.0
+  - 2.1.2
+script:
+  - bundle exec rubocop
+  - bundle exec foodcritic --exclude spec ./
+#  - bundle exec rspec

Berksfile

@@ -0,0 +1,6 @@
+source 'https://supermarket.chef.io'
+
+metadata
+
+cookbook 'cisco-test', path: 'test/fixtures/cookbooks/cisco-test'
+

CHANGELOG.md

@@ -2,6 +2,27 @@
 All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [1.1.0] - 2016-02-12
+### Added
+- Extended cisco_interface (@robert-w-gries)
+  - encapsulation dot1q
+  - mtu
+  - switchport trunk allowed vlan
+  - switchport trunk native vlan
+  - vrf member
+- Travis-CI integration, currently running Rubocop and Foodcritic validation (@glennmatthews)
+- Documentation workflow map to guide users, developers, and maintainers to the proper docs (@mikewiebe)
+- Doc updates for examples, templates, and install instructions (@chrisvanheuveln)
+- Test Kitchen integration (@adamleff, @edolnx)
+- Serverspec tests (@adamleff)
+- Added support for Chef 12.6.0 (@adamleff)
+- Updated documentation with platform support for providers and required software versions (@robert-w-gries)
+
+### Fixed
+- Code changes to satisfy Rubocop. (@glennmatthews)
+- Updated cisco ohai plugin to use correct load path for vendor gems (Alex Hunsberger)
+- Cleaned up demo recipes for N5k, N6k, and N7k platforms (@robert-w-gries)
+
 ## [1.0.1] - 2015-09-21
 ### Fixed
 - Fixed broken documentation links.
@@ -24,6 +45,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Initial release of cisco-cookbook for chef, 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.
 
-[unreleased]: https://github.com/cisco/cisco-network-chef-cookbook/compare/master...develop
-[1.0.0]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.0.0...v0.9.0
+[1.1.0]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.0.1...v1.1.0
+[1.0.1]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v1.0.0...v1.0.1
+[1.0.0]: https://github.com/cisco/cisco-network-chef-cookbook/compare/v0.9.0...v1.0.0
 

CONTRIBUTING.md

@@ -4,13 +4,14 @@ Cisco Network Elements support a rich set of features to make network robust, ef
 ## Getting Started
 
 * Create a [GitHub account](https://github.com/signup/free)
-* Create a [cisco.com](http://cisco.com) account if you need access to a Network Simulator to test your code.
+* A virtual Nexus N9000/N3000 may be helpful for development and testing. Users with a valid [cisco.com](http://cisco.com) user ID can obtain a copy of a virtual Nexus N9000/N3000 by sending their [cisco.com](http://cisco.com) user ID in an email to <get-n9kv@cisco.com>. If you do not have a [cisco.com](http://cisco.com) user ID please register for one at [https://tools.cisco.com/IDREG/guestRegistration](https://tools.cisco.com/IDREG/guestRegistration)
+
 
 ## Making Changes
 
 * Fork the repository
 * Pull a branch under the "**develop**" branch for your changes.
-* Follow all guidelines documented in [README-develop-resources-providers.md](docs/README-develop-resources-providers.md) 
+* Follow all guidelines documented in [README-develop-resources-providers.md](docs/README-develop-resources-providers.md)
 * Make changes in your branch.
 * Testing
   * Run all the tests to ensure there was no collateral damage to existing code.
@@ -24,6 +25,12 @@ Cisco Network Elements support a rich set of features to make network robust, ef
 * Submit a pull request to the repository
 * A core team consisting of Cisco and Chef Inc employees will review your pull request and provide feedback.
 * After feedback has been given we expect responses within two weeks. After two weeks we may close the pull request if it isn't showing any activity.
+* All code commits must be associated with your github account and email address. Before committing any code use the following commands to update your workspace with your credentials:
+
+```bash
+git config --global user.name "John Doe"
+git config --global user.email johndoe@example.com
+```
 
 # Additional Resources
 

Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+group :test do
+  gem 'foodcritic'
+  gem 'rake', '~> 10.0'
+  gem 'rspec'
+  gem 'rubocop', '= 0.34'
+end
+
+gem 'test-kitchen', git: 'https://github.com/test-kitchen/test-kitchen', branch: 'master'
+gem 'kitchen-vagrant'
+gem 'berkshelf'