bosh_cpi 1.3215.4.0 → 1.3232.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5b072ecb87cfd52cf3c3f05e4b398191297dd56
-  data.tar.gz: 9555b9b810020665f128621b7b6b1dc1093d58f8
+  metadata.gz: c645d59aa7bd3bbf39e6d4d7a1dcd1fa91f3e8aa
+  data.tar.gz: 5b2891179978924c84ad53edb4a72658e5bda80d
 SHA512:
-  metadata.gz: 5360ba99e403b6af0f62001d38a5926432a83bea1d6122847450d9f8d81cf50e6034b1fa020500058dcd5893dd84caac0fe95f6188851a33176ccc57ab34c61c
-  data.tar.gz: cef7d85065d4269dd3d5e3f80b581a462d3d58e544383ab0e8bd37f2a3ede33efed21afaf85123bce427b90ac01bca73717b9e004ffce5fdd61626d2fac47d85
+  metadata.gz: 679aa03f789b0fd8ea75c059640363767128661deca3a06b67b7b8785f7a3d5d872949169ceee2c380b3559228abeeab1cf3d09c6a6b6d35e6c7ed48fbe6681b
+  data.tar.gz: ff10f37d0889566d870ee515b91a8d48a25281833dce08792e372ca15e60ad61302eb79ae2405131c63bd76c847d20ea712d407129fbcad2c00a74216df6db4c

data/lib/bosh/cpi.rb

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

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/cloud.rb

@@ -214,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

data/lib/cloud/external_cpi.rb

@@ -96,7 +96,7 @@ module Bosh::Clouds
 
     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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3215.4.0
+  version: 1.3232.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 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.3215.4.0
+        version: 1.3232.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3215.4.0
+        version: 1.3232.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +104,7 @@ 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