kitchen-vra 2.6.0 → 2.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1a1755122b24800867dba47c9142638866369c71
-  data.tar.gz: c0f760021d3605f40680c5d3f69fbb3f761c9750
+SHA256:
+  metadata.gz: e26fd3e9f2467163cb766f196eb7691059c12084f259b285f2bc709a591c273a
+  data.tar.gz: f263e07c9667b4d171fc61d83ebe177d81200e31aef472e9ca2a83cf2be90f0a
 SHA512:
-  metadata.gz: 78ea45407ed4b29b58b10da77af9d2525ae7cd9d9b4099dc3102f3cb7708d296865e6e145c69054ee7218203c1c43c52c26760c1f77749f1c396f2ffcbc6aa2a
-  data.tar.gz: a17c654055b279fb3cb8d9194942f762a6fec795f6d609e8b3b13afec9b69f05926711367af7b5ff0812907d44b92ca71303af0dab8c835afcd19c8fd5693322
+  metadata.gz: 3f316b3afac08b092c47bec00d79458bae0a88013384639391e3a1ab6383aecab5e382869b6e2292fe3a094bfd4ead9a1246d8ef2f05274c26170ba09ed8ed55
+  data.tar.gz: 7d1bb7739fa994331a0643ebc8339dda2184fe25b0dee621e259078221679ec417b392f825eda37320df8cf64838fc228ceb90b55290865bcd28f592cea5291a

data/.rubocop.yml

@@ -1,19 +1,32 @@
 AllCops:
   DisplayCopNames: true
 Metrics/AbcSize:
-  Max: 50
+  Max: 100
 Metrics/ClassLength:
   Max: 125
+Metrics/CyclomaticComplexity:
+  Max: 20
+Metrics/MethodLength:
+  Exclude:
+    - '**/*.rb'
+  Enabled: false
+Metrics/PerceivedComplexity:
+  Max: 30
 Metrics/LineLength:
-  Max: 130
+  Max: 200
 Metrics/MethodLength:
   Max: 25
 Style/Documentation:
   Enabled: false
+Style/EndOfLine:
+  EnforcedStyle: lf
 Style/SignalException:
   Enabled: false
-Style/SpaceInsideBrackets:
+Layout/SpaceInsideBrackets:
+  Enabled: false
+Style/MutableConstant:
   Enabled: false
 Metrics/BlockLength:
   Exclude:
     - "**/*_spec.rb"
+ 

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Change Log
 
