vmware-vra 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29d0f8225730f7665b5671e437ef655358a6de82
-  data.tar.gz: 40d82c32de2a8f8b4678cb2b40a78cdbd6a0b53e
+  metadata.gz: 4206fd0351845613715dd83cc91a70b57067a025
+  data.tar.gz: 1ff2b3429cda1eb4f46cad5f9832cded71d60fde
 SHA512:
-  metadata.gz: a2dec9201f3115b16a8e3f678a3daf50b9f9b1000993263960f589c229f21950543fd44b07991dd1b7e1716c4245c0e885eebd3d48aa6dacb880475d44fa69b8
-  data.tar.gz: db317d1661507c16d7e72ceb2402794d8c84d94913a0a5fc13db5e26d8cf12ad1d9a620b7541564817bb6c6d9c6cf47f2611e56b7acda356df47628ea7695ce8
+  metadata.gz: 9f8e728e3be572a2d9094115702cc1ba4293ee92cebd5d43fb6430cfa80c48d378abde08d98013cf986c703ef126a05add06d955def8b407c30f017424de9dc4
+  data.tar.gz: ec94a0eec7d637ce06affef14c82aed642a520d5d8548a3e5288e501b87b6a78f93d5b671b601d6ccf3ef502949fc1b6633f46d2e16e5f3507166154d02813a4

data/CHANGELOG.md

@@ -1,7 +1,20 @@
 # Change Log
 
