bosh_vsphere_cpi 1.2546.0 → 1.2549.0

data/bin/vsphere_cpi

@@ -33,8 +33,11 @@ Bosh::Clouds::Config.configure(OpenStruct.new(
   db: db,
 ))
 
-cpi = Bosh::Clouds::VSphere.new(cpi_config['cloud']['properties'])
+cloud_properties = cpi_config['cloud']['properties']
+cloud_properties['soap_log'] = StringIO.new
 
-cli = Bosh::Cpi::Cli.new(cpi, STDOUT)
+cpi = Bosh::Clouds::VSphere.new(cloud_properties)
+
+cli = Bosh::Cpi::Cli.new(cpi, cloud_properties['soap_log'], STDOUT)
 
 cli.run(ARGF.read)

data/lib/cloud/vsphere/client.rb

@@ -15,20 +15,23 @@ module VSphereCloud
 
     def initialize(host, options = {})
       http_client = HTTPClient.new
-      log_path = options["soap_log"]
-      if log_path
-        log_file = File.open(log_path, "w")
+      soap_log = options['soap_log']
+      case soap_log
+      when String
+        log_file = File.open(soap_log, 'w')
         log_file.sync = true
         http_client.debug_dev = log_file
+      when IO, StringIO
+        http_client.debug_dev = soap_log
       end
       http_client.send_timeout = 14400
       http_client.receive_timeout = 14400
       http_client.connect_timeout = 4
       http_client.ssl_config.verify_mode = OpenSSL::SSL::VERIFY_NONE
 
-      @soap_stub = Soap::StubAdapter.new(host, "vim.version.version6", http_client)
+      @soap_stub = Soap::StubAdapter.new(host, 'vim.version.version6', http_client)
 
-      @service_instance = Vim::ServiceInstance.new("ServiceInstance", soap_stub)
+      @service_instance = Vim::ServiceInstance.new('ServiceInstance', soap_stub)
       @service_content = service_instance.content
       @metrics_cache  = {}
       @lock = Mutex.new

data/lib/cloud/vsphere/config.rb

@@ -148,27 +148,27 @@ module VSphereCloud
       schema = Membrane::SchemaParser.parse do
         {
           'agent' => dict(String, Object), # passthrough to the agent
-          optional('cpi_log') => String,
-          optional('soap_log') => String,
+          optional('cpi_log') => enum(String, Object),
+          optional('soap_log') => enum(String, Object),
           optional('mem_overcommit_ratio') => Numeric,
           optional('copy_disks') => bool,
           'vcenters' => [{
-                           'host' => String,
-                           'user' => String,
-                           'password' => String,
-                           'datacenters' => [{
-                                               'name' => String,
-                                               'vm_folder' => String,
-                                               'template_folder' => String,
-                                               optional('use_sub_folder') => bool,
-                                               'disk_path' => String,
-                                               'datastore_pattern' => String,
-                                               'persistent_datastore_pattern' => String,
-                                               optional('allow_mixed_datastores') => bool,
-                                               'clusters' => [enum(String,
-                                                                   dict(String, { 'resource_pool' => String }))]
-                                             }]
-                         }]
+            'host' => String,
+            'user' => String,
+            'password' => String,
+            'datacenters' => [{
+              'name' => String,
+              'vm_folder' => String,
+              'template_folder' => String,
+              optional('use_sub_folder') => bool,
+              'disk_path' => String,
+              'datastore_pattern' => String,
+              'persistent_datastore_pattern' => String,
+              optional('allow_mixed_datastores') => bool,
+              'clusters' => [enum(String,
+                dict(String, { 'resource_pool' => String }))]
+            }]
+          }]
         }
       end
 

data/lib/cloud/vsphere/version.rb

@@ -1,7 +1,7 @@
 module Bosh
   module Clouds
     class VSphere
-      VERSION = '1.2546.0'
+      VERSION = '1.2549.0'
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_vsphere_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2546.0
+  version: 1.2549.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-14 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.2546.0
+        version: 1.2549.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2546.0
+        version: 1.2549.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2546.0
+        version: 1.2549.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2546.0
+        version: 1.2549.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -173,7 +173,7 @@ dependencies:
         version: '0'
 description: ! 'BOSH VSphere CPI
 
-  e8aedb'
+  0d3835'
 email: support@cloudfoundry.com
 executables:
 - vsphere_cpi
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -519833725628457817
+      hash: 3279731338419233172
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23