vmware-vra 2.5.2 → 2.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 46c1f1139cc3262cb936510213d4ed55932ff3f5
-  data.tar.gz: 93721afaaea8f983f84354539905fb49d0eec847
+SHA256:
+  metadata.gz: 748935ab6ce2c1922e5ffded2a7d2567709308e4c62bfe81d15d22b71a186508
+  data.tar.gz: 95b4943dc8f6015055e4a7c142115a8f555072c79244c4a62fed2e0e1862c8ac
 SHA512:
-  metadata.gz: 69fdf73780e7c7550e9a407ca87c2629a64f1be419ee597af5f03bab5f4f88306c7dde6c2b1725442a3e027193735a2904cc8b3a31b499c51d2278dabaf03500
-  data.tar.gz: a92954fae6a63da0ee4cf1cce76a1934507e06edda6e9219f7e914aa431e49358fa9f2f999ae43fb34edd28b0cadf0a4a19474981e4e40c58461f98bebcf8972
+  metadata.gz: 4b244e271a780513e497356114eff2ca721cf7fe2665d1fe6cbb10a500284b7702b53679a3c3aa19bd18727f6064ee6f2cb17fe38e5685e29716667b4d3cf25f
+  data.tar.gz: 8f1bd967dc41e4ed9363ae6404c402bdbb4524689d05d86a37c56e1d86f31efa374018108c5ebeef582972d15151391a25c7856621f0eeca33331c84b3846c3c

data/.travis.yml

@@ -2,7 +2,7 @@ language: ruby
 cache: bundler
 sudo: false
 rvm:
-- 2.3.1
+- 2.6.3
 branches:
   only:
   - master

data/CHANGELOG.md

@@ -1,14 +1,65 @@
 # Change Log
 
-## [2..5.2] (https://github.com/chef-partners/vmware-vra-gem/tree/2.5.2) (2018-01-04)
-[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.1...2.5.2)
+## [2.7.2](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.2) (2020-09-09)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.7.1...v2.7.2)
 
-**Enhanced:**
+- Added an extra option to handle shirt size parameter
+- Masking user credentials(password) in debug mode
 
-- Added a method to retrive catalog id from  catalog name
+## [2.7.1](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.1) (2019-05-28)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.7.0...v2.7.1)
 
-## [2.5.1](https://github.com/chef-partners/vmware-vra-gem/tree/2.5.1) (2017-10-19)
-[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.0...2.5.1)
+**Closed issues:**
+
+- Some Extra Parameters are not passing through to VRA [\#75](https://github.com/chef-partners/vmware-vra-gem/issues/75)
+
+**Merged pull requests:**
+
+- Add support for boolean vRA parameters, fix deep merge, add tracing [\#76](https://github.com/chef-partners/vmware-vra-gem/pull/76) ([stuartpreston](https://github.com/stuartpreston))
+
+## [2.7.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.7.0) (2019-05-10)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.1...v2.7.0)
+
+**Closed issues:**
+
+- Extra Parameters Not Being Sent to vRA [\#73](https://github.com/chef-partners/vmware-vra-gem/issues/73)
+
+**Merged pull requests:**
+
+- vRA7 multiple fixes for nested, non-nested and merged parameters for a Blueprint [\#74](https://github.com/chef-partners/vmware-vra-gem/pull/74) ([stuartpreston](https://github.com/stuartpreston))
+
+## [2.6.1](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.1) (2018-07-31)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.6.0...2.6.1)
+
+**Closed issues:**
+
+- Vra::Resource\#ip\_addresses non-deterministically returns an empty array in error [\#65](https://github.com/chef-partners/vmware-vra-gem/issues/65)
+
+**Merged pull requests:**
+
+- Removed the deep merge [\#68](https://github.com/chef-partners/vmware-vra-gem/pull/68) ([jjasghar](https://github.com/jjasghar))
+
+## [v2.6.0](https://github.com/chef-partners/vmware-vra-gem/tree/v2.6.0) (2018-03-01)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.2...v2.6.0)
+
+**Closed issues:**
+
+- undefined method `\[\]' for nil:NilClass if data for json content is of single entity [\#55](https://github.com/chef-partners/vmware-vra-gem/issues/55)
+
+**Merged pull requests:**
+
+- Accept subtenant name as input in kitchen.yml [\#67](https://github.com/chef-partners/vmware-vra-gem/pull/67) ([vinuphilip](https://github.com/vinuphilip))
+- Lgustafson/fix 65 [\#66](https://github.com/chef-partners/vmware-vra-gem/pull/66) ([lgustafson](https://github.com/lgustafson))
+
+## [v2.5.2](https://github.com/chef-partners/vmware-vra-gem/tree/v2.5.2) (2018-01-22)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.1...v2.5.2)
+
+**Merged pull requests:**
+
+- Added a method to retrieve catalog id's from catalog name [\#64](https://github.com/chef-partners/vmware-vra-gem/pull/64) ([rupeshpatel88](https://github.com/rupeshpatel88))
+
+## [v2.5.1](https://github.com/chef-partners/vmware-vra-gem/tree/v2.5.1) (2017-10-19)
+[Full Changelog](https://github.com/chef-partners/vmware-vra-gem/compare/v2.5.0...v2.5.1)
 
 **Merged pull requests:**
 

data/README.md

@@ -78,7 +78,15 @@ vra.catalog.fetch_catalog_items('my_catalog_name')
 
 vRA requires your sub-tenant (a.k.a. "business group") to be specified when requesting an item from the catalog. If the catalog item you are requesting is specifically created for a given business group, the gem will use that ID automatically without you needing to specify it.
 
-However, if there is no sub-tenant ID available for us to use, you will receive an error when you submit:
+An easier option has been provided to end user to provide a friendly sub-tenant name instead of sub-tenant id, and the driver would take care of retrieving the sub-tenant id for the corresponding sub-tenant name. Tenant name is also required along with sub-tenant name to retrieve sub-tenant id. 
+
+To retrieve sub-tenant id from sub-tenant name:
+
+```
+vra.fetch_subtenant_items('my_tenant', 'my_subtenant_name')
+```
+
+However, if there is no sub-tenant ID or sub-tenant name available for us to use, you will receive an error when you submit:
 
 ```
 request = catalog_request.submit
@@ -154,6 +162,7 @@ request_options = {
 # create the request
 catalog_request = vra.catalog.request(blueprint, request_options)
 ```
+In the above option instead of cpus and memory, shirt_size can be used as well if the blueprint has shirt size option enabled. e.g. of shirt size can be like value.small, value.medium etc, 
 
 Now, submit your request!  The client will return a new "Request" object you can use to query for status.
 
@@ -288,6 +297,20 @@ vra = Vra::Client.new(username: 'devmgr@corp.local', password: 'mypassword', ten
 client.page_size = 100
 ```
 
+### Debugging
+
+To aid diagnosis of deep API issues, set the following environment variable to enable logging of all API requests. Note that this will include requests to retrieve the bearer token.
+
+MacOS/Linux:
+```ruby
+export VRA_HTTP_TRACE=1
+```
+
+Windows:
+```powershell
+$env:VRA_HTTP_TRACE=1
+```
+
 ## License and Authors
 
 Author:: Chef Partner Engineering (<partnereng@chef.io>)

data/Rakefile

@@ -20,4 +20,4 @@ rescue LoadError
   puts "github_changelog_generator is not available. gem install github_changelog_generator to generate changelogs"
 end
 
-task default: [ :spec, :rubocop ]
+task default: %i{spec rubocop}

data/lib/vra/catalog.rb

@@ -27,12 +27,12 @@ module Vra
 
     def all_items
       client.http_get_paginated_array!("/catalog-service/api/consumer/catalogItems")
-            .map! { |x| Vra::CatalogItem.new(client, data: x) }
+        .map! { |x| Vra::CatalogItem.new(client, data: x) }
     end
 
     def entitled_items
       client.http_get_paginated_array!("/catalog-service/api/consumer/entitledCatalogItems")
-            .map! { |x| Vra::CatalogItem.new(client, data: x["catalogItem"]) }
+        .map! { |x| Vra::CatalogItem.new(client, data: x["catalogItem"]) }
     end
 
     def request(*args)

data/lib/vra/catalog_item.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "vra/catalog"
 
 module Vra
@@ -107,7 +107,7 @@ module Vra
         data = JSON.parse(contents)
         pretty_contents = JSON.pretty_generate(data)
         File.write(filename, pretty_contents)
-        return filename
+        filename
       rescue Vra::Exception::HTTPError => e
         raise e
       end

data/lib/vra/catalog_request.rb

@@ -18,17 +18,25 @@
 #
 require "vra/catalog_item"
 
+class ::Hash
+  def deep_merge(second)
+    merger = proc { |key, v1, v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
+    merge(second, &merger)
+  end
+end
+
 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
+    attr_writer :subtenant_id, :template_payload
+    attr_accessor :cpus, :memory, :shirt_size, :requested_for, :lease_days, :notes
 
     def initialize(client, catalog_id, opts = {})
       @client            = client
       @catalog_id        = catalog_id
       @cpus              = opts[:cpus]
       @memory            = opts[:memory]
+      @shirt_size        = opts[:shirt_size]
       @requested_for     = opts[:requested_for]
       @lease_days        = opts[:lease_days]
       @notes             = opts[:notes]
@@ -48,6 +56,7 @@ module Vra
       opts = {}
       opts[:cpus] = blueprint_data["data"]["cpu"]
       opts[:memory] = blueprint_data["data"]["memory"]
+      opts[:shirt_size] = blueprint_data["data"]["size"]
       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"]
@@ -79,11 +88,11 @@ module Vra
 
     def validate_params!
       missing_params = []
-      [ :catalog_id, :cpus, :memory, :requested_for, :subtenant_id ].each do |param|
+      %i{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?
+      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
@@ -93,10 +102,12 @@ module Vra
       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["data"][blueprint_name]["data"]["size"] = @shirt_size
       hash_payload["requestedFor"] = @requested_for
       hash_payload["data"]["_leaseDays"] = @lease_days
       hash_payload["description"] = @notes
-      JSON.pretty_generate(deep_merge(hash_payload, parameters))
+      hash_payload["data"] = hash_payload["data"].deep_merge(parameters["data"]) unless parameters.empty?
+      hash_payload.to_json
     end
 
     # @return [String] - the current catalog template payload merged with the settings applied from this request
@@ -112,33 +123,15 @@ module Vra
     # @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", merged_payload)
       rescue Vra::Exception::HTTPError => e
-        raise Vra::Exception::RequestError, "Unable to submit request: #{e.errors.join(', ')}"
+        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
-
-    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/client.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 require "passwordmasker"
 require "vra/http"
 
@@ -71,7 +71,7 @@ module Vra
       {
         "username" => @username,
         "password" => @password.value,
-        "tenant"   => @tenant,
+        "tenant" => @tenant,
       }
     end
 
@@ -154,6 +154,7 @@ module Vra
         items += response["content"]
 
         break if page >= response["metadata"]["totalPages"]
+
         page += 1
       end
 
@@ -218,5 +219,10 @@ module Vra
     rescue URI::InvalidURIError
       false
     end
+
+    def fetch_subtenant_items(tenant, subtenant_name)
+      http_get("/identity/api/tenants/#{tenant}/subtenants?%24filter=name+eq+'#{subtenant_name}'")
+    end
+
   end
 end

data/lib/vra/exceptions.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   module Exception

data/lib/vra/http.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
-require "net/http"
-require "openssl"
+require "net/http" unless defined?(Net::HTTP)
+require "openssl" unless defined?(OpenSSL)
 
 module Vra
   module Http
@@ -8,7 +8,13 @@ module Vra
       request = Request.new(params)
       response = request.call
       response = response.forward(request).call until response.final?
+      if ENV["VRA_HTTP_TRACE"]
+        puts "#{request.params[:method].upcase} #{request.params[:url]}" unless request.params.nil?
+        puts ">>>>> #{JSON.parse(request.params[:payload]).to_json.gsub(/\"password\":\"(.+)\",/, '"password":"********",' )}" unless request.params[:payload].nil?
+        puts "<<<<< #{JSON.parse(response.body).to_json}" unless response.body.nil?
+      end
       raise error(response) unless response.success?
+
       response
     end
 
@@ -24,7 +30,7 @@ module Vra
       end
 
       def redirectable?
-        [:get, :head].include?(params[:method])
+        %i{get head}.include?(params[:method])
       end
 
       def redirect_to(location)
@@ -70,6 +76,7 @@ module Vra
 
       def verify_ssl?
         return true if params[:verify_ssl].nil?
+
         params[:verify_ssl]
       end
     end
@@ -84,6 +91,7 @@ module Vra
       def forward(request)
         if redirect?
           raise Http.error(self) unless request.redirectable?
+
           request.redirect_to(location)
         elsif see_other?
           request.see_other(location)

data/lib/vra/request.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   class Request

data/lib/vra/request_parameters.rb

@@ -51,7 +51,7 @@ module Vra
 
     def set(key, type, value)
       if key.to_s.include? "~"
-        split_key = key.split("~")
+        split_key = key.to_s.split("~")
         parent = nil
         split_key.each_with_index do |item, index|
           if index == 0
@@ -135,7 +135,6 @@ module Vra
 
     def to_vra
       hash = {}
-
       if @children.count > 0
         hash[@key] = {}
 
@@ -148,7 +147,7 @@ module Vra
         hash[@key] = format_value
       end
 
-      hash
+      hash.each_with_object({}) { |(key, value), h| h[key.to_s] = value }
     end
 
     def format_value
@@ -157,6 +156,8 @@ module Vra
         @value.to_i
       when "string"
         @value
+      when "boolean"
+        @value.to_s == "true"
       else
         @value
       end

data/lib/vra/resource.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require "ffi_yajl"
+require "ffi_yajl" unless defined?(FFI_Yajl)
 
 module Vra
   class Resource
@@ -50,6 +50,7 @@ module Vra
     def self.by_name(client, name)
       raise ArgumentError.new("name cannot be nil") if name.nil?
       raise ArgumentError.new("client cannot be nil") if client.nil?
+
       Resources.all(client).find { |r| r.name.downcase =~ /#{name.downcase}/ }
     end
 
@@ -172,27 +173,24 @@ module Vra
 
       request_id = @resource_data["requestId"]
 
-      resource_views = @client.http_get("/catalog-service/api/consumer/requests/#{request_id}/resourceViews")
-
-      data_zero = JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"]
-      data_one = JSON.parse(resource_views.body)["content"][1]["data"]["ip_address"]
-
       print "Waiting For vRA to collect the IP"
-      while (data_zero == "" || data_one == "") && (data_zero.nil? || data_one.nil?)
+
+      loop do
         resource_views = @client.http_get("/catalog-service/api/consumer/requests/#{request_id}/resourceViews")
-        data_zero = JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"]
-        data_one = JSON.parse(resource_views.body)["content"][1]["data"]["ip_address"]
+
+        JSON.parse(resource_views.body)["content"].each do |content|
+          if content.key?("data") &&
+              !(content["data"]["ip_address"].nil? ||
+                content["data"]["ip_address"] == "")
+            addrs << content["data"]["ip_address"]
+          end
+        end
+
+        break unless addrs.empty?
+
         sleep 10
-        print "."
       end
 
-      ip_address = if JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"].nil?
-                     JSON.parse(resource_views.body)["content"][1]["data"]["ip_address"]
-                   else
-                     JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"]
-                   end
-
-      addrs << ip_address
       addrs
     end
 

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = "2.5.2"
+  VERSION = "2.7.2"
 end

data/spec/catalog_item_spec.rb

@@ -166,20 +166,20 @@ describe Vra::CatalogItem do
 
       it "#dump_template" do
         expect(client).to receive(:http_get).with("/catalog-service/api/consumer/entitledCatalogItems/#{catalog_id}/requests/template")
-                              .and_return(response)
+          .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)
+          .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)
+          .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
@@ -243,13 +243,13 @@ describe Vra::CatalogItem do
 
         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 ])
+            .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)
+            .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)
+            .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))
@@ -271,7 +271,7 @@ describe Vra::CatalogItem do
 
         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",
+            .to eq(["vra_templates/d29efd6b-3cd6-4f8d-b1d8-da4ddd4e52b1.json",
                       "vra_templates/3232323e-5443-4082-afd5-ab5a32939bbc.json"])
 
         end

data/spec/catalog_request_spec.rb

@@ -136,16 +136,18 @@ describe Vra::CatalogRequest do
       it "properly handles additional parameters" do
         request.set_parameter("param1", "string", "my string")
         request.set_parameter("param2", "integer", "2468")
+        request.set_parameter("param3", "boolean", "true")
 
         template = File.read("spec/fixtures/resource/catalog_request.json")
         payload = JSON.parse(request.merge_payload(template))
         param1 = payload["data"]["param1"]
         param2 = payload["data"]["param2"]
-
+        param3 = payload["data"]["param3"]
         expect(param1).to be_a(String)
         expect(param2).to be_a(Integer)
         expect(param1).to eq "my string"
         expect(param2).to eq 2468
+        expect(param3).to be_truthy
       end
 
       it "properly handles additional nested parameters" do
@@ -156,7 +158,6 @@ describe Vra::CatalogRequest do
         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"
@@ -205,12 +206,12 @@ describe Vra::CatalogRequest do
         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)
