vmware-vra 2.3.0 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4206fd0351845613715dd83cc91a70b57067a025
-  data.tar.gz: 1ff2b3429cda1eb4f46cad5f9832cded71d60fde
+  metadata.gz: 11be1f053e0b79413a97f73d65dd7736e5da7c3c
+  data.tar.gz: 5f034f6c50a4bd6a3ec8ee69a72672deb291747d
 SHA512:
-  metadata.gz: 9f8e728e3be572a2d9094115702cc1ba4293ee92cebd5d43fb6430cfa80c48d378abde08d98013cf986c703ef126a05add06d955def8b407c30f017424de9dc4
-  data.tar.gz: ec94a0eec7d637ce06affef14c82aed642a520d5d8548a3e5288e501b87b6a78f93d5b671b601d6ccf3ef502949fc1b6633f46d2e16e5f3507166154d02813a4
+  metadata.gz: 12f97a5705101ab63b43212722a3501ac03ba76365f4cb856dfcbc39015ae86de6745c9090bd76c59dfd44362387964eff4e4a5b7cb55a4eab15bf8026aaeb19
+  data.tar.gz: a6b900474a68a4b02064429cba79606423e34f085a46b86f3a73394d837cbf240433238e4b3cc87cb0efa1b5deab6a3c6376e30126e7cc6458cb967ce9786f28

data/CHANGELOG.md

@@ -1,7 +1,21 @@
 # Change Log
 
