vmware-vra 2.6.1 → 3.0.0

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.6.1
+  version: 3.0.0
 platform: ruby
 authors:
 - Adam Leff
 - JJ Asghar
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-07-31 00:00:00.000000000 Z
+date: 2022-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi-yajl
@@ -43,14 +43,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
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: github_changelog_generator
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +115,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '3.5'
 description: Client gem for interacting with VMware vRealize Automation.
 email:
 - jj@chef.io
@@ -148,30 +134,35 @@ files:
 - ".github/PULL_REQUEST_TEMPLATE.md"
 - ".gitignore"
 - ".rubocop.yml"
-- ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - lib/vra.rb
 - lib/vra/catalog.rb
+- lib/vra/catalog_base.rb
 - lib/vra/catalog_item.rb
-- lib/vra/catalog_request.rb
+- lib/vra/catalog_source.rb
+- lib/vra/catalog_type.rb
 - lib/vra/client.rb
+- lib/vra/deployment.rb
+- lib/vra/deployment_request.rb
+- lib/vra/deployments.rb
 - lib/vra/exceptions.rb
 - lib/vra/http.rb
 - lib/vra/request.rb
 - lib/vra/request_parameters.rb
-- lib/vra/requests.rb
 - lib/vra/resource.rb
-- lib/vra/resources.rb
 - lib/vra/version.rb
 - spec/catalog_item_spec.rb
-- spec/catalog_request_spec.rb
+- spec/catalog_source_spec.rb
 - spec/catalog_spec.rb
+- spec/catalog_type_spec.rb
 - spec/client_spec.rb
+- spec/deployment_request_spec.rb
+- spec/deployment_spec.rb
+- spec/deployments_spec.rb
 - spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
@@ -179,21 +170,28 @@ files:
 - spec/fixtures/resource/no_ip_address.txt
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/resource_response.json
+- spec/fixtures/resource/sample_catalog_item.json
+- spec/fixtures/resource/sample_catalog_item_2.json
+- spec/fixtures/resource/sample_catalog_source.json
+- spec/fixtures/resource/sample_catalog_type.json
+- spec/fixtures/resource/sample_dep_actions.json
+- spec/fixtures/resource/sample_dep_request.json
+- spec/fixtures/resource/sample_dep_resource.json
+- spec/fixtures/resource/sample_deployment.json
+- spec/fixtures/resource/sample_entitlements.json
 - spec/fixtures/resource/vm_properties.json
 - spec/fixtures/resource/vm_resource.json
 - spec/fixtures/resource/vm_resource_no_operations.json
 - spec/http_spec.rb
 - spec/request_spec.rb
-- spec/requests_spec.rb
 - spec/resource_spec.rb
-- spec/resources_spec.rb
 - spec/spec_helper.rb
 - vmware-vra.gemspec
 homepage: https://github.com/chef-partners/vmware-vra-gem
 licenses:
 - Apache 2.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -208,16 +206,19 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.2.32
+signing_key:
 specification_version: 4
 summary: Client gem for interacting with VMware vRealize Automation.
 test_files:
 - spec/catalog_item_spec.rb
-- spec/catalog_request_spec.rb
+- spec/catalog_source_spec.rb
 - spec/catalog_spec.rb
+- spec/catalog_type_spec.rb
 - spec/client_spec.rb
+- spec/deployment_request_spec.rb
+- spec/deployment_spec.rb
+- spec/deployments_spec.rb
 - spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
@@ -225,12 +226,19 @@ test_files:
 - spec/fixtures/resource/no_ip_address.txt
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/resource_response.json
+- spec/fixtures/resource/sample_catalog_item.json
+- spec/fixtures/resource/sample_catalog_item_2.json
+- spec/fixtures/resource/sample_catalog_source.json
+- spec/fixtures/resource/sample_catalog_type.json
+- spec/fixtures/resource/sample_dep_actions.json
+- spec/fixtures/resource/sample_dep_request.json
+- spec/fixtures/resource/sample_dep_resource.json
+- spec/fixtures/resource/sample_deployment.json
+- spec/fixtures/resource/sample_entitlements.json
 - spec/fixtures/resource/vm_properties.json
 - spec/fixtures/resource/vm_resource.json
 - spec/fixtures/resource/vm_resource_no_operations.json
 - spec/http_spec.rb
 - spec/request_spec.rb
-- spec/requests_spec.rb
 - spec/resource_spec.rb
-- spec/resources_spec.rb
 - spec/spec_helper.rb

data/.travis.yml

@@ -1,14 +0,0 @@
-language: ruby
-cache: bundler
-sudo: false
-rvm:
-- 2.3.1
-branches:
-  only:
-  - master
-notifications:
-  slack:
-    on_success: change
-    on_failure: always
-    rooms:
-      secure: SPX5JlKrlL3dpWUIRd/xxjId06D9OT7ig6qNlTH8bSoszw2t0QQ4X/m4iNmQ7ksMoqkvknc6y8HRVD7oJUgVYelBjZR+ayAdI+tlRvtU+CQdij+Xeamix3TwHgTWPzFmMoQl6zNkoLWRaXZ1DCRZi3/BPhXF0A9wGel4ToD6nBUe5chvvhWUltVFTxL0YmA537LWLqF+JyFWbr45Eo4EJXqo0i3Mz/1w1Ct7cDZjzIDsmPhchVYOdW1VA+rVC0oWiwGkx7KuX/QTs/D2XuL6xSRy/ftulgF+j/W8P3hgdjZaBlfm7UmEr/Df7nml8SXuo44hUB964EfLgTjg/EN8qYaZ9GhQ6xVuRuDGpoTc22kCUJqDWUFzlAbs/Og4qNP0FdZkofZPkvMG+C3JLwIKTDBNaG+DO+/19UZpcofPouQ5UOolFCkZcCwdMBHg2AecWFd4yMJ68giKd/zPdN/+ALxxK1RrOyk8JecvpolN/lhjnmR+zktJXaUikCzK3Zr2f2hXMVXULiGkMw5IRwiMor7nCIEBW5FqNP6mhV8JIDQguyLXy2wfCUBauhDR2VkV4pEFCCdRu+uPW8C80R1B3JmZn7q2KcX0WfsSoAntZh5ZedAXW+YoUKSnZR/X6RpxvRi/VSaX529BkyU07S52mS2xNW1HWgY2/laShHtMaAM=

data/Jenkinsfile

@@ -1,31 +0,0 @@
-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/lib/vra/catalog_request.rb

@@ -1,126 +0,0 @@
-# frozen_string_literal: true
-#
-# Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# 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, :template_payload
-
-    def initialize(client, catalog_id, opts = {})
-      @client            = client
-      @catalog_id        = catalog_id
-      @cpus              = opts[:cpus]
-      @memory            = opts[:memory]
-      @requested_for     = opts[:requested_for]
-      @lease_days        = opts[:lease_days]
-      @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
-
-    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.to_vra
-    end
-
-    def subtenant_id
-      @subtenant_id || catalog_item.subtenant_id
-    end
-
-    def validate_params!
-      missing_params = []
-      [ :catalog_id, :cpus, :memory, :requested_for, :subtenant_id ].each do |param|
-        missing_params << param.to_s if send(param).nil?
-      end
-
-      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
-    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
-        post_response = client.http_post("/catalog-service/api/consumer/entitledCatalogItems/#{@catalog_id}/requests", template_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
-  end
-end

data/lib/vra/requests.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-#
-# Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-module Vra
-  class Requests
-    def initialize(client)
-      @client = client
-    end
-
-    def all_requests
-      requests = []
-
-      items = @client.http_get_paginated_array!("/catalog-service/api/consumer/requests")
-      items.each do |item|
-        requests << Vra::Request.new(@client, item["id"])
-      end
-
-      requests
-    end
-
-    def by_id(id)
-      Vra::Request.new(@client, id)
-    end
-  end
-end

data/spec/catalog_request_spec.rb

@@ -1,267 +0,0 @@
-# frozen_string_literal: true
-#
-# Author:: Chef Partner Engineering (<partnereng@chef.io>)
-# Copyright:: Copyright (c) 2015 Chef Software, Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-require "spec_helper"
-
-describe Vra::CatalogRequest do
-  before(:each) do
-    catalog_item = double("catalog_item")
-    allow(catalog_item).to receive(:blueprint_id).and_return("catalog_blueprint")
-    allow(catalog_item).to receive(:tenant_id).and_return("catalog_tenant")
-    allow(catalog_item).to receive(:subtenant_id).and_return("catalog_subtenant")
-    allow(Vra::CatalogItem).to receive(:new).and_return(catalog_item)
-  end
-
-  let(:client) do
-    Vra::Client.new(username: "user@corp.local",
-                    password: "password",
-                    tenant: "tenant",
-                    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",
-                             cpus: 2,
-                             memory: 1024,
-                             lease_days: 15,
-                             requested_for: "tester@corp.local",
-                             notes: "test notes")
-    end
-
-    it "uses the subtenant ID from the catalog item" do
-      expect(request.subtenant_id).to eq "catalog_subtenant"
-    end
-  end
-
-  context "when subtenant is provided, and all shared tests" do
-    let(:request) do
-      client.catalog.request("catalog-12345",
-                             cpus: 2,
-                             memory: 1024,
-                             lease_days: 15,
-                             requested_for: "tester@corp.local",
-                             notes: "test notes",
-                             subtenant_id: "user_subtenant")
-    end
-
-    describe "#initialize" do
-      it "sets the appropriate instance vars" do
-        expect(request.catalog_id).to eq "catalog-12345"
-        expect(request.cpus).to eq 2
-        expect(request.memory).to eq 1024
-        expect(request.lease_days).to eq 15
-        expect(request.requested_for).to eq "tester@corp.local"
-        expect(request.notes).to eq "test notes"
-        expect(request.subtenant_id).to eq "user_subtenant"
-      end
-    end
-
-    describe "#validate_params!" do
-      context "when all required params are provided" do
-        it "does not raise an exception" do
-          expect { request.validate_params! }.to_not raise_error
-        end
-      end
-
-      context "when a required parameter is not provided" do
-        it "raises an exception" do
-          request.cpus = nil
-          expect { request.validate_params! }.to raise_error(ArgumentError)
-        end
-      end
-    end
-
-    describe "#merge_payload" do
-      it "properly handles additional parameters" do
-        request.set_parameter("param1", "string", "my string")
-        request.set_parameter("param2", "integer", "2468")
-
-        template = File.read("spec/fixtures/resource/catalog_request.json")
-        payload = JSON.parse(request.merge_payload(template))
-        param1 = payload["data"]["param1"]
-        param2 = payload["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 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
-
-    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({})
-        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_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 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
-
-  describe "merges payload" do
-    let(:request) do
-      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
-
-    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
-
-    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