bosh_cpi 1.3215.3.0 → 1.3215.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88eab9857f0da6fdada35c11e83ccdf0cc113586
-  data.tar.gz: c004a63411abdf0126ad0a6f68d69f3b9d6d15c4
+  metadata.gz: e47a8b1c490ee6b087454854ea70db9db74a0501
+  data.tar.gz: 365900e4eda1c666317d58416b632228c0f84784
 SHA512:
-  metadata.gz: 028d7298c370e7853b5726e7aa3eecb90ae48119afe2e7139bcbf6e895e3055bb46eb45c3dbc29509cb95d7a32b885e03195c116371fa03ecc15184c754131ec
-  data.tar.gz: 089a4b2e24d40dc945efc132489e1dd626a4481b128657f32e7718b7299ae8cb389364aa17407a808674a912fd5a253a57f3e1d125facf2c0fab6fff33335e76
+  metadata.gz: f4c6e3b7ef8f6f7276f8e627051dcbee701aa482051cc6dd5594b212d7297c08ff8171786d7c5488c081daa7ff80b113c81e657efb021148efeb92987d0f623d
+  data.tar.gz: 39e8e7e42f4d0b3ea8e8d7812e8fee9aae41acbb6deca601a62d473cffa3dafb54f39f2271b518b40efa4f67b369abf042580696d5f5f5d5bea2b1036dad5f91

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

@@ -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.3.0'
+    VERSION = '1.3215.0'
   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

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.3215.3.0
+  version: 1.3215.3.1
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-01 00:00:00.000000000 Z
+date: 2016-04-11 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: bosh_common
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3215.3.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.3215.3.0
 - !ruby/object:Gem::Dependency
   name: membrane
   requirement: !ruby/object:Gem::Requirement
@@ -104,6 +90,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
@@ -133,7 +120,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: BOSH CPI