-## [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)
+## [2.4.0](https://github.com/chef-partners/vmware-vra-gem/tree/2.4.0) (2017-09-19)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.3.0...2.4.0)
+
+**Closed issues:**
+
+- cpu and memory parameters request [\#52](https://github.com/chef-partners/vmware-vra-gem/issues/52)
+- Minor typo in README [\#51](https://github.com/chef-partners/vmware-vra-gem/issues/51)
+
+**Merged pull requests:**
+
+- Adds ability to supply template files to catalog request [\#57](https://github.com/chef-partners/vmware-vra-gem/pull/57) ([logicminds](https://github.com/logicminds))
+- Adds the ability to dump catalog templates via class methods [\#56](https://github.com/chef-partners/vmware-vra-gem/pull/56) ([logicminds](https://github.com/logicminds))
+- Symbols [\#53](https://github.com/chef-partners/vmware-vra-gem/pull/53) ([logicminds](https://github.com/logicminds))
+
+## [v2.3.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.3.0) (2017-06-30)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.2.0...v2.3.0)
 
 **Closed issues:**
 

data/README.md

@@ -103,9 +103,9 @@ 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 
+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
-for some extra flexibility when using this request object directly.  The only difference is that you can pass 
+for some extra flexibility when using this request object directly.  The only difference is that you can pass
 in the request parameters instead of having to set them after you create the object.
 
 Given a sample request object like the following you will want to read the yaml into an ruby object:
@@ -131,18 +131,18 @@ And now use that data to create the Vra::RequestParameters to feed into the cata
 ```ruby
 # read in the request data
 yaml_data = YAML,load(data)
-# create a parameters array
+# create a parameters array, although this only works with VRA6, since VRA7 can have complex data
 parameters = yaml_data['requestData']['entries'].map {|item| [item['key'], item['value'].values].flatten }
 # We put the values in a array so we can easily explode the parameters using the splat operator later
-request_parans = Vra::RequestParameters.new
-# loop through each parameter and setting each parameter 
+request_params = Vra::RequestParameters.new
+# loop through each parameter and setting each parameter
 parameters.each {|p| request_params.set(*p)  # splat
 request_options = {
   cpus: 1,
   memory: 1024,
   requested_for: 'me@me.com',
   lease_days: 2,
-  additional_params: request_parans
+  additional_params: request_params
 }
 # create the request
 catalog_request = vra.catalog.request(blueprint, request_options)
@@ -230,6 +230,43 @@ vra.resources.all_resources
 vra.requests.all_requests
 ```
 
+### Download VRA catalog templates
+It can be quite useful to download the catalog templates from your VRA server for future playback or inspection.  This
+can now be easily done with some helpful class methods.
+
+To get a json string representation of the catalog template you can use `Vra::CatalogItem.dump_template(client, catalog_id)`
+
+To dump the catalog template to a file instead of a string `Vra::CatalogItem.write_template(client, catalog_id)`.  This will create a file like `windows2012.json`.
+
+If you just want to dump all the templates you can use `Vra::CatalogItem.dump_templates(client)`.  This will create a directory named vra_templates
+with all the entitled templates for the current user.  
+
+There are additional options you can provide to these methods in order to customize output file names and directories, so please see the source code in lib/vra/catalog_item.rb
+
+### Supply custom VRA catalog template and create request
+If you previously had some custom templates already in JSON format you can now use those to create requests instead of setting
+a bunch of parameters.  This can be especially useful when your request has complex parameters or you have a bunch of templates
+that you want to create unique requests for.
+
+To use you can do something like:
+
+```ruby
+payload_file = '/tmp/windows_2012.json'  # must be in json format
+cr = Vra::CatalogRequest.request_from_payload(client, payload_file)
+cr.submit
+
+```
+
+If you already have a catalog request object you can still supply a custom payload by simply setting the template_payload property.
+Note this custom payload will be merged with the properties originally set when creating the catalog request object.
+
+```ruby
+cr = Vra::CatalogRequest.new(id, opts)
+cr.template_payload = File.read('/tmp/windows_2012.json')
+cr.submit
+
+```
+
 ### Pagination
 
 vRA paginates API requests where lists of items are returned.  By default, this gem will ask vRA to provide items in groups of 20.  However, as reported in [Issue 10](https://github.com/chef-partners/vmware-vra-gem/issues/10), it appears vRA may have a pagination bug.  You can change the default page size from 20 to a value of your choice by passing in a `page_size` option when setting up the client:

data/lib/vra/catalog_item.rb

@@ -18,6 +18,7 @@
 #
 
 require "ffi_yajl"
+require "vra/catalog"
 
 module Vra
   class CatalogItem
@@ -85,5 +86,45 @@ module Vra
     def blueprint_id
       @catalog_item_data["providerBinding"]["bindingId"]
     end
+
+    # @param [String] - the id of the catalog item
+    # @param [Vra::Client] - a vra client object
+    # @return [String] - returns a json string of the catalog template
+    def self.dump_template(client, id)
+      response = client.http_get("/catalog-service/api/consumer/entitledCatalogItems/#{id}/requests/template")
+      response.body
+    end
+
+    # @param client [Vra::Client] - a vra client object
+    # @param id [String] - the id of the catalog item
+    # @param filename [String] - the name of the file you want to output the template to
+    # if left blank, will default to the id of the item
+    # @note outputs the catalog template to a file in serialized format
+    def self.write_template(client, id, filename = nil)
+      filename ||= "#{id}.json"
+      begin
+        contents = dump_template(client, id)
+        data = JSON.parse(contents)
+        pretty_contents = JSON.pretty_generate(data)
+        File.write(filename, pretty_contents)
+        return filename
+      rescue Vra::Exception::HTTPError => e
+        raise e
+      end
+    end
+
+    # @param [Vra::Client] - a vra client object
+    # @param [String] - the directory path to write the files to
+    # @param [Boolean] - set to true if you wish the file name to be the id of the catalog item
+    # @return [Array[String]] - a array of all the files that were generated
+    def self.dump_templates(client, dir_name = "vra_templates", use_id = false)
+      FileUtils.mkdir(dir_name) unless File.exist?(dir_name)
+      client.catalog.entitled_items.map do |c|
+        id = use_id ? c.id : c.name.tr(" ", "_")
+        filename = File.join(dir_name, "#{id}.json").downcase
+        write_template(client, c.id, filename)
+        filename
+      end
+    end
   end
 end

data/lib/vra/catalog_request.rb

@@ -16,12 +16,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+require "vra/catalog_item"
 
 module Vra
   class CatalogRequest
     attr_reader :catalog_id, :catalog_item, :client, :custom_fields
     attr_writer :subtenant_id
-    attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes
+    attr_accessor :cpus, :memory, :requested_for, :lease_days, :notes, :template_payload
 
     def initialize(client, catalog_id, opts = {})
       @client            = client
@@ -33,10 +34,29 @@ module Vra
       @notes             = opts[:notes]
       @subtenant_id      = opts[:subtenant_id]
       @additional_params = opts[:additional_params] || Vra::RequestParameters.new
-
       @catalog_item = Vra::CatalogItem.new(client, id: catalog_id)
     end
 
+    # @param payload_file [String] - A json payload that represents the catalog template you want to merge with this request
+    # @param client [Vra::Client] - a vra client object
+    # @return [Vra::CatalogRequest] - a request with the given payload merged
+    def self.request_from_payload(client, payload_file)
+      hash_payload = JSON.parse(File.read(payload_file))
+      catalog_id = hash_payload["catalogItemId"]
+      blueprint_name = hash_payload["data"].select { |_k, v| v.is_a?(Hash) }.keys.first
+      blueprint_data = hash_payload["data"][blueprint_name]
+      opts = {}
+      opts[:cpus] = blueprint_data["data"]["cpu"]
+      opts[:memory] = blueprint_data["data"]["memory"]
+      opts[:requested_for] = hash_payload["requestedFor"]
+      opts[:lease_days] = blueprint_data.fetch("leaseDays", nil) || hash_payload["data"].fetch("_lease_days", 1)
+      opts[:description] = hash_payload["description"]
+      opts[:subtenant_id] = hash_payload["businessGroupId"]
+      cr = Vra::CatalogRequest.new(client, catalog_id, opts)
+      cr.template_payload = File.read(payload_file)
+      cr
+    end
+
     def set_parameter(key, type, value)
       @additional_params.set(key, type, value)
     end
@@ -66,31 +86,40 @@ module Vra
       raise ArgumentError, "Unable to submit request, required param(s) missing => #{missing_params.join(', ')}" unless missing_params.empty?
     end
 
+    # @return [String] - the current catalog template payload merged with the settings applied from this request
+    # @param [String] - A json payload that represents the catalog template you want to merge with this request
     def merge_payload(payload)
       hash_payload = JSON.parse(payload)
       blueprint_name = hash_payload["data"].select { |_k, v| v.is_a?(Hash) }.keys.first
-
       hash_payload["data"][blueprint_name]["data"]["cpu"] = @cpus
       hash_payload["data"][blueprint_name]["data"]["memory"] = @memory
       hash_payload["requestedFor"] = @requested_for
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
-
       JSON.pretty_generate(deep_merge(hash_payload, parameters))
     end
 
+    # @return [String] - the current catalog template payload merged with the settings applied from this request
+    def merged_payload
+      merge_payload(template_payload)
+    end
+
+    # @return [String] - the current catalog template payload from VRA or custom payload set in JSON format
+    def template_payload
+      @template_payload ||= Vra::CatalogItem.dump_template(client, @catalog_id)
+    end
+
+    # @return [Vra::Request] - submits and returns the request, validating before hand
     def submit
       validate_params!
 
       begin
-        response = client.http_get("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests/template")
-        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", merge_payload(response.body))
+        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", merged_payload)
       rescue Vra::Exception::HTTPError => e
         raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
       rescue
         raise
       end
-
       request_id = JSON.parse(post_response.body)["id"]
       Vra::Request.new(client, request_id)
     end

data/lib/vra/request_parameters.rb

@@ -22,12 +22,18 @@ module Vra
       @entries = {}
     end
 
+    # @param key [String] - the name of the key
+    # @param value_data [Hash] - the data of the key name
+    # @note - the value_data must have type and value property in the hash
     def set_parameters(key, value_data, parent = nil)
-      if value_data.key?(:type)
+      value_type = value_data[:type] || value_data["type"]
+      data_value = value_data[:value] || value_data["value"]
+
+      if value_type
         if parent.nil?
-          set(key, value_data[:type], value_data[:value])
+          set(key, value_type, data_value)
         else
-          parent.add_child(Vra::RequestParameter.new(key, value_data[:type], value_data[:value]))
+          parent.add_child(Vra::RequestParameter.new(key, value_type, data_value))
         end
       else
         if parent.nil?

data/lib/vra/version.rb

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

data/spec/catalog_item_spec.rb

@@ -54,6 +54,31 @@ describe Vra::CatalogItem do
     }
   end
 
+  let(:other_catalog_item_payload) do
+    {
+        "@type" => "CatalogItem",
+        "id" => "3232323e-5443-4082-afd5-ab5a32939bbc",
+        "version" => 2,
+        "name" => "CentOS 6.6",
+        "description" => "Blueprint for deploying a CentOS Linux development server",
+        "status" => "PUBLISHED",
+        "statusName" => "Published",
+        "organization" => {
+            "tenantRef" => "vsphere.local",
+            "tenantLabel" => "vsphere.local",
+            "subtenantRef" => "962ab3f9-858c-4483-a49f-fa97392c314b",
+            "subtenantLabel" => "catalog_subtenant",
+        },
+        "providerBinding" => {
+            "bindingId" => "33af5413-4f20-4b3b-8268-32edad434dfb",
+            "providerRef" => {
+                "id" => "c3b2bc30-47b0-454f-b57d-df02a7356fe6",
+                "label" => "iaas-service",
+            },
+        },
+    }
+  end
+
   describe "#initialize" do
     it "raises an error if no ID or catalog item data have been provided" do
       expect { Vra::CatalogItem.new }.to raise_error(ArgumentError)
@@ -135,5 +160,124 @@ describe Vra::CatalogItem do
         expect(catalog_item.organization["tenantRef"]).to eq(nil)
       end
     end
+
+    describe "class methods" do
+      let(:response) { double("response", code: 200, body: catalog_item_payload.to_json) }
+
+      it "#dump_template" do
+        expect(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
+                              .and_return(response)
+        described_class.dump_template(client, catalog_id )
+      end
+
+      it "#write_template" do
+        allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
+                             .and_return(response)
+        expect(File).to receive(:write).with("9e98042e-5443-4082-afd5-ab5a32939bbc.json", JSON.pretty_generate(catalog_item_payload))
+        expect(described_class.write_template(client, catalog_id)).to eq("9e98042e-5443-4082-afd5-ab5a32939bbc.json")
+      end
+
+      it "#write_template with custom filename" do
+        allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
+                             .and_return(response)
+        expect(File).to receive(:write).with("somefile.json", JSON.pretty_generate(catalog_item_payload))
+        expect(described_class.write_template(client, catalog_id, "somefile.json")).to eq("somefile.json")
+      end
+
+      context "entitled items" do
+        let(:response2) { double("response", code: 200, body: other_catalog_item_payload.to_json) }
+
+        let(:entitled_catalog_item) do
+          {
+              "@type" => "ConsumerEntitledCatalogItem",
+              "catalogItem" => {
+                  "id" => "d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1",
+                  "version" => 2,
+                  "name" => "WindowsServer2012",
+                  "description" => "Windows Server 2012 with the latest updates and patches.",
+                  "status" => "PUBLISHED",
+                  "statusName" => "Published",
+                  "organization" => {
+                      "tenantRef" => "vsphere.local",
+                      "tenantLabel" => "vsphere.local",
+                      "subtenantRef" => nil,
+                      "subtenantLabel" => nil,
+                  },
+                  "providerBinding" => {
+                      "bindingId" => "59fd02a1-acca-4918-9d3d-2298d310caef",
+                      "providerRef" => {
+                          "id" => "c3b2bc30-47b0-454f-b57d-df02a7356fe6",
+                          "label" => "iaas-service",
+                      },
+                  },
+              },
+          }
+        end
+
+        let(:entitled_catalog_item2) do
+          {
+              "@type" => "ConsumerEntitledCatalogItem",
+              "catalogItem" => {
+                  "id" => "3232323e-5443-4082-afd5-ab5a32939bbc",
+                  "version" => 2,
+                  "name" => "WindowsServer2016",
+                  "description" => "Windows Server 2012 with the latest updates and patches.",
+                  "status" => "PUBLISHED",
+                  "statusName" => "Published",
+                  "organization" => {
+                      "tenantRef" => "vsphere.local",
+                      "tenantLabel" => "vsphere.local",
+                      "subtenantRef" => nil,
+                      "subtenantLabel" => nil,
+                  },
+                  "providerBinding" => {
+                      "bindingId" => "59fd02a1-acca-4918-9d3d-2298d310caef",
+                      "providerRef" => {
+                          "id" => "c3b2bc30-47b0-454f-b57d-df02a7356fe6",
+                          "label" => "iaas-service",
+                      },
+                  },
+              },
+          }
+        end
+
+        before(:each) do
+          allow(client).to receive(:http_get_paginated_array!).with("/catalog-service/api/consumer/entitledCatalogItems")
+                                .and_return([ entitled_catalog_item, entitled_catalog_item2 ])
+          allow(client).to receive(:http_get)
+                               .with("/catalog-service/api/consumer/entitledCatalogItems/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1/requests/template")
+                               .and_return(response)
+          allow(client).to receive(:http_get)
+                               .with("/catalog-service/api/consumer/entitledCatalogItems/3232323e-5443-4082-afd5-ab5a32939bbc/requests/template")
+                               .and_return(response)
+          allow(File).to receive(:write).with("vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json", JSON.pretty_generate(catalog_item_payload))
+          allow(File).to receive(:write).with("vra_templates/3232323e-5443-4082-afd5-ab5a32939bbc.json", JSON.pretty_generate(catalog_item_payload))
+          allow(File).to receive(:write).with("vra_templates/windowsserver2012.json", JSON.pretty_generate(catalog_item_payload))
+          allow(File).to receive(:write).with("vra_templates/windowsserver2016.json", JSON.pretty_generate(catalog_item_payload))
+          allow(File).to receive(:write).with("custom_dir/windowsserver2012.json", JSON.pretty_generate(catalog_item_payload))
+          allow(File).to receive(:write).with("custom_dir/windowsserver2016.json", JSON.pretty_generate(catalog_item_payload))
+
+        end
+
+        it "#dump_templates" do
+          expect(described_class.dump_templates(client)).to eq(["vra_templates/windowsserver2012.json",
+                                                                "vra_templates/windowsserver2016.json"])
+        end
+
+        it "#dump_templates with custom directory" do
+          expect(described_class.dump_templates(client, "custom_dir")).to eq(["custom_dir/windowsserver2012.json",
+                                                                              "custom_dir/windowsserver2016.json"])
+        end
+
+        it "#dump_templates with id" do
+          expect(described_class.dump_templates(client, "vra_templates", true))
+              .to eq(["vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json",
+                      "vra_templates/3232323e-5443-4082-afd5-ab5a32939bbc.json"])
+
+        end
+      end
+
+    end
+
   end
 end

data/spec/catalog_request_spec.rb

@@ -35,6 +35,50 @@ describe Vra::CatalogRequest do
                     base_url: "https://vra.corp.local")
   end
 
+  let(:catalog_item_payload) do
+    {
+        "@type" => "CatalogItem",
+        "id" => "9e98042e-5443-4082-afd5-ab5a32939bbc",
+        "version" => 2,
+        "name" => "CentOS 6.6",
+        "description" => "Blueprint for deploying a CentOS Linux development server",
+        "status" => "PUBLISHED",
+        "statusName" => "Published",
+        "organization" => {
+            "tenantRef" => "vsphere.local",
+            "tenantLabel" => "vsphere.local",
+            "subtenantRef" => "962ab3f9-858c-4483-a49f-fa97392c314b",
+            "subtenantLabel" => "catalog_subtenant",
+        },
+        "providerBinding" => {
+            "bindingId" => "33af5413-4f20-4b3b-8268-32edad434dfb",
+            "providerRef" => {
+                "id" => "c3b2bc30-47b0-454f-b57d-df02a7356fe6",
+                "label" => "iaas-service",
+            },
+        },
+        "requestedFor" => "me@me.com",
+        "data" => {
+            "_leaseDays" => "2",
+            "my_blueprint" => {
+            "componentTypeId" => "com.vmware.csp.component.cafe.composition",
+            "componentId" => nil,
+            "classId" => "Blueprint.Component.Declaration",
+            "typeFilter" => "",
+            "data" => {
+                "cpu" => "2",
+                "memory" => "4096",
+
+            },
+          },
+        },
+    }
+  end
+
+  let(:request_template_response) do
+    double("response", code: 200, body: catalog_item_payload.to_json)
+  end
+
   context "when no subtenant ID is provided" do
     let(:request) do
       client.catalog.request("catalog-12345",
@@ -152,58 +196,72 @@ describe Vra::CatalogRequest do
     end
 
     describe "#submit" do
+      let(:response) do
+        double("response", code: 200, body: { id: "12345678910" }.to_json)
+      end
+
       before do
         allow(request).to receive(:request_payload).and_return({})
-        response = double("response", location: "/requests/request-12345")
+        allow(client).to receive(:authorize!).and_return(true)
         allow(client).to receive(:http_post).with("/catalog-service/api/consumer/requests", "{}").and_return(response)
+        allow(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests/template")
+                             .and_return(request_template_response)
       end
 
-      it "calls http_post" do
-        skip "broken and needs to be updated per changes -JJ 2017-04-14"
-        expect(client).to receive(:http_post).with("/catalog-service/api/consumer/requests", "{}")
+      it "calls http_get template" do
+        expect(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests/template")
+                              .and_return(request_template_response)
+        allow(client).to receive(:http_post).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests", request.merged_payload).and_return(response)
+        request.submit
+      end
 
+      it "calls http_post" do
+        expect(client).to receive(:http_post).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests", request.merged_payload).and_return(response)
         request.submit
       end
 
-      it "returns a Vra::Request object" do
-        skip "broken and needs to be updated per changes -JJ 2017-04-14"
-        expect(request.submit).to be_an_instance_of(Vra::Request)
+      it "returns Vra::Request" do
+        allow(client).to receive(:http_post).with("/catalog-service/api/consumer/entitledCatalogItems/catalog-12345/requests", request.merged_payload).and_return(response)
+        expect(request.submit).to be_a(Vra::Request)
       end
     end
   end
 
-  let(:client_without_ssl) do
-    Vra::Client.new(username: "user@corp.local",
-                    password: "password",
-                    tenant: "tenant",
-                    base_url: "https://vra.corp.local",
-                    verify_ssl: false)
-  end
-
-  context "when ssl is not verified by the client" do
+  describe "merges payload" do
     let(:request) do
-      client_without_ssl.catalog.request("catalog-12345",
-                                         cpus: 2,
-                                         memory: 1024,
-                                         lease_days: 15,
-                                         requested_for: "tester@corp.local",
-                                         notes: "test notes",
-                                         subtenant_id: "user_subtenant")
+      client.catalog.request("catalog-12345",
+                             cpus: 2,
+                             memory: 1024,
+                             lease_days: 15,
+                             requested_for: "tester@corp.local",
+                             notes: "test notes")
+    end
+    before(:each) do
+      allow(Vra::CatalogItem).to receive(:dump_template).and_return({ data2: { key2: "value2" } }.merge(catalog_item_payload).to_json)
     end
 
-    describe do
-      it "passes verify_false to Vra::Http" do
-        skip "broken and needs to be updated per changes -JJ 2017-04-14"
-        allow(request.client).to receive(:authorized?).and_return(true)
-        expect(request.client.instance_variable_get("@verify_ssl")).to eq false
-
-        expect(Vra::Http).to receive(:execute).and_wrap_original do |_http, *args|
-          expect(*args).to include(verify_ssl: false)
-          double(location: "auth/request_id")
-        end
+    it "without catalog template" do
+      request.template_payload = { data2: { key1: "value1" } }.merge(catalog_item_payload).to_json
+      template = JSON.parse(request.merged_payload)
+      expect(template["data2"].keys).to_not include("key2")
+    end
 
-        request.submit
-      end
+    it "with catalog template" do
+      request.template_payload = nil
+      template = JSON.parse(request.merged_payload)
+      expect(template["data2"].keys).to include("key2")
     end
   end
+
+  it "creates request" do
+    payload_file = File.join(fixtures_dir, "catalog_request_template.json")
+    expect(Vra::CatalogRequest.request_from_payload(client, payload_file)).to be_a(Vra::CatalogRequest)
+  end
+
+  it "creates request with correct payload" do
+    payload_file = File.join(fixtures_dir, "catalog_request_template.json")
+    cr = Vra::CatalogRequest.request_from_payload(client, payload_file)
+    data = JSON.parse(cr.merged_payload)
+    expect(data["data"]["superduper_key"]).to eq("superduper_value")
+  end
 end

data/spec/client_spec.rb

@@ -27,6 +27,14 @@ describe Vra::Client do
                     base_url: "https://vra.corp.local")
   end
 
+  let(:client_without_ssl) do
+    Vra::Client.new(username: "user@corp.local",
+                    password: "password",
+                    tenant: "tenant",
+                    base_url: "https://vra.corp.local",
+                    verify_ssl: false)
+  end
+
   describe "#initialize" do
     it "calls validate_client_options!" do
       client = Vra::Client.allocate
@@ -206,6 +214,23 @@ describe Vra::Client do
       client.http_head(path)
     end
 
+    it "calls Vra::Http.execute with verify_ssl false" do
+      response   = double("response")
+      path       = "/test"
+      full_url   = "https://vra.corp.local/test"
+      headers    = { "Accept" => "application/json", "Content-Type" => "application/json" }
+      verify_ssl = false
+
+      allow(client_without_ssl).to receive(:authorize!)
+      expect(Vra::Http).to receive(:execute).with(method: :head,
+                                                  url: full_url,
+                                                  headers: headers,
+                                                  verify_ssl: verify_ssl)
+                               .and_return(response)
+
+      client_without_ssl.http_head(path)
+    end
+
     it "raises an HTTPNotFound on a 404 error" do
       allow(client).to receive(:authorize!)
       allow(Vra::Http).to receive(:execute)

data/spec/fixtures/catalog_request_template.json

@@ -0,0 +1,130 @@
+{
+  "type": "com.vmware.vcac.catalog.domain.request.CatalogItemProvisioningRequest",
+  "catalogItemId": "7c8275d6-1bd6-452a-97c4-d6c053e4baa4",
+  "requestedFor": "csummers@example.com",
+  "businessGroupId": "c0683388-6db2-4cb5-9033-b24d15ad3766",
+  "description": null,
+  "reasons": null,
+  "data": {
+    "superduper_key": "superduper_value",
+    "Existing_Network_1": {
+      "componentTypeId": "com.vmware.csp.component.cafe.composition",
+      "componentId": null,
+      "classId": "Blueprint.Component.Declaration",
+      "typeFilter": "LinuxDemo*Existing_Network_1",
+      "data": {
+        "_cluster": 1,
+        "_hasChildren": false,
+        "description": null,
+        "name": "Existing Network",
+        "networkname": "Existing Network",
+        "subnetmask": "255.255.255.0"
+      }
+    },
+    "vSphere-Linux": {
+      "componentTypeId": "com.vmware.csp.component.cafe.composition",
+      "componentId": null,
+      "classId": "Blueprint.Component.Declaration",
+      "typeFilter": "LinuxDemo*vSphere-Linux",
+      "data": {
+        "Cafe.Shim.VirtualMachine.MaxCost": 0,
+        "Cafe.Shim.VirtualMachine.MinCost": 0,
+        "_cluster": 1,
+        "_hasChildren": false,
+        "action": "FullClone",
+        "allow_storage_policies": false,
+        "archive_days": 0,
+        "blueprint_type": "1",
+        "cpu": 1,
+        "custom_properties": [],
+        "daily_cost": 0,
+        "datacenter_location": null,
+        "description": null,
+        "disks": [
+          {
+            "componentTypeId": "com.vmware.csp.iaas.blueprint.service",
+            "componentId": null,
+            "classId": "Infrastructure.Compute.Machine.MachineDisk",
+            "typeFilter": null,
+            "data": {
+              "capacity": 6,
+              "id": 0,
+              "initial_location": "",
+              "is_clone": false,
+              "label": "",
+              "storage_reservation_policy": "",
+              "userCreated": true,
+              "volumeId": 0
+            }
+          }
+        ],
+        "display_location": false,
+        "guest_customization_specification": null,
+        "lease_days": 0,
+        "machine_actions": [
+          "DESTROY",
+          "POWER_ON",
+          "CONNECT_RDP_SSH",
+          "REPROVISION",
+          "POWER_CYCLE",
+          "EXPIRE",
+          "SUSPEND",
+          "CONNECT_REMOTE_CONSOLE",
+          "CONNECT_USING_VDI"
+        ],
+        "machine_prefix": {
+          "componentId": null,
+          "classId": "Infrastructure.Compute.MachinePrefix",
+          "id": "Use group default"
+        },
+        "max_network_adapters": 0,
+        "max_per_user": 0,
+        "max_volumes": 60,
+        "memory": 4096,
+        "nics": [
+          {
+            "componentTypeId": "com.vmware.csp.iaas.blueprint.service",
+            "componentId": null,
+            "classId": "Infrastructure.Compute.Machine.Nic",
+            "typeFilter": null,
+            "data": {
+              "address": "",
+              "assignment_type": "DHCP",
+              "custom_properties": null,
+              "id": 0,
+              "load_balancing": "",
+              "network_profile": "Existing Network"
+            }
+          }
+        ],
+        "number_of_instances": 1,
+        "os_arch": "x86_64",
+        "os_distribution": null,
+        "os_type": "Linux",
+        "os_version": null,
+        "platform_name": "vsphere",
+        "platform_type": "virtual",
+        "property_groups": [
+          null
+        ],
+        "provisioning_workflow": {
+          "componentId": null,
+          "classId": "Infrastructure.Compute.ProvisioningWorkflow",
+          "id": "CloneWorkflow"
+        },
+        "reservation_policy": {
+          "componentId": null,
+          "classId": "Infrastructure.Reservation.Policy.ComputeResource",
+          "id": "None"
+        },
+        "security_groups": [],
+        "security_tags": [],
+        "source_machine": null,
+        "source_machine_external_snapshot": null,
+        "source_machine_name": "cbpcentos_63_x86",
+        "source_machine_vmsnapshot": null,
+        "storage": 6
+      }
+    }
+  }
+}

data/spec/spec_helper.rb

@@ -20,4 +20,11 @@
 require "vra"
 require "webmock/rspec"
 
+def fixtures_dir
+  @fixtures_dir ||= begin
+    base_dir = File.dirname(__FILE__)
+    File.join(base_dir, "fixtures")
+  end
+end
+
 WebMock.disable_net_connect!(allow_localhost: true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-30 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -172,6 +172,7 @@ files:
 - spec/catalog_request_spec.rb
 - spec/catalog_spec.rb
 - spec/client_spec.rb
+- spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
 - spec/fixtures/resource/no_ip_address.txt
@@ -216,6 +217,7 @@ test_files:
 - spec/catalog_request_spec.rb
 - spec/catalog_spec.rb
 - spec/client_spec.rb
+- spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
 - spec/fixtures/resource/no_ip_address.txt