bosh_vcloud_cpi 0.4.8 → 0.4.9

data/lib/cloud/vcloud/cloud.rb

@@ -36,7 +36,7 @@ module VCloudCloud
       at_exit { destroy_client }
     end
 
-    def client()
+    def client
       @client_lock.synchronize {
         if @client.nil?
           create_client
@@ -145,8 +145,8 @@ module VCloudCloud
       @client = client
 
       with_thread_name("create_vm(#{agent_id}, ...)") do
-        Util.retry_operation("create_vm(#{agent_id}, ...)", @retries['cpi'],
-            @control['backoff']) do
+        Util.retry_operation("create_vm(#{agent_id}, ...)", @retries["cpi"],
+            @control["backoff"]) do
           @logger.info("Creating VM: #{agent_id}")
           @logger.debug("networks: #{networks.inspect}")
 
@@ -172,8 +172,8 @@ module VCloudCloud
       @client = client
 
       with_thread_name("delete_vm(#{vapp_id}, ...)") do
-        Util.retry_operation("delete_vm(#{vapp_id}, ...)", @retries['cpi'],
-            @control['backoff']) do
+        Util.retry_operation("delete_vm(#{vapp_id}, ...)", @retries["cpi"],
+            @control["backoff"]) do
           @logger.info("Deleting vApp: #{vapp_id}")
           vapp = @client.get_vapp(vapp_id)
           vm = get_vm(vapp)
@@ -185,7 +185,7 @@ module VCloudCloud
             @client.discard_suspended_state_vapp(vapp)
             @client.power_off_vapp(vapp)
           end
-          del_vapp = @vcd['debug']['delete_vapp']
+          del_vapp = @vcd["debug"]["delete_vapp"]
           @client.delete_vapp(vapp) if del_vapp
           @logger.info("Deleting ISO #{vm_name}")
           @client.delete_catalog_media(vm_name) if del_vapp
@@ -201,8 +201,8 @@ module VCloudCloud
       @client = client
 
       with_thread_name("reboot_vm(#{vapp_id}, ...)") do
-        Util.retry_operation("reboot_vm(#{vapp_id}, ...)", @retries['cpi'],
-            @control['backoff']) do
+        Util.retry_operation("reboot_vm(#{vapp_id}, ...)", @retries["cpi"],
+            @control["backoff"]) do
           @logger.info("Rebooting vApp: #{vapp_id}")
           vapp = @client.get_vapp(vapp_id)
           begin
@@ -226,7 +226,7 @@ module VCloudCloud
 
       with_thread_name("configure_networks(#{vapp_id}, ...)") do
         Util.retry_operation("configure_networks(#{vapp_id}, ...)",
-            @retries['cpi'], @control['backoff']) do
+            @retries["cpi"], @control["backoff"]) do
           @logger.info("Reconfiguring vApp networks: #{vapp_id}")
           vapp, vm = get_vapp_vm_by_vapp_id(vapp_id)
           @logger.debug("Powering off #{vapp.name}.")
@@ -266,7 +266,7 @@ module VCloudCloud
 
       with_thread_name("attach_disk(#{vapp_id} #{disk_id})") do
         Util.retry_operation("attach_disk(#{vapp_id}, #{disk_id})",
-            @retries['cpi'], @control['backoff']) do
+            @retries["cpi"], @control["backoff"]) do
           @logger.info("Attaching disk: #{disk_id} on vm: #{vapp_id}")
 
           vapp, vm = get_vapp_vm_by_vapp_id(vapp_id)
@@ -297,7 +297,7 @@ module VCloudCloud
 
       with_thread_name("detach_disk(#{vapp_id} #{disk_id})") do
         Util.retry_operation("detach_disk(#{vapp_id}, #{disk_id})",
-            @retries['cpi'], @control['backoff']) do
+            @retries["cpi"], @control["backoff"]) do
           @logger.info("Detaching disk: #{disk_id} from vm: #{vapp_id}")
 
           vapp, vm = get_vapp_vm_by_vapp_id(vapp_id)
@@ -328,7 +328,7 @@ module VCloudCloud
 
       with_thread_name("create_disk(#{size_mb}, vm_locality)") do
         Util.retry_operation("create_disk(#{size_mb}, vm_locality)",
-            @retries['cpi'], @control['backoff']) do
+            @retries["cpi"], @control["backoff"]) do
           @logger.info("Create disk: #{size_mb}, #{vm_locality}")
           disk_name = "#{generate_unique_name}"
           disk = nil
@@ -355,8 +355,8 @@ module VCloudCloud
       @client = client
 
       with_thread_name("delete_disk(#{disk_id})") do
-        Util.retry_operation("delete_disk(#{disk_id})", @retries['cpi'],
-            @control['backoff']) do
+        Util.retry_operation("delete_disk(#{disk_id})", @retries["cpi"],
+            @control["backoff"]) do
           @logger.info("Deleting disk: #{disk_id}")
           disk = @client.get_disk(disk_id)
           @client.delete_disk(disk)
@@ -372,8 +372,8 @@ module VCloudCloud
       @client = client
 
       with_thread_name("get_disk_size(#{disk_id})") do
-        Util.retry_operation("get_disk_size(#{disk_id})", @retries['cpi'],
-            @control['backoff']) do
+        Util.retry_operation("get_disk_size(#{disk_id})", @retries["cpi"],
+            @control["backoff"]) do
           @logger.info("Getting disk size: #{disk_id}")
           disk = @client.get_disk(disk_id)
           @logger.info("Disk #{disk_id} size: #{disk.size_mb} MB")
@@ -393,44 +393,43 @@ module VCloudCloud
     private
 
     def finalize_options
-      @vcd['control'] = {} unless @vcd['control']
-      @vcd['control']['retries'] = {} unless @vcd['control']['retries']
-      @vcd['control']['retries']['default'] ||= RETRIES_DEFAULT
-      @vcd['control']['retries']['upload_vapp_files'] ||=
+      @vcd["control"] = {} unless @vcd["control"]
+      @vcd["control"]["retries"] = {} unless @vcd["control"]["retries"]
+      @vcd["control"]["retries"]["default"] ||= RETRIES_DEFAULT
+      @vcd["control"]["retries"]["upload_vapp_files"] ||=
         RETRIES_UPLOAD_VAPP_FILES
-      @vcd['control']['retries']['cpi'] ||= RETRIES_CPI
-      @vcd['control']['delay'] ||= DELAY
-      @vcd['control']['time_limit_sec'] = {} unless
-        @vcd['control']['time_limit_sec']
-      @vcd['control']['time_limit_sec']['default'] ||= TIMELIMIT_DEFAULT
-      @vcd['control']['time_limit_sec']['delete_vapp_template'] ||=
+      @vcd["control"]["retries"]["cpi"] ||= RETRIES_CPI
+      @vcd["control"]["delay"] ||= DELAY
+      @vcd["control"]["time_limit_sec"] = {} unless
+        @vcd["control"]["time_limit_sec"]
+      @vcd["control"]["time_limit_sec"]["default"] ||= TIMELIMIT_DEFAULT
+      @vcd["control"]["time_limit_sec"]["delete_vapp_template"] ||=
         TIMELIMIT_DELETE_VAPP_TEMPLATE
-      @vcd['control']['time_limit_sec']['delete_vapp'] ||= TIMELIMIT_DELETE_VAPP
-      @vcd['control']['time_limit_sec']['delete_media'] ||=
+      @vcd["control"]["time_limit_sec"]["delete_vapp"] ||= TIMELIMIT_DELETE_VAPP
+      @vcd["control"]["time_limit_sec"]["delete_media"] ||=
         TIMELIMIT_DELETE_MEDIA
-      @vcd['control']['time_limit_sec']['instantiate_vapp_template'] ||=
+      @vcd["control"]["time_limit_sec"]["instantiate_vapp_template"] ||=
         TIMELIMIT_INSTANTIATE_VAPP_TEMPLATE
-      @vcd['control']['time_limit_sec']['power_on'] ||= TIMELIMIT_POWER_ON
-      @vcd['control']['time_limit_sec']['power_off'] ||= TIMELIMIT_POWER_OFF
-      @vcd['control']['time_limit_sec']['undeploy'] ||= TIMELIMIT_UNDEPLOY
-      @vcd['control']['time_limit_sec']['process_descriptor_vapp_template'] ||=
+      @vcd["control"]["time_limit_sec"]["power_on"] ||= TIMELIMIT_POWER_ON
+      @vcd["control"]["time_limit_sec"]["power_off"] ||= TIMELIMIT_POWER_OFF
+      @vcd["control"]["time_limit_sec"]["undeploy"] ||= TIMELIMIT_UNDEPLOY
+      @vcd["control"]["time_limit_sec"]["process_descriptor_vapp_template"] ||=
         TIMELIMIT_PROCESS_DESCRIPTOR_VAPP_TEMPLATE
-      @vcd['control']['time_limit_sec']['http_request'] ||=
+      @vcd["control"]["time_limit_sec"]["http_request"] ||=
         TIMELIMIT_HTTP_REQUEST
-      @vcd['control']['backoff'] ||= BACKOFF
-      @vcd['control']['rest_throttle'] = {} unless
-        @vcd['control']['rest_throttle']
-      @vcd['control']['rest_throttle']['min'] ||= REST_THROTTLE_MIN
-      @vcd['control']['rest_throttle']['max'] ||= REST_THROTTLE_MAX
-      @vcd['debug'] = {} unless @vcd['debug']
-      @vcd['debug']['delete_vapp'] = DEBUG_DELETE_VAPP unless
-        @vcd['debug']['delete_vapp']
+      @vcd["control"]["backoff"] ||= BACKOFF
+      @vcd["control"]["rest_throttle"] = {} unless
+        @vcd["control"]["rest_throttle"]
+      @vcd["control"]["rest_throttle"]["min"] ||= REST_THROTTLE_MIN
+      @vcd["control"]["rest_throttle"]["max"] ||= REST_THROTTLE_MAX
+      @vcd["debug"] = {} unless @vcd["debug"]
+      @vcd["debug"]["delete_vapp"] = DEBUG_DELETE_VAPP unless
+        @vcd["debug"]["delete_vapp"]
     end
 
-    def create_client()
+    def create_client
       url = @vcd["url"]
       @logger.debug("Create session to VCD cloud: #{url}")
-      #@rest_logger.debug("Session to VCD cloud: #{url}")
 
       @client = VCloudSdk::Client.new(url, @vcd["user"],
         @vcd["password"], @vcd["entities"], @vcd["control"])
@@ -443,7 +442,7 @@ module VCloudCloud
       raise e
     end
 
-    def destroy_client()
+    def destroy_client
       url = @vcd["url"]
       @logger.debug("Destroy session to VCD cloud: #{url}")
       # TODO VCloudSdk::Client should permit logout.
@@ -535,7 +534,7 @@ module VCloudCloud
         @client.set_metadata(vm, @vcd["entities"]["vm_metadata_key"], env_json)
 
         storage_profiles = @client.get_ovdc.storage_profiles || []
-        media_storage_profile = storage_profiles.find { |sp| sp['name'] ==
+        media_storage_profile = storage_profiles.find { |sp| sp["name"] ==
           @vcd["entities"]["media_storage_profile"] }
         @logger.info("Uploading and inserting ISO #{iso_path} as #{vm.name} " +
           "to #{media_storage_profile.inspect}")
@@ -546,7 +545,7 @@ module VCloudCloud
     end
 
     def delete_vapp_networks(vapp, exclude_nets)
-      exclude = exclude_nets.map {|k,v| v["cloud_properties"]["name"]}.uniq
+      exclude = exclude_nets.map { |k,v| v["cloud_properties"]["name"] }.uniq
       @client.delete_networks(vapp, exclude)
       @logger.debug("Deleted vApp #{vapp.name} networks excluding " +
         "#{exclude.inspect}.")
@@ -562,7 +561,7 @@ module VCloudCloud
       cloud_networks.each do |configured_network|
         @logger.debug("Adding configured network: #{configured_network}")
         org_net = accessible_org_networks.find {
-          |n| n['name'] == configured_network }
+          |n| n["name"] == configured_network }
         unless org_net
           raise VCloudSdk::CloudError, "Configured network: " +
             "#{configured_network}, is not accessible to VDC:#{ovdc.name}."
@@ -621,7 +620,7 @@ module VCloudCloud
     def independent_disks(disk_locality)
       disk_locality ||= []
       @logger.info("Instantiate vApp accessible to disks: " +
-                   "#{disk_locality.join(',')}")
+                   "#{disk_locality.join(",")}")
       disks = []
       disk_locality.each do |disk_id|
         disks << @client.get_disk(disk_id)
@@ -630,4 +629,5 @@ module VCloudCloud
     end
 
   end
+
 end

data/lib/cloud/vcloud/util.rb

@@ -1,4 +1,5 @@
 module VCloudCloud
+
   class Util
     class << self
 
@@ -9,8 +10,8 @@ module VCloudCloud
           rescue VCloudSdk::ApiError => e
             raise e if attempt >= attempts-1
             delay = backoff ** attempt
-            Config.logger.error("Retry-attempt #{attempt+1}/#{attempts} " +
-                "failed to #{op}, retrying in #{delay} seconds.\t#{e}")
+            Bosh::Clouds.Config.logger.error("Retry-attempt #{attempt+1}/" +
+              "#{attempts} failed to #{op}, retrying in #{delay} seconds.\t#{e}")
             sleep (delay)
           end
         end
@@ -18,4 +19,5 @@ module VCloudCloud
 
     end
   end
+
 end

data/lib/cloud/vcloud/version.rb

@@ -1,7 +1,9 @@
 module Bosh
   module Clouds
+
     class VCloud
-      VERSION = "0.4.8"
+      VERSION = "0.4.9"
     end
+
   end
 end

data/lib/cloud/vcloud.rb

@@ -17,6 +17,7 @@ module Bosh
                      :configure_networks,
                      :create_disk, :delete_disk,
                      :attach_disk, :detach_disk,
+                     :get_disk_size_mb,
                      :validate_deployment
 
       def initialize(options)

data/spec/spec_helper.rb

@@ -1,10 +1,10 @@
 $:.unshift(File.expand_path("..", __FILE__))
-$:.unshift(File.join(File.dirname(__FILE__), '.'))
-$:.unshift(File.join(File.dirname(__FILE__), '../lib/cloud'))
-$:.unshift(File.join(File.dirname(__FILE__), 'unit'))
+$:.unshift(File.join(File.dirname(__FILE__), "."))
+$:.unshift(File.join(File.dirname(__FILE__), "../lib/cloud"))
+$:.unshift(File.join(File.dirname(__FILE__), "unit"))
 
-require 'yaml'
-require 'vcloud'
+require "yaml"
+require "vcloud"
 
 
 module VCloudCloud
@@ -43,8 +43,8 @@ module VCloudCloud
 
       def compare_xml(a, b)
         a.diff(b) do |change, node|
-          # ' ' Means no difference.  '+' means addition and '-' means deletion.
-          return false if change != ' ' && node.to_s.strip().length != 0
+          # " " Means no difference.  "+" means addition and "-" means deletion.
+          return false if change != " " && node.to_s.strip().length != 0
         end
         true
       end

data/spec/unit/cloud_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + "/../spec_helper"
 require "yaml"
 
 module VCloudCloud
@@ -270,7 +270,7 @@ module VCloudCloud
       mc.should_receive(:get_vapp).with(anything).and_return { vapp }
       mc.should_receive(:power_off_vapp).with(vapp).and_return {}
       mc.should_receive(:delete_vapp).with(vapp).and_return {} if
-        vcd_settings['debug']['delete_vapp'] == true
+        vcd_settings["debug"]["delete_vapp"] == true
       mc.should_receive(:delete_catalog_media).with(
         an_instance_of(String)).and_return {}
 
@@ -294,7 +294,7 @@ module VCloudCloud
         end
       }
       mc.should_receive(:delete_vapp).with(vapp).and_return {} if
-        vcd_settings['debug']['delete_vapp'] == true
+        vcd_settings["debug"]["delete_vapp"] == true
       mc.should_receive(:delete_catalog_media).with(
         an_instance_of(String)).and_return {}
 

metadata

@@ -2,7 +2,7 @@
 name: bosh_vcloud_cpi
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.8
+  version: 0.4.9
 platform: ruby
 authors: 
 - VMware
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-12 00:00:00 -08:00
-default_executable: 
+date: 2012-12-05 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bosh_common
@@ -89,7 +88,6 @@ files:
 - spec/assets/valid_stemcell.tgz
 - spec/spec_helper.rb
 - spec/unit/cloud_spec.rb
-has_rdoc: true
 homepage: http://www.vmware.com
 licenses: []
 
@@ -103,7 +101,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -157759317589376717
+      hash: -1905250305917973427
       segments: 
       - 0
       version: "0"
@@ -112,14 +110,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -157759317589376717
+      hash: -1905250305917973427
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: BOSH vCloud CPI