bosh_cpi 1.2859.0 → 1.2862.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25514dc6b8fd25d7584f22e1b7817ae48b9da356
-  data.tar.gz: df2cb03482aab909cdb7c0f0aa982cc8a4e01c42
+  metadata.gz: e4688fc1dc7da04093348f17a90759ac63fa9408
+  data.tar.gz: 047750a4f42639e735b06e888673a4d385229966
 SHA512:
-  metadata.gz: e7205fdc29c6ff4ec4957d09ce81227610aed88527069d4f67939e09d12afbeaf31008b389e0ac3690ec881d39a480712c3c2132fbdf06dc93e20ef6d5600f5d
-  data.tar.gz: fac8b72f62dcf088d33081fd4864bccb778ace43ea341a18be1a8058ee96c55e31c805b251f8d618d8a370d76721aafbca16e041dc1f4f6feec9e5087db15d21
+  metadata.gz: 22b2b9c964783df0ad18968236d6178857edde58f64666f194681a7fd42a0eb66d3289b6e9b3f0b2c459e89c5852107b34999fe29f999875ca8d936ec564dc3a
+  data.tar.gz: 5410092f3a0fcfa3952578b9a6837b1a23bb5c78de0f5e8a250b51a8d9736526b48327ee687a43f72bd9e2bc0c0ab60488effd77d32988dbfbe171aa4fbb5cc2

data/lib/cloud/external_cpi.rb

@@ -26,27 +26,6 @@ module Bosh::Clouds
       Bosh::Clouds::VMCreationFailed
     ).freeze
 
-    KNOWN_RPC_METHODS = %w(
-      current_vm_id
-      create_stemcell
-      delete_stemcell
-      create_vm
-      delete_vm
-      has_vm?
-      reboot_vm
-      set_vm_metadata
-      configure_networks
-      create_disk
-      has_disk?
-      delete_disk
-      attach_disk
-      detach_disk
-      snapshot_disk
-      delete_snapshot
-      get_disks
-      ping
-    ).freeze
-
     RESPONSE_SCHEMA = Membrane::SchemaParser.parse do
       {
         'result' => any,
@@ -66,9 +45,29 @@ module Bosh::Clouds
       @logger = Config.logger
     end
 
-    KNOWN_RPC_METHODS.each do |method_name|
-      define_method method_name do |*arguments|
-        request = JSON.dump({
+    def current_vm_id(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def create_stemcell(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def delete_stemcell(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def create_vm(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def delete_vm(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def has_vm?(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def reboot_vm(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def set_vm_metadata(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def configure_networks(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def create_disk(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def has_disk?(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def delete_disk(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def attach_disk(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def detach_disk(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def snapshot_disk(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def delete_snapshot(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def get_disks(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+    def ping(*arguments); invoke_cpi_method(__method__.to_s, *arguments); end
+
+    private
+
+    def invoke_cpi_method(method_name, *arguments)
+      request = JSON.dump({
           'method' => method_name.gsub(/\?$/,''),
           'arguments' => arguments,
           'context' => {
@@ -76,28 +75,25 @@ module Bosh::Clouds
           }
         })
 
-        env = {'PATH' => '/usr/sbin:/usr/bin:/sbin:/bin', 'TMPDIR' => ENV['TMPDIR']}
-        cpi_exec_path = checked_cpi_exec_path
+      env = {'PATH' => '/usr/sbin:/usr/bin:/sbin:/bin', 'TMPDIR' => ENV['TMPDIR']}
+      cpi_exec_path = checked_cpi_exec_path
 
-        @logger.debug("External CPI sending request: #{request} with command: #{cpi_exec_path}")
-        cpi_response, stderr, exit_status = Open3.capture3(env, cpi_exec_path, stdin_data: request)
-        @logger.debug("External CPI got response: #{cpi_response}, err: #{stderr}, exit_status: #{exit_status}")
+      @logger.debug("External CPI sending request: #{request} with command: #{cpi_exec_path}")
+      cpi_response, stderr, exit_status = Open3.capture3(env, cpi_exec_path, stdin_data: request, unsetenv_others: true)
+      @logger.debug("External CPI got response: #{cpi_response}, err: #{stderr}, exit_status: #{exit_status}")
 
-        parsed_response = parsed_response(cpi_response)
-        validate_response(parsed_response)
+      parsed_response = parsed_response(cpi_response)
+      validate_response(parsed_response)
 
-        if parsed_response['error']
-          handle_error(parsed_response['error'])
-        end
+      if parsed_response['error']
+        handle_error(parsed_response['error'])
+      end
 
-        save_cpi_log(parsed_response['log'])
+      save_cpi_log(parsed_response['log'])
 
-        parsed_response['result']
-      end
+      parsed_response['result']
     end
 
-    private
-
     def checked_cpi_exec_path
       unless File.executable?(@cpi_path)
         raise NonExecutable, "Failed to run cpi: `#{@cpi_path}' is not executable"

data/lib/cloud/provider.rb

@@ -1,8 +1,8 @@
 module Bosh::Clouds
   class Provider
     def self.create(cloud_config, director_uuid)
-      if cloud_config.has_key?('cpi_executable')
-        ExternalCpiProvider.create(cloud_config['cpi_executable'], director_uuid)
+      if cloud_config.has_key?('provider')
+        ExternalCpiProvider.create(cloud_config['provider']['path'], director_uuid)
       else
         PluginCloudProvider.create(cloud_config['plugin'], cloud_config['properties'])
       end
@@ -24,8 +24,8 @@ module Bosh::Clouds
   end
 
   class ExternalCpiProvider
-    def self.create(cpi_executable, director_uuid)
-      ExternalCpi.new(cpi_executable, director_uuid)
+    def self.create(cpi_job_path, director_uuid)
+      ExternalCpi.new(cpi_job_path, director_uuid)
     end
   end
 end

data/lib/cloud/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.2859.0'
+    VERSION = '1.2862.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2859.0
+  version: 1.2862.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2859.0
+        version: 1.2862.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2859.0
+        version: 1.2862.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -54,7 +54,7 @@ dependencies:
         version: 1.8.2
 description: |-
   BOSH CPI
-  8b7528
+  c8ad5c
 email: support@cloudfoundry.com
 executables: []
 extensions: []