bosh_cpi 1.3048.0 → 1.3232.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bdc3aaf9a0b1cbff5e53440e8095f592fdc354c5
-  data.tar.gz: 5fff02edbcc44552503e0d5ee1a6b4c77bd6f1f2
+  metadata.gz: c645d59aa7bd3bbf39e6d4d7a1dcd1fa91f3e8aa
+  data.tar.gz: 5b2891179978924c84ad53edb4a72658e5bda80d
 SHA512:
-  metadata.gz: 1bdd1e497943e97275b8ce2a1aee4ce2cb19723742d36583aaa7afea573aa01f78c1c254bd4127e890542b2abfd85b7af25f518858641a0b51b945ea0e685194
-  data.tar.gz: c45fbf96a44055632ffa0afe264654a17519059816c3786ab65ffa950171b36ab15549cdb27ab81b74b0c1374d7b6827b5b637eb4fdf1ea86ab6ca6128328f98
+  metadata.gz: 679aa03f789b0fd8ea75c059640363767128661deca3a06b67b7b8785f7a3d5d872949169ceee2c380b3559228abeeab1cf3d09c6a6b6d35e6c7ed48fbe6681b
+  data.tar.gz: ff10f37d0889566d870ee515b91a8d48a25281833dce08792e372ca15e60ad61302eb79ae2405131c63bd76c847d20ea712d407129fbcad2c00a74216df6db4c

data/lib/bosh/cpi/cli.rb

@@ -10,7 +10,6 @@ class Bosh::Cpi::Cli
     has_vm
     reboot_vm
     set_vm_metadata
-    configure_networks
     create_disk
     has_disk
     delete_disk
@@ -67,7 +66,8 @@ class Bosh::Cpi::Cli
     ruby_method = RPC_METHOD_TO_RUBY_METHOD[method] || method
 
     begin
-      result = @cpi.public_send(ruby_method, *arguments)
+      cpi = @cpi.call
+      result = cpi.public_send(ruby_method, *arguments)
     rescue Bosh::Clouds::RetriableCloudError => e
       return error_response(error_name(e), e.message, e.ok_to_retry, e.backtrace)
     rescue Bosh::Clouds::CloudError, Bosh::Clouds::CpiError => e
@@ -99,7 +99,7 @@ class Bosh::Cpi::Cli
         message: message,
         ok_to_retry: ok_to_retry,
       },
-      log: @logs_string_io.string,
+      log: @logs_string_io.string.force_encoding(Encoding::UTF_8),
     }
     @result_io.print(JSON.dump(hash)); nil
   end
@@ -108,7 +108,7 @@ class Bosh::Cpi::Cli
     hash = {
       result: result,
       error: nil,
-      log: @logs_string_io.string,
+      log: @logs_string_io.string.force_encoding(Encoding::UTF_8),
     }
     @result_io.print(JSON.dump(hash)); nil
   end

data/lib/bosh/cpi/compatibility_helpers/delete_vm.rb

@@ -7,7 +7,7 @@ module Bosh::Cpi::CompatibilityHelpers
         it "raises VMNotFound error" do
           expect {
             cpi.delete_vm(vm_cid)
-          }.to raise_error(Bosh::Clouds::VMNotFound, "VM `#{vm_cid}' not found")
+          }.to raise_error(Bosh::Clouds::VMNotFound, "VM '#{vm_cid}' not found")
         end
       end
     end

data/lib/bosh/cpi/registry_client.rb