+          .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)
+          .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

data/spec/client_spec.rb

@@ -133,7 +133,7 @@ describe Vra::Client do
     payload = {
       "username" => "user@corp.local",
       "password" => "password",
-      "tenant"   => "tenant",
+      "tenant" => "tenant",
     }.to_json
 
     it "posts to the tokens API endpoint" do
@@ -226,7 +226,7 @@ describe Vra::Client do
                                                   url: full_url,
                                                   headers: headers,
                                                   verify_ssl: verify_ssl)
-                               .and_return(response)
+        .and_return(response)
 
       client_without_ssl.http_head(path)
     end
@@ -399,7 +399,7 @@ describe Vra::Client do
 
         unverified_client.http_post("/path", "payload")
 
-        [:head, :get].each do |method|
+        %i{head get}.each do |method|
           unverified_client.http_fetch(method, "/test", true)
         end
       end

data/spec/fixtures/resource/ip_address_third_element.txt

@@ -0,0 +1 @@
+{"links":[],"content":[{"@type":"CatalogResourceView","links":[{"@type":"link","rel":"GET: Catalog Item","href":"https://vra71.tirefi.re/catalog-service/api/consumer/entitledCatalogItemViews/2d6d5481-ebb0-4bdc-8af9-b75043a86386"},{"@type":"link","rel":"GET: Request","href":"https://vra71.tirefi.re/catalog-service/api/consumer/requests/bcd175ac-1c02-4a00-b4c8-fa585f23fd2d"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.changelease.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/c3595f52-e35a-448c-8409-7ce0c554cfba/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.changelease.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/c3595f52-e35a-448c-8409-7ce0c554cfba/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.changeowner.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/00f03ade-3850-40c8-93b8-4b093b5bf7c4/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.changeowner.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/00f03ade-3850-40c8-93b8-4b093b5bf7c4/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.destroy.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/306fbd9b-7129-405a-8c07-fedf32585f3d/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.destroy.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/306fbd9b-7129-405a-8c07-fedf32585f3d/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.archive.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/e5759af9-56d8-4598-ab7f-4ca6d45bd385/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.archive.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/e5759af9-56d8-4598-ab7f-4ca6d45bd385/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.scalein.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/6b358c70-ac66-4634-951b-73ab4e36c78d/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.scalein.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/6b358c70-ac66-4634-951b-73ab4e36c78d/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.cafe.composition@resource.action.deployment.scaleout.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/2c50de13-d5aa-4958-9af9-d2451675a2b3/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.cafe.composition@resource.action.deployment.scaleout.name}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/700f9e3c-c7bd-41d7-9683-5d3051a8e238/actions/2c50de13-d5aa-4958-9af9-d2451675a2b3/requests"},{"@type":"link","rel":"GET: Child Resources","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resourceViews?managedOnly=false&withExtendedData=true&withOperations=true&%24filter=parentResource%20eq%20%27700f9e3c-c7bd-41d7-9683-5d3051a8e238%27"}],"resourceId":"700f9e3c-c7bd-41d7-9683-5d3051a8e238","iconId":"composition.blueprint.png","name":"test-66303366","description":null,"status":null,"catalogItemId":"2d6d5481-ebb0-4bdc-8af9-b75043a86386","catalogItemLabel":"test","requestId":"bcd175ac-1c02-4a00-b4c8-fa585f23fd2d","resourceType":"composition.resource.type.deployment","owners":["vRA Admin"],"businessGroupId":"d0fb4a04-7099-4ba1-a262-b578e129a758","tenantId":"vsphere.local","dateCreated":"2016-12-01T19:59:55.000Z","lastUpdated":"2016-12-01T20:05:03.086Z","lease":{"start":"2016-12-01T19:59:54.988Z"},"costs":null,"costToDate":null,"totalCost":null,"parentResourceId":null,"hasChildren":true,"data":{}},{"@type":"CatalogResourceView","links":[{"@type":"link","rel":"GET: Request","href":"https://vra71.tirefi.re/catalog-service/api/consumer/requests/bcd175ac-1c02-4a00-b4c8-fa585f23fd2d"},{"@type":"link","rel":"GET: Parent Resource","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resourceViews/700f9e3c-c7bd-41d7-9683-5d3051a8e238"}],"resourceId":"a1337573-c379-4f40-aaec-ce81c0c16ce6","iconId":"existing_network","name":"VMNetwork","description":null,"status":null,"catalogItemId":null,"catalogItemLabel":null,"requestId":"bcd175ac-1c02-4a00-b4c8-fa585f23fd2d","resourceType":"Infrastructure.Network.Network.Existing","owners":["vRA Admin"],"businessGroupId":"d0fb4a04-7099-4ba1-a262-b578e129a758","tenantId":"vsphere.local","dateCreated":"2018-02-22T20:23:11.203Z","lastUpdated":"2018-02-22T20:30:09.724Z","lease":{"start":"2018-02-22T20:22:50.171Z","end":"2018-02-24T20:22:50.171Z"},"costs":null,"costToDate":null,"totalCost":null,"parentResourceId":"700f9e3c-c7bd-41d7-9683-5d3051a8e238","hasChildren":false,"data":{"Description":" ","Name":"VMNetwork","_hasChildren":false,"_leaseDays":2,"_number_of_instances":1,"cpu":"1","dns":{"componentTypeId":"com.vmware.csp.iaas.blueprint.service","componentId":null,"classId":"Infrastructure.Network.Network.DnsWins","typeFilter":null,"data":{"alternate_wins":null,"dns_search_suffix":"bogus.invalid","dns_suffix":"bogus.invalid","preferred_wins":null,"primary_dns":"172.16.20.50","secondary_dns":"172.16.20.51"}},"gateway":"172.16.20.1","ip_ranges":[{"componentTypeId":"com.vmware.csp.iaas.blueprint.service","componentId":null,"classId":"Infrastructure.Network.Network.IpRanges","typeFilter":null,"data":{"description":"","end_ip":"172.16.20.200","id":"51ca3210-5e10-4f03-a5a0-02daa701ca36","name":"VMNetwork","start_ip":"172.16.20.10"}}],"memory":"2048","network_profile":"VM Network","providerBindingId":"test","subnet_mask":"255.255.255.0"}},{"@type":"CatalogResourceView","links":[{"@type":"link","rel":"GET: Request","href":"https://vra71.tirefi.re/catalog-service/api/consumer/requests/bcd175ac-1c02-4a00-b4c8-fa585f23fd2d"},{"@type":"link","rel":"GET: Parent Resource","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resourceViews/700f9e3c-c7bd-41d7-9683-5d3051a8e238"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.ChangeLease}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/6bfd31da-dc94-4b3d-9d11-a76ca6466fee/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.ChangeLease}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/6bfd31da-dc94-4b3d-9d11-a76ca6466fee/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.window.ConnectViaVmrc.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/beeea7b5-b75c-46ab-b3f7-92e87419d025/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.window.ConnectViaVmrc.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/beeea7b5-b75c-46ab-b3f7-92e87419d025/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.noform.ConnectViaRdp.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/33b4eb4b-1602-4d1e-802b-41c54f56b97c/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.noform.ConnectViaRdp.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/33b4eb4b-1602-4d1e-802b-41c54f56b97c/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.nowindow.ConnectViaNativeVmrc.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/39fb6669-f224-45ed-9b48-4a48a828f10a/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@csp.places.iaas.item.nowindow.ConnectViaNativeVmrc.label}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/39fb6669-f224-45ed-9b48-4a48a828f10a/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.virtual.CreateSnapshot}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/ef01fe39-132d-4800-85b5-987a345202b2/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.virtual.CreateSnapshot}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/ef01fe39-132d-4800-85b5-987a345202b2/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.virtual.Destroy}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/4a0cfa3b-b686-43c7-9b31-600b99812b15/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.virtual.Destroy}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/4a0cfa3b-b686-43c7-9b31-600b99812b15/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Expire}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/5b0f7c6a-0bf1-497f-ab10-d0536ff0cdde/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Expire}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/5b0f7c6a-0bf1-497f-ab10-d0536ff0cdde/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.InstallTools}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/7bdb5a37-5a18-4365-bc4a-f1bba27df5f7/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.InstallTools}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/7bdb5a37-5a18-4365-bc4a-f1bba27df5f7/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reset}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/7b6538e2-6eec-4618-bc92-7aafaf9f147e/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reset}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/7b6538e2-6eec-4618-bc92-7aafaf9f147e/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.PowerOff}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/1f9ffa9a-b5cf-4337-b097-6c4dc0bd52b7/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.PowerOff}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/1f9ffa9a-b5cf-4337-b097-6c4dc0bd52b7/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reboot}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/37e2bb8f-ab3c-4e4c-854b-71f85c1db9ee/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reboot}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/37e2bb8f-ab3c-4e4c-854b-71f85c1db9ee/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reconfigure}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/14af2ac6-827d-4854-a797-fe2b587bc968/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reconfigure}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/14af2ac6-827d-4854-a797-fe2b587bc968/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reprovision}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/eed48ad5-3e8e-41f2-a206-75ae79041779/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Reprovision}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/eed48ad5-3e8e-41f2-a206-75ae79041779/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Shutdown}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/a4fd65a6-8abc-493e-8315-3345b673366f/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Shutdown}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/a4fd65a6-8abc-493e-8315-3345b673366f/requests"},{"@type":"link","rel":"GET Template: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Suspend}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/e1bdb142-1136-40a8-b49e-84ac5d3ed0b1/requests/template"},{"@type":"link","rel":"POST: {com.vmware.csp.component.iaas.proxy.provider@resource.action.name.machine.Suspend}","href":"https://vra71.tirefi.re/catalog-service/api/consumer/resources/3bf23388-38fb-44ef-ab1e-325ad1a1c582/actions/e1bdb142-1136-40a8-b49e-84ac5d3ed0b1/requests"}],"resourceId":"3bf23388-38fb-44ef-ab1e-325ad1a1c582","iconId":"Infrastructure.CatalogItem.Machine.Virtual.vSphere","name":"vra7-32","description":null,"status":"On","catalogItemId":null,"catalogItemLabel":null,"requestId":"bcd175ac-1c02-4a00-b4c8-fa585f23fd2d","resourceType":"Infrastructure.Virtual","owners":["vRA Admin"],"businessGroupId":"d0fb4a04-7099-4ba1-a262-b578e129a758","tenantId":"vsphere.local","dateCreated":"2016-12-01T20:03:59.946Z","lastUpdated":"2016-12-01T20:05:03.086Z","lease":{"start":"2016-12-01T19:59:54.988Z"},"costs":null,"costToDate":null,"totalCost":null,"parentResourceId":"700f9e3c-c7bd-41d7-9683-5d3051a8e238","hasChildren":false,"data":{"ChangeLease":true,"ChangeOwner":true,"Component":"vSphere_Machine_1","ConnectViaNativeVmrc":true,"ConnectViaRdp":true,"ConnectViaVmrc":true,"CreateSnapshot":true,"DISK_VOLUMES":[{"componentTypeId":"com.vmware.csp.component.iaas.proxy.provider","componentId":null,"classId":"dynamicops.api.model.DiskInputModel","typeFilter":null,"data":{"DISK_CAPACITY":28,"DISK_INPUT_ID":"DISK_INPUT_ID1","DISK_LABEL":"Hard disk 1"}}],"Destroy":true,"EXTERNAL_REFERENCE_ID":"vm-171","Expire":true,"IS_COMPONENT_MACHINE":false,"InstallTools":true,"MachineBlueprintName":"test","MachineCPU":1,"MachineDailyCost":0,"MachineDestructionDate":null,"MachineExpirationDate":null,"MachineGroupName":"tirefireadmins","MachineGuestOperatingSystem":null,"MachineInterfaceDisplayName":"vSphere (vCenter)","MachineInterfaceType":"vSphere","MachineMemory":4096,"MachineName":"vra7-32","MachineReservationName":"test","MachineStorage":28,"MachineType":"Virtual","NETWORK_LIST":[{"componentTypeId":"com.vmware.csp.component.iaas.proxy.provider","componentId":null,"classId":"dynamicops.api.model.NetworkViewModel","typeFilter":null,"data":{"NETWORK_MAC_ADDRESS":"00:50:56:8a:62:e1","NETWORK_NAME":"VM Network"}}],"PowerOff":true,"Reboot":true,"Reconfigure":true,"Reprovision":true,"Reset":true,"SNAPSHOT_LIST":[],"Shutdown":true,"Suspend":true,"VirtualMachine.Admin.UUID":"500a9c29-ab12-fc1f-6bd9-57c78eb2c3de","endpointExternalReferenceId":"1a19bcb7-e6b9-487d-b816-a10c91738fd1","ip_address":"172.16.20.147","machineId":"8bd21553-4609-41ef-bebf-60f7c66a28e0"}}],"metadata":{"size":20,"totalElements":2,"totalPages":1,"number":1,"offset":0}}

data/spec/fixtures/resource/vm_resource.json

@@ -1,6 +1,7 @@
 {
   "@type": "CatalogResource",
   "id": "31a7badc-6562-458d-84f3-ec58d74a6953",
+  "requestId": "bogus",
   "resourceTypeRef": {
     "id": "Infrastructure.Virtual",
     "label": "Virtual Machine"

data/spec/http_spec.rb

@@ -117,7 +117,7 @@ describe Vra::Http do
 
     context "when redirected" do
       [301, 302, 307].each do |status|
-        [:get, :head].each do |method|
+        %i{get head}.each do |method|
           it "follows #{status} redirected #{method.to_s.upcase} requests" do
             stub_request(method, "http://test.local")
               .to_return(status: [status, "redirect"],
@@ -140,7 +140,7 @@ describe Vra::Http do
         end
       end
 
-      [:head, :post].each do |method|
+      %i{head post}.each do |method|
         it "converts #{method.to_s.upcase} to GET on 303 redirect" do
           stub_request(method, "http://test.local")
             .to_return(status: [303, "See Other"],

data/spec/resource_spec.rb

@@ -323,13 +323,74 @@ describe Vra::Resource do
     end
 
     describe "#ip_addresses" do
-      it "returns the correct IP addresses" do
-        skip "broken and needs to be updated per changes -JJ 2017-04-14"
-        stub_request(:post, "https://vra.corp.local/identity/api/tokens")
-          .with(body: '{"username":"user@corp.local","password":"password","tenant":"tenant"}',
-                headers: { "Accept" => "application/json", "Content-Type" => "application/json" })
-          .to_return(status: 200, body: "", headers: {})
-        expect(resource.ip_addresses).to eq [ "192.168.110.200", "192.168.220.200" ]
+      let(:authn_payload) do
+        {
+          "username" => "user@corp.local",
+          "password" => "password",
+          "tenant" => "tenant",
+        }.to_json
+      end
+
+      let(:resource_view_body) do
+        File.read(File.join(File.dirname(__FILE__),
+          "fixtures",
+          "resource",
+          "ip_address.txt"))
+      end
+
+      before do
+        stub_request(
+          :post,
+          "https://vra.corp.local/identity/api/tokens"
+        ).with(
+          body: authn_payload,
+          headers: { "Accept" => "application/json", "Content-Type" => "application/json" }
+        ).to_return(
+          status: 200,
+          body: '{"id":"12345"}',
+          headers: {}
+        )
+
+        stub_request(
+          :head,
+          "https://vra.corp.local/identity/api/tokens/12345"
+        ).with(
+          headers: { "Accept" => "application/json", "Authorization" => "Bearer 12345", "Content-Type" => "application/json" }
+        ).to_return(
+          status: 204,
+          body: "",
+          headers: {}
+        )
+
+        stub_request(
+          :get,
+          "https://vra.corp.local/catalog-service/api/consumer/requests/bogus/resourceViews"
+        ).with(
+          headers: { "Accept" => "application/json", "Content-Type" => "application/json" }
+        ).to_return(
+          status: 200,
+          body: resource_view_body,
+          headers: {}
+        )
+      end
+
+      context "with IP address in the second element" do
+        it "returns the correct IP addresses" do
+          expect(resource.ip_addresses).to eq [ "172.16.20.147" ]
+        end
+      end
+
+      context "with IP address in the third element" do
+        let(:resource_view_body) do
+          File.read(File.join(File.dirname(__FILE__),
+            "fixtures",
+            "resource",
+            "ip_address_third_element.txt"))
+        end
+
+        it "returns the correct IP addresses" do
+          expect(resource.ip_addresses).to eq [ "172.16.20.147" ]
+        end
       end
 
       it "returns nil if there are no network interfaces" do

data/spec/resources_spec.rb

@@ -31,8 +31,8 @@ describe Vra::Resources do
 
   it "#all" do
     allow(client).to receive(:http_get_paginated_array!)
-    .with("/catalog-service/api/consumer/resources")
-    .and_return([ { "id" => "1" }, { "id" => "2" } ])
+      .with("/catalog-service/api/consumer/resources")
+      .and_return([ { "id" => "1" }, { "id" => "2" } ])
 
     items = resources.all_resources
 

data/vmware-vra.gemspec

@@ -1,6 +1,5 @@
-# coding: utf-8
 # frozen_string_literal: true
-lib = File.expand_path("../lib", __FILE__)
+lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "vra/version"
 
@@ -22,12 +21,12 @@ Gem::Specification.new do |spec|
   spec.add_dependency "ffi-yajl",       "~> 2.2"
   spec.add_dependency "passwordmasker", "~> 1.2"
 
-  spec.add_development_dependency "bundler", "~> 1.7"
+  spec.add_development_dependency "bundler", ">= 1.7"
   spec.add_development_dependency "chefstyle"
   spec.add_development_dependency "github_changelog_generator"
   spec.add_development_dependency "pry",     "~> 0.10"
   spec.add_development_dependency "rake",    "~> 10.0"
   spec.add_development_dependency "rspec",   "~> 3.0"
-  spec.add_development_dependency "webmock", "~> 1.21"
+  spec.add_development_dependency "webmock", "~> 3.5"
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 2.5.2
+  version: 2.7.2
 platform: ruby
 authors:
 - Adam Leff
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-22 00:00:00.000000000 Z
+date: 2020-09-26 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
@@ -129,14 +129,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
@@ -151,7 +151,6 @@ files:
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
-- Jenkinsfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -175,6 +174,7 @@ files:
 - spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
+- spec/fixtures/resource/ip_address_third_element.txt
 - spec/fixtures/resource/no_ip_address.txt
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/resource_response.json
@@ -207,8 +207,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: Client gem for interacting with VMware vRealize Automation.
@@ -220,6 +219,7 @@ test_files:
 - spec/fixtures/catalog_request_template.json
 - spec/fixtures/resource/catalog_request.json
 - spec/fixtures/resource/ip_address.txt
+- spec/fixtures/resource/ip_address_third_element.txt
 - spec/fixtures/resource/no_ip_address.txt
 - spec/fixtures/resource/non_vm_resource.json
 - spec/fixtures/resource/resource_response.json

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 '
-      }
-    }
-  }
-}