knife-vrealize 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 578b154a3ccbf57ebe1e6ebc53ab5e0f787880fd
-  data.tar.gz: 387f75225a0c35f7e9da8c6fb8e89e0a966e2746
+  metadata.gz: 07d9ed1c0da967a7f546ea03d5b82b603a80e72f
+  data.tar.gz: 0d59826e9bd3cbc25639432815870cc2b62f73f5
 SHA512:
-  metadata.gz: d95052a813c5ca77126f8d223bc6808993fd63843379a0356ecf03b7c5dd2d44abb7c33ac1246e8eb09d6d8883eeee50b300d404fc633b5d6076cf00c4bb98ca
-  data.tar.gz: 0c8f5c49e7537f9ed02aaa1e2671ac4baee6a1f0d52fa1bcf382346faaaf7a098ce2c88874913bd86435838357ed28aee9863590d00094dfa2ed0bf8f8d022d3
+  metadata.gz: bf7a696e7bcfe5cdca74c065943d01b35a1fb3a32d5b07f72f01a7603894405057e3d67ff03b81c54c0f932f6e291ed552efd88c97551f3edb38817729304b9c
+  data.tar.gz: 01bf0b0454049fdab9fd9af2f529e8b3aa32576d0769a3299af3c88c10b88faa208bd79003e25dcdb343b3ac0655d8688948fbfec27b75867bc797223b092839

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # knife-vrealize Change Log
 
+## Release: v1.3.1
+ * [pr#9](https://github.com/chef-partners/knife-vrealize/pull/9) Bug fix for handling of extra parameters, which were never properly sent to the vRA API
+
 ## Release: v1.3.0
  * [pr#8](https://github.com/chef-partners/knife-vrealize/pull/8) Allow configuration of pagination result set size to work around known vRA pagination bug.
 

data/lib/chef/knife/cloud/vra_service.rb

@@ -128,9 +128,9 @@ class Chef
           catalog_request.notes         = options[:notes]         unless options[:notes].nil?
           catalog_request.subtenant_id  = options[:subtenant_id]  unless options[:subtenant_id].nil?
 
-          if options[:vra_extra_params]
-            options[:vra_extra_params].each do |key, value_data|
-              catalog_request.set_parameter(key, value_data[:type], value_data[:value])
+          if options[:extra_params]
+            options[:extra_params].each do |param|
+              catalog_request.set_parameter(param[:key], param[:type], param[:value])
             end
           end
 

data/lib/chef/knife/vra_server_create.rb

@@ -113,15 +113,12 @@ class Chef
         end
 
         def extra_params
-          return unless Chef::Config[:knife][:vra_extra_params]
+          return if Chef::Config[:knife][:vra_extra_params].nil? || Chef::Config[:knife][:vra_extra_params].empty?
 
-          params = []
-          Chef::Config[:knife][:vra_extra_params].each do |key, value_str|
+          Chef::Config[:knife][:vra_extra_params].each_with_object([]) do |(key, value_str), memo|
             type, value = value_str.split(':')
-            params << { key: key, type: type, value: value }
+            memo << { key: key, type: type, value: value }
           end
-
-          params
         end
 
         def validate_extra_params!

data/lib/knife-vrealize/version.rb

@@ -17,5 +17,5 @@
 #
 
 module KnifeVrealize
-  VERSION = '1.3.0'
+  VERSION = '1.3.1'
 end

data/spec/unit/cloud/vra_service_spec.rb

@@ -240,10 +240,10 @@ describe Chef::Knife::Cloud::VraService do
                                 cpus: 1,
                                 memory: 512,
                                 requested_for: 'myuser@corp.local',
-                                vra_extra_params: {
-                                  'key1' => { type: 'string', value: 'value1' },
-                                  'key2' => { type: 'integer', value: '2' }
-                                })
+                                extra_params: [
+                                  { key: 'key1', type: 'string', value: 'value1' },
+                                  { key: 'key2', type: 'integer', value: '2' }
+                                ])
       end
     end
   end

data/spec/unit/vra_server_create_spec.rb

@@ -22,6 +22,10 @@ require 'support/shared_examples_for_command'
 require 'support/shared_examples_for_servercreatecommand'
 
 describe Chef::Knife::Cloud::VraServerCreate do
+  before(:each) do
+    Chef::Config.reset
+  end
+
   argv = []
   argv += %w(--cpus 1)
   argv += %w(--memory 512)
@@ -60,14 +64,33 @@ describe Chef::Knife::Cloud::VraServerCreate do
   end
 
   describe '#extra_params' do
-    it 'parses extra parameters properly' do
-      params = subject.extra_params
-      expect(params[0][:key]).to eq 'key1'
-      expect(params[0][:type]).to eq 'string'
-      expect(params[0][:value]).to eq 'value1'
-      expect(params[1][:key]).to eq 'key2'
-      expect(params[1][:type]).to eq 'integer'
-      expect(params[1][:value]).to eq '2'
+    context 'when there are no extra params' do
+      before do
+        Chef::Config[:knife][:vra_extra_params] = {}
+      end
+
+      it 'returns nil' do
+        expect(subject.extra_params).to eq(nil)
+      end
+    end
+
+    context 'when extra params are provided' do
+      before do
+        Chef::Config[:knife][:vra_extra_params] = {
+          'key1' => 'string:value1',
+          'key2' => 'integer:2'
+        }
+      end
+
+      it 'parses extra parameters properly' do
+        params = subject.extra_params
+        expect(params[0][:key]).to eq 'key1'
+        expect(params[0][:type]).to eq 'string'
+        expect(params[0][:value]).to eq 'value1'
+        expect(params[1][:key]).to eq 'key2'
+        expect(params[1][:type]).to eq 'integer'
+        expect(params[1][:value]).to eq '2'
+      end
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-vrealize
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - Chef Partner Engineering
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-26 00:00:00.000000000 Z
+date: 2015-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef