vmware-vra 2.1.0 → 2.1.1

data/lib/vra/request.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module Vra
   class Request
@@ -50,7 +50,7 @@ module Vra
       refresh_if_empty
       return if request_empty?
 
-      @request_data['phase']
+      @request_data["phase"]
     end
 
     def completed?
@@ -58,25 +58,25 @@ module Vra
     end
 
     def successful?
-      status == 'SUCCESSFUL'
+      status == "SUCCESSFUL"
     end
 
     def failed?
-      status == 'FAILED'
+      status == "FAILED"
     end
 
     def completion_state
       refresh_if_empty
       return if request_empty?
 
-      @request_data['requestCompletion']['requestCompletionState']
+      @request_data["requestCompletion"]["requestCompletionState"]
     end
 
     def completion_details
       refresh_if_empty
       return if request_empty?
 
-      @request_data['requestCompletion']['completionDetails']
+      @request_data["requestCompletion"]["completionDetails"]
     end
 
     def resources

data/lib/vra/request_parameters.rb

@@ -46,19 +46,19 @@ module Vra
 
     def to_h
       {
-        'key' => @key,
-        'value' => {
-          'type' => @type,
-          'value' => format_value
-        }
+        "key" => @key,
+        "value" => {
+          "type" => @type,
+          "value" => format_value,
+        },
       }
     end
 
     def format_value
       case @type
-      when 'integer'
+      when "integer"
         @value.to_i
-      when 'string'
+      when "string"
         @value.to_s
       else
         @value.to_s

data/lib/vra/requests.rb

@@ -26,9 +26,9 @@ module Vra
     def all_requests
       requests = []
 
-      items = @client.http_get_paginated_array!('/catalog-service/api/consumer/requests')
+      items = @client.http_get_paginated_array!("/catalog-service/api/consumer/requests")
       items.each do |item|
-        requests << Vra::Request.new(@client, item['id'])
+        requests << Vra::Request.new(@client, item["id"])
       end
 
       requests

data/lib/vra/resource.rb

@@ -17,7 +17,7 @@
 # limitations under the License.
 #
 
-require 'ffi_yajl'
+require "ffi_yajl"
 
 module Vra
   # rubocop:disable ClassLength
@@ -31,17 +31,17 @@ module Vra
       @resource_actions = []
 
       if @id.nil? && @resource_data.nil?
-        raise ArgumentError, 'must supply an id or a resource data hash'
+        raise ArgumentError, "must supply an id or a resource data hash"
       end
 
       if !@id.nil? && !@resource_data.nil?
-        raise ArgumentError, 'must supply an id OR a resource data hash, not both'
+        raise ArgumentError, "must supply an id OR a resource data hash, not both"
       end
 
       if @resource_data.nil?
         fetch_resource_data
       else
-        @id = @resource_data['id']
+        @id = @resource_data["id"]
       end
     end
 
@@ -53,103 +53,103 @@ module Vra
     alias refresh fetch_resource_data
 
     def name
-      resource_data['name']
+      resource_data["name"]
     end
 
     def description
-      resource_data['description']
+      resource_data["description"]
     end
 
     def status
-      resource_data['status']
+      resource_data["status"]
     end
 
     def vm?
-      %w(Infrastructure.Virtual Infrastructure.Cloud).include?(resource_data['resourceTypeRef']['id'])
+      %w{Infrastructure.Virtual Infrastructure.Cloud}.include?(resource_data["resourceTypeRef"]["id"])
     end
 
     def organization
-      return {} if resource_data['organization'].nil?
+      return {} if resource_data["organization"].nil?
 
-      resource_data['organization']
+      resource_data["organization"]
     end
 
     def tenant_id
-      organization['tenantRef']
+      organization["tenantRef"]
     end
 
     def tenant_name
-      organization['tenantLabel']
+      organization["tenantLabel"]
     end
 
     def subtenant_id
-      organization['subtenantRef']
+      organization["subtenantRef"]
     end
 
     def subtenant_name
-      organization['subtenantLabel']
+      organization["subtenantLabel"]
     end
 
     def catalog_item
-      return {} if resource_data['catalogItem'].nil?
+      return {} if resource_data["catalogItem"].nil?
 
-      resource_data['catalogItem']
+      resource_data["catalogItem"]
     end
 
     def catalog_id
-      catalog_item['id']
+      catalog_item["id"]
     end
 
     def catalog_name
-      catalog_item['label']
+      catalog_item["label"]
     end
 
     def owner_ids
-      resource_data['owners'].map { |x| x['ref'] }
+      resource_data["owners"].map { |x| x["ref"] }
     end
 
     def owner_names
-      resource_data['owners'].map { |x| x['value'] }
+      resource_data["owners"].map { |x| x["value"] }
     end
 
     def machine_status
-      status = resource_data['resourceData']['entries'].find { |x| x['key'] == 'MachineStatus' }
-      raise 'No MachineStatus entry available for resource' if status.nil?
+      status = resource_data["resourceData"]["entries"].find { |x| x["key"] == "MachineStatus" }
+      raise "No MachineStatus entry available for resource" if status.nil?
 
-      status['value']['value']
+      status["value"]["value"]
     end
 
     def machine_on?
-      machine_status == 'On'
+      machine_status == "On"
     end
 
     def machine_off?
-      machine_status == 'Off'
+      machine_status == "Off"
     end
 
     def machine_turning_on?
-      machine_status == 'TurningOn' || machine_status == 'MachineActivated'
+      machine_status == "TurningOn" || machine_status == "MachineActivated"
     end
 
     def machine_turning_off?
-      %w(TurningOff ShuttingDown).include?(machine_status)
+      %w{TurningOff ShuttingDown}.include?(machine_status)
     end
 
     def machine_in_provisioned_state?
-      machine_status == 'MachineProvisioned'
+      machine_status == "MachineProvisioned"
     end
 
     def network_interfaces
       return unless vm?
 
-      network_list = resource_data['resourceData']['entries'].find { |x| x['key'] == 'NETWORK_LIST' }
+      network_list = resource_data["resourceData"]["entries"].find { |x| x["key"] == "NETWORK_LIST" }
       return if network_list.nil?
 
-      network_list['value']['items'].each_with_object([]) do |item, nics|
+      network_list["value"]["items"].each_with_object([]) do |item, nics|
         nic = {}
-        item['values']['entries'].each do |entry|
-          key = entry['key']
-          value = entry['value']['value']
+        item["values"]["entries"].each do |entry|
+          key = entry["key"]
+          value = entry["value"]["value"]
           nic[key] = value
         end
 
@@ -162,26 +162,26 @@ module Vra
 
       addrs = []
 
-      request_id = @resource_data['requestId']
+      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']
+      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?)
+      print "Waiting For vRA to collect the IP"
+      while (data_zero == "" || data_one == "") && (data_zero.nil? || data_one.nil?)
         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']
+        data_zero = JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"]
+        data_one = JSON.parse(resource_views.body)["content"][1]["data"]["ip_address"]
         sleep 10
-        print '.'
+        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']
+      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']
+                     JSON.parse(resource_views.body)["content"][0]["data"]["ip_address"]
                    end
 
       addrs << ip_address
@@ -191,43 +191,43 @@ module Vra
     def actions
       # if this Resource instance was created with data from a "all_resources" fetch,
       # it is likely missing operations data because the vRA API is not pleasant sometimes.
-      fetch_resource_data if resource_data['operations'].nil?
+      fetch_resource_data if resource_data["operations"].nil?
 
-      resource_data['operations']
+      resource_data["operations"]
     end
 
     def action_id_by_name(name)
       return if actions.nil?
 
-      action = actions.find { |x| x['name'] == name }
+      action = actions.find { |x| x["name"] == name }
       return if action.nil?
 
-      action['id']
+      action["id"]
     end
 
     def destroy
-      action_id = action_id_by_name('Destroy')
+      action_id = action_id_by_name("Destroy")
       raise Vra::Exception::NotFound, "No destroy action found for resource #{@id}" if action_id.nil?
 
       submit_action_request(action_id)
     end
 
     def shutdown
-      action_id = action_id_by_name('Shutdown')
+      action_id = action_id_by_name("Shutdown")
       raise Vra::Exception::NotFound, "No shutdown action found for resource #{@id}" if action_id.nil?
 
       submit_action_request(action_id)
     end
 
     def poweroff
-      action_id = action_id_by_name('Power Off')
+      action_id = action_id_by_name("Power Off")
       raise Vra::Exception::NotFound, "No power-off action found for resource #{@id}" if action_id.nil?
 
       submit_action_request(action_id)
     end
 
     def poweron
-      action_id = action_id_by_name('Power On')
+      action_id = action_id_by_name("Power On")
       raise Vra::Exception::NotFound, "No power-on action found for resource #{@id}" if action_id.nil?
 
       submit_action_request(action_id)
@@ -235,31 +235,31 @@ module Vra
 
     def action_request_payload(action_id)
       {
-        '@type' => 'ResourceActionRequest',
-        'resourceRef' => {
-          'id' => @id
+        "@type" => "ResourceActionRequest",
+        "resourceRef" => {
+          "id" => @id,
         },
-        'resourceActionRef' => {
-          'id' => action_id
+        "resourceActionRef" => {
+          "id" => action_id,
         },
-        'organization' => {
-          'tenantRef' => tenant_id,
-          'tenantLabel' => tenant_name,
-          'subtenantRef' => subtenant_id,
-          'subtenantLabel' => subtenant_name
+        "organization" => {
+          "tenantRef" => tenant_id,
+          "tenantLabel" => tenant_name,
+          "subtenantRef" => subtenant_id,
+          "subtenantLabel" => subtenant_name,
+        },
+        "state" => "SUBMITTED",
+        "requestNumber" => 0,
+        "requestData" => {
+          "entries" => [],
         },
-        'state' => 'SUBMITTED',
-        'requestNumber' => 0,
-        'requestData' => {
-          'entries' => []
-        }
       }
     end
 
     def submit_action_request(action_id)
       payload = action_request_payload(action_id).to_json
-      response = client.http_post('/catalog-service/api/consumer/requests', payload)
-      request_id = response.location.split('/')[-1]
+      response = client.http_post("/catalog-service/api/consumer/requests", payload)
+      request_id = response.location.split("/")[-1]
       Vra::Request.new(client, request_id)
     end
   end

data/lib/vra/resources.rb

@@ -28,7 +28,7 @@ module Vra
     def all_resources
       resources = []
 
-      items = client.http_get_paginated_array!('/catalog-service/api/consumer/resources')
+      items = client.http_get_paginated_array!("/catalog-service/api/consumer/resources")
       items.each do |item|
         resources << Vra::Resource.new(client, data: item)
       end

data/lib/vra/version.rb

@@ -18,5 +18,5 @@
 #
 
 module Vra
-  VERSION = '2.1.0'
+  VERSION = "2.1.1"
 end

data/spec/catalog_item_spec.rb

@@ -17,122 +17,122 @@
 # limitations under the License.
 #
 
-require 'spec_helper'
+require "spec_helper"
 
 describe Vra::CatalogItem do
   let(:client) do
-    Vra::Client.new(username: 'user@corp.local',
-                    password: 'password',
-                    tenant: 'tenant',
-                    base_url: 'https://vra.corp.local')
+    Vra::Client.new(username: "user@corp.local",
+                    password: "password",
+                    tenant: "tenant",
+                    base_url: "https://vra.corp.local")
   end
 
-  let(:catalog_id) { '9e98042e-5443-4082-afd5-ab5a32939bbc' }
+  let(:catalog_id) { "9e98042e-5443-4082-afd5-ab5a32939bbc" }
 
   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'
+      "@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",
+        },
       },
-      '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
+  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)
     end
 
-    it 'raises an error if an ID and catalog item data have both been provided' do
-      expect { Vra::CatalogItem.new(id: 123, data: 'foo') }.to raise_error(ArgumentError)
+    it "raises an error if an ID and catalog item data have both been provided" do
+      expect { Vra::CatalogItem.new(id: 123, data: "foo") }.to raise_error(ArgumentError)
     end
 
-    context 'when an ID is provided' do
-      it 'fetches the catalog_item record' do
+    context "when an ID is provided" do
+      it "fetches the catalog_item record" do
         catalog_item = Vra::CatalogItem.allocate
         expect(catalog_item).to receive(:fetch_catalog_item)
         catalog_item.send(:initialize, client, id: catalog_id)
       end
     end
 
-    context 'when catalog item data is provided' do
-      it 'populates the ID correctly' do
+    context "when catalog item data is provided" do
+      it "populates the ID correctly" do
         catalog_item = Vra::CatalogItem.new(client, data: catalog_item_payload)
         expect(catalog_item.id).to eq catalog_id
       end
     end
   end
 
-  describe '#fetch_catalog_item' do
-    context 'when the catalog item exists' do
-      let(:response) { double('response', code: 200, body: catalog_item_payload.to_json) }
+  describe "#fetch_catalog_item" do
+    context "when the catalog item exists" do
+      let(:response) { double("response", code: 200, body: catalog_item_payload.to_json) }
 
-      it 'calls http_get against the catalog_service' do
-        expect(client).to receive(:http_get).with('/catalog-service/api/consumer/catalogItems/catalog-12345').and_return(response)
-        Vra::CatalogItem.new(client, id: 'catalog-12345')
+      it "calls http_get against the catalog_service" do
+        expect(client).to receive(:http_get).with("/catalog-service/api/consumer/catalogItems/catalog-12345").and_return(response)
+        Vra::CatalogItem.new(client, id: "catalog-12345")
       end
     end
 
-    context 'when the catalog item does not exist' do
-      it 'raises an exception' do
-        allow(client).to receive(:http_get).with('/catalog-service/api/consumer/catalogItems/catalog-12345').and_raise(Vra::Exception::HTTPNotFound)
-        expect { Vra::CatalogItem.new(client, id: 'catalog-12345') }.to raise_error(Vra::Exception::NotFound)
+    context "when the catalog item does not exist" do
+      it "raises an exception" do
+        allow(client).to receive(:http_get).with("/catalog-service/api/consumer/catalogItems/catalog-12345").and_raise(Vra::Exception::HTTPNotFound)
+        expect { Vra::CatalogItem.new(client, id: "catalog-12345") }.to raise_error(Vra::Exception::NotFound)
       end
     end
   end
 
-  describe '#organization' do
+  describe "#organization" do
     let(:catalog_item) { Vra::CatalogItem.new(client, data: catalog_item_payload) }
 
-    context 'when organization data exists' do
+    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'
-          }
+          "@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')
+      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
+    context "when organization data does not exist" do
       let(:catalog_item_payload) do
         {
-          '@type' => 'CatalogItem',
-          'id' => '9e98042e-5443-4082-afd5-ab5a32939bbc'
+          "@type" => "CatalogItem",
+          "id" => "9e98042e-5443-4082-afd5-ab5a32939bbc",
         }
       end
 
-      it 'returns an empty hash' do
+      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)
+      it "returns nil for any organization keys" do
+        expect(catalog_item.organization["tenantRef"]).to eq(nil)
       end
     end
   end