@@ -0,0 +1,106 @@
+require 'cloud/errors'
+require 'httpclient'
+require 'base64'
+require 'json'
+
+module Bosh::Cpi
+  class RegistryClient
+    attr_reader :endpoint
+    attr_reader :user
+    attr_reader :password
+
+    def initialize(endpoint, user, password)
+      @endpoint = endpoint
+
+      unless @endpoint =~ /^http:\/\//
+        @endpoint = "http://#{@endpoint}"
+      end
+
+      @user = user
+      @password = password
+
+      auth = Base64.encode64("#{@user}:#{@password}").gsub("\n", '')
+
+      @headers = {
+          "Accept" => 'application/json',
+          "Authorization" => "Basic #{auth}"
+      }
+
+      @client = HTTPClient.new
+    end
+
+    ##
+    # Update instance settings in the registry
+    # @param [String] instance_id EC2 instance id
+    # @param [Hash] settings New agent settings
+    # @return [Boolean]
+    def update_settings(instance_id, settings)
+      unless settings.is_a?(Hash)
+        raise ArgumentError, "Invalid settings format, Hash expected, #{settings.class} given"
+      end
+
+      payload = JSON.dump(settings)
+      url = "#{@endpoint}/instances/#{instance_id}/settings"
+
+      response = @client.put(url, {:body => payload, :header => @headers})
+
+      unless HTTP::Status.successful?(response.status)
+        cloud_error("Cannot update settings for '#{instance_id}', got HTTP #{response.status}")
+      end
+
+      true
+    end
+
+    ##
+    # Read instance settings from the registry
+    # @param [String] instance_id EC2 instance id
+    # @return [Hash] Agent settings
+    def read_settings(instance_id)
+      url = "#{@endpoint}/instances/#{instance_id}/settings"
+
+      response = @client.get(url, {:header => @headers})
+
+      if response.status != 200
+        cloud_error("Cannot read settings for '#{instance_id}', got HTTP #{response.status}")
+      end
+
+      body = JSON.load(response.body)
+
+      unless body.is_a?(Hash)
+        cloud_error("Invalid registry response, Hash expected, got #{body.class}: #{body}")
+      end
+
+      settings = JSON.load(body["settings"])
+
+      unless settings.is_a?(Hash)
+        cloud_error("Invalid settings format, Hash expected, got #{settings.class}: #{settings}")
+      end
+
+      settings
+    rescue JSON::ParserError => e
+      cloud_error("Cannot parse settings for '#{instance_id}': #{e.message}")
+    end
+
+    ##
+    # Delete instance settings from the registry
+    # @param [String] instance_id EC2 instance id
+    # @return [Boolean]
+    def delete_settings(instance_id)
+      url = "#{@endpoint}/instances/#{instance_id}/settings"
+
+      response = @client.delete(url, {:header => @headers})
+
+      unless [200, 404].include? response.status
+        cloud_error("Cannot delete settings for '#{instance_id}', got HTTP #{response.status}")
+      end
+
+      true
+    end
+
+    private
+
+    def cloud_error(message)
+      raise Bosh::Clouds::CloudError, message
+    end
+  end
+end

data/lib/bosh/cpi.rb

@@ -3,3 +3,4 @@ module Bosh
 end
 
 require 'bosh/cpi/cli'
+require 'bosh/cpi/registry_client'

data/lib/cloud/external_cpi.rb

@@ -48,12 +48,11 @@ module Bosh::Clouds
     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 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
@@ -90,13 +89,14 @@ module Bosh::Clouds
       end
 
       save_cpi_log(parsed_response['log'])
+      save_cpi_log(stderr)
 
       parsed_response['result']
     end
 
     def checked_cpi_exec_path
       unless File.executable?(@cpi_path)
-        raise NonExecutable, "Failed to run cpi: `#{@cpi_path}' is not executable"
+        raise NonExecutable, "Failed to run cpi: '#{@cpi_path}' is not executable"
       end
       @cpi_path
     end

data/lib/cloud/internal_cpi.rb

@@ -0,0 +1,25 @@
+module Bosh::Clouds
+  class InternalCpi
+    def initialize(cloud)
+      @cloud = cloud
+    end
+
+    private
+
+    def method_missing(method_sym, *arguments, &block)
+      invoke_cpi_method(method_sym, arguments)
+    end
+
+    def respond_to?(method_sym)
+      cloud.respond_to?(method_sym)
+    end
+
+    def cloud
+      @cloud
+    end
+
+    def invoke_cpi_method(method_sym, arguments)
+      cloud.send(method_sym, *JSON.parse(JSON.dump(arguments)))
+    end
+  end
+end

data/lib/cloud/provider.rb

@@ -4,14 +4,14 @@ module Bosh::Clouds
       if cloud_config.has_key?('provider')
         ExternalCpiProvider.create(cloud_config['provider']['path'], director_uuid)
       else
-        PluginCloudProvider.create(cloud_config['plugin'], cloud_config['properties'])
+        InternalCpiProvider.create(cloud_config['plugin'], cloud_config['properties'])
       end
     end
   end
 
   private
 
-  class PluginCloudProvider
+  class InternalCpiProvider
     def self.create(plugin, options)
       begin
         require "cloud/#{plugin}"
@@ -19,7 +19,7 @@ module Bosh::Clouds
         raise CloudError, "Could not load Cloud Provider Plugin: #{plugin}, with error #{error.inspect}"
       end
 
-      Bosh::Clouds.const_get(plugin.capitalize).new(options)
+      InternalCpi.new(Bosh::Clouds.const_get(plugin.capitalize).new(options))
     end
   end
 