-## [2.2.0](https://github.com/chef-partners/vmware-vra-gem/tree/2.2.0) (2017-06-08)
-[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.1.3...2.2.0)
+## [2.3.0](https://github.com/chef-partners/vmware-vra-gem/tree/2.3.0) (2017-06-30)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.2.0...2.3.0)
+
+**Closed issues:**
+
+- catalog\_request SSLError [\#30](https://github.com/chef-partners/vmware-vra-gem/issues/30)
+- Incompatible with vagrant 1.8+ \(at least\) [\#26](https://github.com/chef-partners/vmware-vra-gem/issues/26)
+
+**Merged pull requests:**
+
+- Extra parameters [\#50](https://github.com/chef-partners/vmware-vra-gem/pull/50) ([lloydsmithjr03](https://github.com/lloydsmithjr03))
+- Initial Jenkinsfile for integration tests [\#49](https://github.com/chef-partners/vmware-vra-gem/pull/49) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.2.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.2.0) (2017-06-08)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.1.3...v2.2.0)
 
 **Closed issues:**
 

data/Jenkinsfile

@@ -0,0 +1,31 @@
+pipeline {
+  agent {
+    docker {
+      args '-u root'
+      image 'localhost:5000/jjkeysv3'
+    }
+
+  }
+  triggers {
+        pollSCM('H * * * *')
+  }
+  stages {
+    stage('Pull down the ChefDK') {
+      steps {
+        sh '''apt-get update
+apt-get install -y curl sudo git build-essential
+curl -L https://chef.io/chef/install.sh | sudo bash -s -- -P chefdk -c current'''
+      }
+    }
+    stage('Bundle') {
+      steps {
+        sh 'chef exec bundle install'
+      }
+    }
+    stage('Rake') {
+      steps {
+        sh 'chef exec bundle exec rake '
+      }
+    }
+  }
+}

data/README.md

@@ -96,6 +96,12 @@ If your catalog blueprint item requires additional parameters to successfully su
 catalog_request.set_parameter('my_parameter', 'string', 'my value')
 ```
 
+If you need to set a parameter on a child object in the blueprint, you can add them by using a ~:
+
+```
+catalog_request.set_parameter('object~my_parameter', 'string', 'my value')
+```
+
 ### Creating a request from a yaml or json payload
 Should you want to create a request ahead of time you can create the parameters up front by 
 reading from a file or a hard coded payload you use every time.  This is not required by any means but allows

data/lib/vra/catalog_request.rb

@@ -41,12 +41,16 @@ module Vra
       @additional_params.set(key, type, value)
     end
 
+    def set_parameters(key, value_data)
+      @additional_params.set_parameters(key, value_data)
+    end
+
     def delete_parameter(key)
       @additional_params.delete(key)
     end
 
     def parameters
-      @additional_params.all_entries
+      @additional_params.to_vra
     end
 
     def subtenant_id
@@ -72,15 +76,7 @@ module Vra
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
 
-      parameters.each do |param|
-        if hash_payload["data"].key? param.key
-          hash_payload["data"][param.key] = param.value
-        else
-          hash_payload["data"][blueprint_name]["data"][param.key] = param.value
-        end
-      end
-
-      JSON.pretty_generate(hash_payload)
+      JSON.pretty_generate(deep_merge(hash_payload, parameters))
     end
 
     def submit
@@ -98,5 +94,22 @@ module Vra
       request_id = JSON.parse(post_response.body)["id"]
       Vra::Request.new(client, request_id)
     end
+
+    def deep_merge(first, second)
+      merger = proc do |key, v1, v2|
+        if Hash === v1 && Hash === v2
+          v1.merge(v2, &merger)
+        elsif Array === v1 && Array === v2
+          v1 | v2
+        elsif [:undefined, nil, :nil].include?(v2)
+          v1
+        else
+          v2
+        end
+      end
+      first.merge(second.to_h, &merger)
+    end
+
+    private :deep_merge
   end
 end

data/lib/vra/request_parameters.rb

@@ -16,15 +16,55 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
 module Vra
   class RequestParameters
     def initialize
       @entries = {}
     end
 
+    def set_parameters(key, value_data, parent = nil)
+      if value_data.key?(:type)
+        if parent.nil?
+          set(key, value_data[:type], value_data[:value])
+        else
+          parent.add_child(Vra::RequestParameter.new(key, value_data[:type], value_data[:value]))
+        end
+      else
+        if parent.nil?
+          p = set(key, nil, nil)
+        else
+          p = Vra::RequestParameter.new(key, nil, nil)
+          parent.add_child(p)
+        end
+
+        value_data.each do |k, data|
+          set_parameters(k, data, p)
+        end
+      end
+    end
+
     def set(key, type, value)
-      @entries[key] = Vra::RequestParameter.new(key, type, value)
+      if key.to_s.include? "~"
+        split_key = key.split("~")
+        parent = nil
+        split_key.each_with_index do |item, index|
+          if index == 0
+            if @entries[item].nil?
+              @entries[item] = Vra::RequestParameter.new(item, nil, nil)
+            end
+            parent = @entries[item]
+          elsif index == (split_key.count - 1)
+            c = Vra::RequestParameter.new(item, type, value)
+            parent.add_child(c)
+          else
+            p = Vra::RequestParameter.new(item, nil, nil)
+            parent.add_child(p)
+            parent = p
+          end
+        end
+      else
+        @entries[key] = Vra::RequestParameter.new(key, type, value)
+      end
     end
 
     def delete(key)
@@ -34,24 +74,75 @@ module Vra
     def all_entries
       @entries.values
     end
+
+    def to_h
+      hash = {}
+
+      @entries.each do |k, v|
+        hash.merge!(v.to_h)
+      end
+
+      hash
+    end
+
+    def to_vra
+      hash = {
+        "data" => {},
+      }
+
+      @entries.each do |k, v|
+        hash["data"].merge!(v.to_vra)
+      end
+
+      hash
+    end
   end
 
   class RequestParameter
-    attr_accessor :key, :type, :value
+    attr_accessor :key, :type, :value, :children
     def initialize(key, type, value)
       @key   = key
       @type  = type
       @value = value
+      @children = []
+    end
+
+    def add_child(child)
+      @children.push(child)
     end
 
     def to_h
-      {
-        "key" => @key,
-        "value" => {
-          "type" => @type,
-          "value" => format_value,
-        },
-      }
+      hash = {}
+
+      if @children.count > 0
+        hash[@key] = {}
+
+        @children.each do |c|
+          hash[@key].merge!(c.to_h)
+        end
+      else
+        hash[@key] = format_value
+      end
+
+      hash
+    end
+
+    def to_vra
+      hash = {}
+
+      if @children.count > 0
+        hash[@key] = {}
+
+        hash[@key]["data"] = {}
+
+        @children.each do |c|
+          hash[@key]["data"].merge!(c.to_vra)
+        end
+      else
+        hash[@key] = format_value
+      end
+
+      hash
     end
 
     def format_value
@@ -59,9 +150,9 @@ module Vra
       when "integer"
         @value.to_i
       when "string"
-        @value.to_s
+        @value
       else
-        @value.to_s
+        @value
       end
     end
   end

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = "2.2.0".freeze
+  VERSION = "2.3.0".freeze
 end

data/spec/catalog_request_spec.rb

@@ -95,13 +95,59 @@ describe Vra::CatalogRequest do
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["my_blueprint"]["data"]["param1"]
-        param2 = payload["data"]["my_blueprint"]["data"]["param2"]
+        param1 = payload["data"]["param1"]
+        param2 = payload["data"]["param2"]
 
         expect(param1).to be_a(String)
-        expect(param2).to be_a(String)
+        expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
-        expect(param2).to eq "2468"
+        expect(param2).to eq 2468
+      end
+
+      it "properly handles additional nested parameters" do
+        request.set_parameter("BP1~param1", "string", "my string")
+        request.set_parameter("BP1~BP2~param2", "integer", 2468)
+
+        template = File.read("spec/fixtures/resource/catalog_request.json")
+        payload = JSON.parse(request.merge_payload(template))
+        param1 = payload["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
+
+        expect(param1).to be_a(String)
+        expect(param2).to be_a(Integer)
+        expect(param1).to eq "my string"
+        expect(param2).to eq 2468
+      end
+
+      it "properly handles nested parameters" do
+        parameters = {
+          "BP1" => {
+              "param1" => {
+                type: "string",
+                value: "my string",
+              },
+              "BP2" => {
+                  "param2" => {
+                    type: "integer",
+                    value: 2468,
+                  },
+                },
+            },
+        }
+
+        parameters.each do |k, v|
+          request.set_parameters(k, v)
+        end
+
+        template = File.read("spec/fixtures/resource/catalog_request.json")
+        payload = JSON.parse(request.merge_payload(template))
+        param1 = payload["data"]["BP1"]["data"]["param1"]
+        param2 = payload["data"]["BP1"]["data"]["BP2"]["data"]["param2"]
+
+        expect(param1).to be_a(String)
+        expect(param2).to be_a(Integer)
+        expect(param1).to eq "my string"
+        expect(param2).to eq 2468
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-08 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -151,6 +151,7 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
+- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile