bosh_vsphere_cpi 1.5.0.pre.1525 → 1.5.0.pre.1612

data/lib/cloud/vsphere/cloud.rb

@@ -4,6 +4,7 @@ require 'ruby_vim_sdk'
 require 'cloud'
 require 'cloud/vsphere/client'
 require 'cloud/vsphere/config'
+require 'cloud/vsphere/lease_obtainer'
 require 'cloud/vsphere/lease_updater'
 require 'cloud/vsphere/resources'
 require 'cloud/vsphere/resources/cluster'
@@ -84,16 +85,16 @@ module VSphereCloud
           @logger.info("Deploying to: #{cluster.mob} / #{datastore.mob}")
 
           import_spec_result = import_ovf(name, ovf_file, cluster.resource_pool.mob, datastore.mob)
-          lease = obtain_nfc_lease(cluster.resource_pool.mob, import_spec_result.import_spec,
-                                   cluster.datacenter.template_folder.mob)
-          @logger.info('Waiting for NFC lease')
-          state = wait_for_nfc_lease(lease)
 
-          raise_nfc_lease_error(lease) if state == Vim::HttpNfcLease::State::ERROR
-          raise "Could not acquire HTTP NFC lease (state is: #{state})" unless state == Vim::HttpNfcLease::State::READY
+          lease_obtainer = LeaseObtainer.new(@client, @logger)
+          nfc_lease = lease_obtainer.obtain(
+            cluster.resource_pool,
+            import_spec_result.import_spec,
+            cluster.datacenter.template_folder,
+          )
 
           @logger.info('Uploading')
-          vm = upload_ovf(ovf_file, lease, import_spec_result.file_item)
+          vm = upload_ovf(ovf_file, nfc_lease, import_spec_result.file_item)
           result = name
 
           @logger.info('Removing NICs')
@@ -1146,8 +1147,12 @@ module VSphereCloud
     private
 
     def raise_nfc_lease_error(lease)
-      error_message = client.get_property(lease, Vim::HttpNfcLease, 'error').msg
-      raise "Could not acquire HTTP NFC lease, message is:  #{error_message}"
+      error = client.get_property(lease, Vim::HttpNfcLease, 'error')
+      raise "Could not acquire HTTP NFC lease, message is: '#{error.msg}' " +
+        "fault cause is: '#{error.fault_cause}', " +
+        "fault message is: #{error.fault_message}, " +
+        "dynamic type is '#{error.dynamic_type}', " +
+        "dynamic property is #{error.dynamic_property}"
     end
   end
 end

data/lib/cloud/vsphere/lease_obtainer.rb

@@ -0,0 +1,49 @@
+require 'ruby_vim_sdk'
+
+module VSphereCloud
+  class LeaseObtainer
+    include VimSdk
+
+    def initialize(client, logger)
+      @client = client
+      @logger = logger
+    end
+
+    def obtain(resource_pool, import_spec, template_folder)
+      @logger.info('Importing VApp')
+      nfc_lease = resource_pool.mob.import_vapp(import_spec, template_folder.mob, nil)
+
+      @logger.info('Waiting for NFC lease to become ready')
+      state = wait_for_nfc_lease(nfc_lease)
+
+      if state == Vim::HttpNfcLease::State::ERROR
+        raise_nfc_lease_error(nfc_lease)
+      end
+
+      if state != Vim::HttpNfcLease::State::READY
+        raise "Could not acquire HTTP NFC lease (state is: '#{state}')"
+      end
+
+      nfc_lease
+    end
+
+    private
+
+    def wait_for_nfc_lease(nfc_lease)
+      loop do
+        state = @client.get_property(nfc_lease, Vim::HttpNfcLease, 'state')
+        return state unless state == Vim::HttpNfcLease::State::INITIALIZING
+        sleep(1.0)
+      end
+    end
+
+    def raise_nfc_lease_error(nfc_lease)
+      error = @client.get_property(nfc_lease, Vim::HttpNfcLease, 'error')
+      raise "Could not acquire HTTP NFC lease, message is: '#{error.msg}' " +
+              "fault cause is: '#{error.fault_cause}', " +
+              "fault message is: #{error.fault_message}, " +
+              "dynamic type is '#{error.dynamic_type}', " +
+              "dynamic property is #{error.dynamic_property}"
+    end
+  end
+end

data/lib/cloud/vsphere/lease_updater.rb

@@ -35,6 +35,5 @@ module VSphereCloud
         @lease.complete
       end
     end
-
   end
 end

data/lib/cloud/vsphere/resources/resource_pool.rb

@@ -1,9 +1,5 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module VSphereCloud
   class Resources
-
-    # ResourcePool resource.
     class ResourcePool
       include VimSdk
 

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.5.0.pre.1525'
+      VERSION = '1.5.0.pre.1612'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.5.0.pre.1525
+  version: 1.5.0.pre.1612
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-10 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1525
+        version: 1.5.0.pre.1612
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1525
+        version: 1.5.0.pre.1612
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1525
+        version: 1.5.0.pre.1612
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.5.0.pre.1525
+        version: 1.5.0.pre.1612
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH VSphere CPI
 
-  df3988'
+  a13d7a'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi_console
@@ -122,6 +122,7 @@ files:
 - lib/cloud/vsphere/client.rb
 - lib/cloud/vsphere/cloud.rb
 - lib/cloud/vsphere/config.rb
+- lib/cloud/vsphere/lease_obtainer.rb
 - lib/cloud/vsphere/lease_updater.rb
 - lib/cloud/vsphere/models/disk.rb
 - lib/cloud/vsphere/path_finder.rb