data/lib/cloud/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.3048.0'
+    VERSION = '1.3232.0'
   end
 end

data/lib/cloud.rb

@@ -8,6 +8,7 @@ require "cloud/config"
 require "cloud/errors"
 require "cloud/provider"
 require "cloud/external_cpi"
+require "cloud/internal_cpi"
 
 module Bosh
 
@@ -87,18 +88,17 @@ module Bosh
     # @param [Hash] resource_pool cloud specific properties describing the resources needed
     #               for this VM
     # @param [Hash] networks list of networks and their settings needed for this VM
-    # @param [optional, String, Array] disk_locality disk id(s) if known of the disk(s) that will be
+    # @param [String, Array] disk_locality disk id(s) if known of the disk(s) that will be
     #                                    attached to this vm
-    # @param [optional, Hash] env environment that will be passed to this vm
-    # @return [String] opaque id later used by {#configure_networks}, {#attach_disk},
-    #                  {#detach_disk}, and {#delete_vm}
+    # @param [Hash] env environment that will be passed to this vm
+    # @return [String] opaque id later used by {#attach_disk}, {#detach_disk} and {#delete_vm}
     def create_vm(agent_id, stemcell_id, resource_pool,
-                  networks, disk_locality = nil, env = nil)
+                  networks, disk_locality, env)
       not_implemented(:create_vm)
     end
 
     ##
-    # Deletes a VM
+    # Deletes a VM. If the VM has already been deleted, this call returns normally and has no effect.
     #
     # @param [String] vm vm id that was once returned by {#create_vm}
     # @return [void]
@@ -146,17 +146,6 @@ module Bosh
       not_implemented(:set_vm_metadata)
     end
 
-    ##
-    # Configures networking an existing VM.
-    #
-    # @param [String] vm vm id that was once returned by {#create_vm}
-    # @param [Hash] networks list of networks and their settings needed for this VM,
-    #               same as the networks argument in {#create_vm}
-    # @return [void]
-    def configure_networks(vm_id, networks)
-      not_implemented(:configure_networks)
-    end
-
     ##
     # Creates a disk (possibly lazily) that will be attached later to a VM. When
     # VM locality is specified the disk will be placed near the VM so it won't have to move
@@ -165,10 +154,10 @@ module Bosh
     # @param [Integer] size disk size in MB
     # @param [Hash] cloud_properties properties required for creating this disk
     #               specific to a CPI
-    # @param [optional, String] vm_locality vm id if known of the VM that this disk will
+    # @param [String] vm_locality vm id if known of the VM that this disk will
     #                           be attached to
     # @return [String] opaque id later used by {#attach_disk}, {#detach_disk}, and {#delete_disk}
-    def create_disk(size, cloud_properties, vm_locality = nil)
+    def create_disk(size, cloud_properties, vm_locality)
       not_implemented(:create_disk)
     end
 
@@ -194,7 +183,7 @@ module Bosh
     # @param [String] disk_id disk id of the disk to take the snapshot of
     # @param [Hash] metadata metadata key/value pairs
     # @return [String] snapshot id
-    def snapshot_disk(disk_id, metadata={})
+    def snapshot_disk(disk_id, metadata)
       not_implemented(:snapshot_disk)
     end
 
@@ -225,7 +214,7 @@ module Bosh
 
     def not_implemented(method)
       raise Bosh::Clouds::NotImplemented,
-            "`#{method}' is not implemented by #{self.class}"
+            "'#{method}' is not implemented by #{self.class}"
     end
 
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3048.0
+  version: 1.3232.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2016-04-25 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.3048.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3048.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -94,9 +94,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |-
-  BOSH CPI
-  e2c11a
+description: BOSH CPI
 email: support@cloudfoundry.com
 executables: []
 extensions: []
@@ -106,12 +104,14 @@ files:
 - lib/bosh/cpi/cli.rb
 - lib/bosh/cpi/compatibility_helpers.rb
 - lib/bosh/cpi/compatibility_helpers/delete_vm.rb
+- lib/bosh/cpi/registry_client.rb
 - lib/bosh/cpi/tasks.rb
 - lib/bosh/cpi/tasks/spec.rake
 - lib/cloud.rb
 - lib/cloud/config.rb
 - lib/cloud/errors.rb
 - lib/cloud/external_cpi.rb
+- lib/cloud/internal_cpi.rb
 - lib/cloud/provider.rb
 - lib/cloud/version.rb
 homepage: https://github.com/cloudfoundry/bosh