+## [v2.6.0](https://github.com/chef-partners/kitchen-vra/tree/v2.6.0)
+
+[Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v2.5.0...v2.6.0)
+
+- Accept shirt size option available in blueprint as input in kitchen.yml 
+
 ## [v2.5.0](https://github.com/chef-partners/kitchen-vra/tree/v2.5.0)
 
 [Full Changelog](https://github.com/chef-partners/kitchen-vra/compare/v2.4.0...v2.5.0)

data/Gemfile

@@ -1,3 +1,4 @@
 # frozen_string_literal: true
+
 source 'https://rubygems.org'
 gemspec

data/README.md

@@ -72,13 +72,14 @@ Other options that you can set include:
  * **server_ready_retries**: Number of times to retry the "waiting for server to be ready" check. In some cases, this will error out immediately due to DNS propagation issues, etc. Setting this to a number greater than 0 will retry the `wait_until_ready` method with a growing sleep in between each attempt. Defaults to 1. Set to 0 to disable any retrying of the `wait_until_ready` method.
  * **cpus**: number of CPUs the host should have
  * **memory**: amount of RAM, in MB, the host should have
+ * **shirt_size**: This parameter corresponds to shirt size option of vRA available on blueprint like ValueSet.Large, ValueSet.Small etc. As shirt size is a combination of memory and RAM, hence while using this no need to use cpus and memory parameter. This shirt size option helps in standardizing the sizing available for end users
  * **requested_for**: the vRA login ID to list as the owner of this resource. Defaults to the vRA username configured in the `driver` section.
  * **subtenant_id**: the Business Group ID to list as the owner. This is required if the catalog item is a shared/global item; we are unable to determine the subtenant_id from the catalog, and vRA requires it to be set on every request.
  * **subtenant_name**: the Business Group Name as the owner. This can be passed instead of subtenant_id and would act as a more friendly name. subtenant_id would be internally retrieved based on the provided subtenant_name. In case both subtenant_id and subtenant_name are passed, subtenant_name would take the precendence and would try to retrieve subtenant_id based on subtenant_name passed.
  * **private_key_path**: path to the SSH private key to use when logging in. Defaults to '~/.ssh/id_rsa' or '~/.ssh/id_dsa', preferring the RSA key. Only applies to instances where SSH transport is used; i.e., does not apply to Windows hosts with the WinRM transport configured.
  * **use_dns**: Defaults to `false`.  Set to `true` if vRA doesn't manage vm ip addresses.  This will cause kitchen to attempt to connect via hostname.
  * **dns_suffix**: Defaults to `nil`.  Set to your domain suffix, for example 'mydomain.com'.  This only takes effect when `use_dns` == true and is appended to the hostname returned by vRA.
- * **extra_parameters**: a hash of other data to set on a catalog request, most notably custom properties. Allows updates to existing properties on the blueprint as well as the addition of new properties. The vRA REST API expects 'provider-' appended to the front of a property name; each key in the hash is the property name, and the value is a another hash containing the value data type and the value itself.
+ * **extra_parameters**: a hash of other data to set on a catalog request, most notably custom properties. Allows updates to existing properties on the blueprint as well as the addition of new properties. Each key in the hash is the property name, and the value is a another hash containing the value data type and the value itself. It is possible to use a `~` to add nested parameters.
 
 These settings can be set globally under the top-level `driver` section, or they can be set on each platform, which allows you to set globals and then override them. For example, this configuration would set the CPU count to 1 except on the "large" platform:
 
@@ -93,10 +94,10 @@ platforms:
       catalog_name: my_catalog_name_small
       catalog_id: 8a189191-fea6-43eb-981e-ee0fa40f8f57
       extra_parameters:
-        provider-mycustompropname:
+        mycustompropname:
           type: string
           value: smallvalue
-        provider-Vrm.DataCenter.Location:
+        Vrm.DataCenter.Location:
           type: string
           value: Non-Prod
   - name: large
@@ -106,10 +107,10 @@ platforms:
       cpus: 2
       subtenant_name: my_subtenant_name
       extra_parameters:
-        provider-mycustompropname:
+        mycustompropname:
           type: string
           value: largevalue
-        provider-Vrm.DataCenter.Location:
+        Vrm.DataCenter.Location:
           type: string
           value: Prod
 ```
@@ -118,7 +119,7 @@ platforms:
 
 Author:: Chef Partner Engineering (<partnereng@chef.io>)
 
-Copyright:: Copyright (c) 2015-2017 Chef Software, Inc.
+Copyright:: Copyright (c) 2015-2019 Chef Software, Inc.
 
 License:: Apache License, Version 2.0
 

data/Rakefile

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
@@ -17,4 +18,4 @@ rescue LoadError
   puts 'github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs'
 end
 
-task default: [ :spec, :style ]
+task default: %i[spec style]

data/kitchen-vra.gemspec

@@ -1,5 +1,6 @@
 # coding: utf-8
 # frozen_string_literal: true
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kitchen/driver/vra_version'
@@ -24,11 +25,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'highline'
   spec.add_dependency 'rack', '~> 1.6' unless RUBY_VERSION.index('2.0.').nil?
   spec.add_dependency 'ffi-yajl', '~> 2.2.3' unless RUBY_VERSION.index('2.0.').nil?
-  spec.add_development_dependency 'bundler', '~> 1.7'
+  spec.add_development_dependency 'bundler', '>= 1.7'
   spec.add_development_dependency 'github_changelog_generator'
   spec.add_development_dependency 'rake',      '~> 10.0'
   spec.add_development_dependency 'rspec',     '~> 3.2'
   spec.add_development_dependency 'simplecov', '~> 0.10'
   spec.add_development_dependency 'webmock',   '~> 1.21'
-  spec.add_development_dependency 'rubocop',   '~> 0.35'
+  spec.add_development_dependency 'rubocop',   '~> 0.49.0'
 end

data/lib/kitchen/driver/vra.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -46,6 +47,7 @@ module Kitchen
       default_config :server_ready_retries, 1
       default_config :cpus, 1
       default_config :memory, 1024
+      default_config :shirt_size, nil
       default_config :requested_for do |driver|
         driver[:username]
       end
@@ -54,7 +56,7 @@ module Kitchen
       default_config :cache_credentials, false
       default_config :extra_parameters, {}
       default_config :private_key_path do
-        %w(id_rsa id_dsa).map do |key|
+        %w[id_rsa id_dsa].map do |key|
           file = File.expand_path("~/.ssh/#{key}")
           file if File.exist?(file)
         end.compact.first
@@ -71,7 +73,7 @@ module Kitchen
         config[:password] = config[:password] || ENV['VRA_USER_PASSWORD']
         c_load if config[:username].nil? && config[:password].nil?
 
-        config[:username] = ask('Enter Username: ') if config[:username].nil? || force_change
+        config[:username] = ask('Enter Username: e.g. username@domain') if config[:username].nil? || force_change
         config[:password] = ask('Enter password: ') { |q| q.echo = '*' } if config[:password].nil? || force_change
         c_save if config[:cache_credentials]
       end
@@ -200,32 +202,33 @@ module Kitchen
         info("Destroy request #{destroy_request.id} submitted.")
         wait_for_request(destroy_request)
         info('Destroy request complete.')
-        
+
         File.delete('.kitchen/cached_vra') if File.exist?('.kitchen/cached_vra')
         info('Removed cached file')
       end
 
-      def catalog_request
-        if config[:catalog_name] != nil
-           info('Fetching Catalog ID by Catalog Name')
-           response =  vra_client.catalog.fetch_catalog_items(config[:catalog_name])
-           parsed_json = JSON.parse(response.body)
-           begin
-             config[:catalog_id] = parsed_json['content'][0]['catalogItemId']
-           rescue
-             puts "Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}"
-           end
+      def catalog_request # rubocop:disable Metrics/MethodLength
+        unless config[:catalog_name].nil?
+          info('Fetching Catalog ID by Catalog Name')
+          response =  vra_client.catalog.fetch_catalog_items(config[:catalog_name])
+          parsed_json = JSON.parse(response.body)
+          begin
+            config[:catalog_id] = parsed_json['content'][0]['catalogItemId']
+          rescue
+            puts "Unable to retrieve Catalog ID from Catalog Name: #{config[:catalog_name]}"
+          end
         end
 
         catalog_request = vra_client.catalog.request(config[:catalog_id])
 
         catalog_request.cpus          = config[:cpus]
         catalog_request.memory        = config[:memory]
+        catalog_request.shirt_size    = config[:shirt_size]	unless config[:shirt_size].nil?
         catalog_request.requested_for = config[:requested_for]
         catalog_request.lease_days    = config[:lease_days]    unless config[:lease_days].nil?
         catalog_request.notes         = config[:notes]         unless config[:notes].nil?
 
-        if config[:subtenant_name] != nil
+        unless config[:subtenant_name].nil?
           info('Fetching Subtenant ID by Subtenant Name')
           response = vra_client.fetch_subtenant_items(config[:tenant], config[:subtenant_name])
           parsed_json = JSON.parse(response.body)
@@ -234,8 +237,8 @@ module Kitchen
           rescue
             puts "Unable to retrieve Subtenant ID from Subtenant Name: #{config[:subtenant_name]}"
           end
-        end 
-        catalog_request.subtenant_id  = config[:subtenant_id]  unless config[:subtenant_id].nil?
+        end
+        catalog_request.subtenant_id = config[:subtenant_id] unless config[:subtenant_id].nil?
 
         config[:extra_parameters].each do |key, value_data|
           catalog_request.set_parameters(key, value_data)

data/lib/kitchen/driver/vra_version.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -19,6 +20,6 @@
 
 module Kitchen
   module Driver
-    VRA_VERSION = '2.6.0'
+    VRA_VERSION = '2.7.0'
   end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.

data/spec/vra_spec.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 #
 # Author:: Chef Partner Engineering (<partnereng@chef.io>)
 # Copyright:: Copyright (c) 2015 Chef Software, Inc.
@@ -399,7 +400,7 @@ describe Kitchen::Driver::Vra do
       allow(driver).to receive(:vra_client).and_return(vra_client)
       allow(vra_client).to receive(:catalog).and_return(catalog)
       allow(catalog).to receive(:request).and_return(catalog_request)
-      [ :cpus=, :memory=, :requested_for=, :lease_days=, :notes=, :subtenant_id=, :set_parameter ].each do |method|
+      %i[cpus= memory= requested_for= lease_days= notes= subtenant_id= set_parameter].each do |method|
         allow(catalog_request).to receive(method)
       end
     end
@@ -457,8 +458,8 @@ describe Kitchen::Driver::Vra do
       end
 
       it 'sets extra parmeters' do
-        expect(catalog_request).to receive(:set_parameter).with('key1', 'string', 'value1')
-        expect(catalog_request).to receive(:set_parameter).with('key2', 'integer', 123)
+        expect(catalog_request).to receive(:set_parameters).with('key1', type: 'string', value: 'value1')
+        expect(catalog_request).to receive(:set_parameters).with('key2', type: 'integer', value: 123)
         driver.catalog_request
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-vra
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-01 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -56,14 +56,14 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.49.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.35'
+        version: 0.49.0
 description: A Test Kitchen driver for VMware vRealize Automation (vRA)
 email:
 - partnereng@chef.io
@@ -191,8 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen driver for VMware vRealize Automation (vRA)