vmware-vra 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 909b704335bdb1cf85eeb0639f8f20c458a6ad4d
-  data.tar.gz: 047b6f2676a73b46563626ab29afbf048de3b137
+  metadata.gz: dae60d3196f5ec532da18527585691872db37075
+  data.tar.gz: 17359e6d0041c7872ab974375f0a25f60f1794cb
 SHA512:
-  metadata.gz: 5bd6ab876d957d8381279b5232e42fb17c8f3a934efe0c3f8911efb298c39ebe1b9e8f6f0b73f287330776903323e4e5ec79df251fdc22e9004881d97821b6b3
-  data.tar.gz: 510320dd20f2eb5d6998015c5cc38f183b5f360afd484152cf817d3cf8319d92393c11117bf63ea0bb851c8b342203eb3551fe06fc06927c4c1bf0ce1b901ab2
+  metadata.gz: 5f918bbddfde58b24f9c948a5f9c49c3b3648cb6cc96ae19eeb06803491fb2250881c2f02c5a2dd71a954886f6c454b18fd992f46c1b7f8fc8e80a416b5148db
+  data.tar.gz: a96438c7ff9e64f15cb076bf7a403dbe71a9b0fd57e3c662dfc9ce72a7192bb6f510c292aa510da8607d77cc8f5d4bc6c1ed3292f0dacaa53ac1fce50763d565

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 # vmware-vra-gem CHANGELOG
 
+## v1.5.4 (2016-04-27)
+* [pr#29](https://github.com/chef-partners/vmware-vra-gem/pull/29) Bug fix: handle more gracefully the situations where a resource or catalog item is missing data in the API response
+
 ## v1.5.3 (2016-04-18)
 * [pr#25](https://github.com/chef-partners/vmware-vra-gem/pull/25) Bug fix: use the proper exception helper method when raising exceptions encountered during HTTP HEAD requests
 

data/lib/vra/catalog_item.rb

@@ -59,20 +59,26 @@ module Vra
       @catalog_item_data['status']
     end
 
+    def organization
+      return {} if @catalog_item_data['organization'].nil?
+
+      @catalog_item_data['organization']
+    end
+
     def tenant_id
-      @catalog_item_data['organization']['tenantRef']
+      organization['tenantRef']
     end
 
     def tenant_name
-      @catalog_item_data['organization']['tenantLabel']
+      organization['tenantLabel']
     end
 
     def subtenant_id
-      @catalog_item_data['organization']['subtenantRef']
+      organization['subtenantRef']
     end
 
     def subtenant_name
-      @catalog_item_data['organization']['subtenantLabel']
+      organization['subtenantLabel']
     end
 
     def blueprint_id

data/lib/vra/resource.rb

@@ -67,28 +67,40 @@ module Vra
       %w(Infrastructure.Virtual Infrastructure.Cloud).include?(resource_data['resourceTypeRef']['id'])
     end
 
+    def organization
+      return {} if resource_data['organization'].nil?
+
+      resource_data['organization']
+    end
+
     def tenant_id
-      resource_data['organization']['tenantRef']
+      organization['tenantRef']
     end
 
     def tenant_name
-      resource_data['organization']['tenantLabel']
+      organization['tenantLabel']
     end
 
     def subtenant_id
-      resource_data['organization']['subtenantRef']
+      organization['subtenantRef']
     end
 
     def subtenant_name
-      resource_data['organization']['subtenantLabel']
+      organization['subtenantLabel']
+    end
+
+    def catalog_item
+      return {} if resource_data['catalogItem'].nil?
+
+      resource_data['catalogItem']
     end
 
     def catalog_id
-      resource_data['catalogItem']['id']
+      catalog_item['id']
     end
 
     def catalog_name
-      resource_data['catalogItem']['label']
+      catalog_item['label']
     end
 
     def owner_ids

data/lib/vra/version.rb

@@ -17,5 +17,5 @@
 #
 
 module Vra
-  VERSION = '1.5.3'.freeze
+  VERSION = '1.5.4'.freeze
 end

data/spec/catalog_item_spec.rb

@@ -18,7 +18,7 @@
 
 require 'spec_helper'
 
-describe Vra::CatalogRequest do
+describe Vra::CatalogItem do
   let(:client) do
     Vra::Client.new(username: 'user@corp.local',
                     password: 'password',
@@ -72,7 +72,7 @@ describe Vra::CatalogRequest do
 
     context 'when catalog item data is provided' do
       it 'populates the ID correctly' do
-        catalog_item = Vra::Resource.new(client, data: catalog_item_payload)
+        catalog_item = Vra::CatalogItem.new(client, data: catalog_item_payload)
         expect(catalog_item.id).to eq catalog_id
       end
     end
@@ -95,4 +95,44 @@ describe Vra::CatalogRequest do
       end
     end
   end
+
+  describe '#organization' do
+    let(:catalog_item) { Vra::CatalogItem.new(client, data: catalog_item_payload) }
+
+    context 'when organization data exists' do
+      let(:catalog_item_payload) do
+        {
+          '@type' => 'CatalogItem',
+          'id' => '9e98042e-5443-4082-afd5-ab5a32939bbc',
+          'organization' => {
+            'tenantRef' => 'vsphere.local',
+            'tenantLabel' => 'vsphere.local',
+            'subtenantRef' => '962ab3f9-858c-4483-a49f-fa97392c314b',
+            'subtenantLabel' => 'catalog_subtenant'
+          }
+        }
+      end
+
+      it 'returns the correct organization data' do
+        expect(catalog_item.organization['tenantRef']).to eq('vsphere.local')
+      end
+    end
+
+    context 'when organization data does not exist' do
+      let(:catalog_item_payload) do
+        {
+          '@type' => 'CatalogItem',
+          'id' => '9e98042e-5443-4082-afd5-ab5a32939bbc'
+        }
+      end
+
+      it 'returns an empty hash' do
+        expect(catalog_item.organization).to eq({})
+      end
+
+      it 'returns nil for any organization keys' do
+        expect(catalog_item.organization['tenantRef']).to eq(nil)
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vmware-vra
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Adam Leff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-18 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client