bosh-registry 1.3215.4.0 → 1.3232.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6529af5e63511367617db358ea4ee136ebee2b4d
-  data.tar.gz: fabbb98aefbd324bb51933078adfa566310f4b9d
+  metadata.gz: 42185f98dd03fe90126899fecc12f75f0c5a7386
+  data.tar.gz: 106512bf2a7de26abd19878818d601f52f9a03f5
 SHA512:
-  metadata.gz: d4893e23d4f6b191a9d0c3a888bb3410f93d713d4f6b989f1b11ac203fed3dc15c6aff440a3639d0d2d5c5775cf0c0fc0bf535ac4f0931f6079b25becef49c28
-  data.tar.gz: 326ac8b500a8669f5ade426da6e1083188d363f7da43dfad5fc9a4f489d9a47ecbcbbb6462f99141207ecfbd64386a6e69e425d2d01a50d0007e79109934ca7b
+  metadata.gz: ab10189b2fb10c11ceab308a6738674e52f2dedd2ef66113bd2a3d093d68caa7774a990cdbb622b15ddf1acb0d0c9f5ca818d5fe93ffecd5eeb0403e6f8dddb4
+  data.tar.gz: ec419fdac7f02d7bdf8c14854d280cd747f4720a921eb541238e88ef977968f2c0829d7a503354559eb24f69dc75409f96b4ddd945b24ad0fbdd3ff0e39f377e

data/lib/bosh/registry/client.rb

@@ -1,124 +1,8 @@
-# Copyright (c) 2009-2013 VMware, Inc.
-# Copyright (c) 2012 Piston Cloud Computing, Inc.
-require 'httpclient'
-require 'cloud/errors'
-require 'base64'
+require 'bosh/cpi/registry_client'
 
+# Shim for legacy usage (https://www.pivotaltracker.com/story/show/116920309)
+# Also, note that the dependency on 'bosh_cpi' gem can be removed once this
+# shim class is deleted.
 module Bosh::Registry
-  ##
-  # Represents Bosh Registry Client. It performs CRUD operations against
-  # the OpenStack Registry.
-  #
-  # Settings example:
-  # settings = {
-  #   "vm" => {
-  #     "name" => server_name
-  #   },
-  #   "agent_id" => agent_id,
-  #   "networks" => network_spec,
-  #   "disks" => {
-  #     "system" => "/dev/vda",
-  #     "ephemeral" => "/dev/vdb",
-  #     "persistent" => {"volume_id" => device_name}
-  #   }
-  # }
-  class Client
-    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 = Yajl::Encoder.encode(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 = Yajl::Parser.parse(response.body)
-
-      unless body.is_a?(Hash)
-        cloud_error("Invalid registry response, Hash expected, got #{body.class}: #{body}")
-      end
-
-      settings = Yajl::Parser.parse(body["settings"])
-
-      unless settings.is_a?(Hash)
-        cloud_error("Invalid settings format, Hash expected, got #{settings.class}: #{settings}")
-      end
-
-      settings
-    rescue Yajl::ParseError => 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
+  class Client < Bosh::Cpi::RegistryClient ; end
 end

data/lib/bosh/registry/instance_manager.rb

@@ -54,7 +54,7 @@ module Bosh::Registry
       actual_ips = instance_ips(instance_id)
       unless actual_ips.include?(ip)
         raise InstanceError, "Instance IP mismatch, expected IP is " \
-                             "`%s', actual IP(s): `%s'" %
+                             "'%s', actual IP(s): '%s'" %
                              [ ip, actual_ips.join(", ") ]
       end
     end
@@ -63,7 +63,7 @@ module Bosh::Registry
       instance = Models::RegistryInstance[:instance_id => instance_id]
 
       if instance.nil?
-        raise InstanceNotFound, "Can't find instance `#{instance_id}'"
+        raise InstanceNotFound, "Can't find instance '#{instance_id}'"
       end
 
       instance
@@ -71,4 +71,4 @@ module Bosh::Registry
 
   end
 
-end
+end

data/lib/bosh/registry/instance_manager/openstack.rb

@@ -75,7 +75,7 @@ module Bosh::Registry
           end
           raise ConnectionError, "Unable to connect to OpenStack API: #{e.message}"
         end
-        raise InstanceNotFound, "Instance `#{instance_id}' not found" unless instance
+        raise InstanceNotFound, "Instance '#{instance_id}' not found" unless instance
         return (instance.private_ip_addresses + instance.floating_ip_addresses).compact
       end
 

data/lib/bosh/registry/version.rb

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

data/lib/bosh/registry/yaml_helper.rb

@@ -5,20 +5,20 @@ module Bosh::Registry
 
     def load_yaml_file(path, expected_type = Hash)
       unless File.exists?(path)
-        raise(ConfigError, "Cannot find file `#{path}'")
+        raise(ConfigError, "Cannot find file '#{path}'")
       end
 
       yaml = Psych.load_file(path)
 
       if expected_type && !yaml.is_a?(expected_type)
-        raise ConfigError, "Incorrect file format in `#{path}', " \
+        raise ConfigError, "Incorrect file format in '#{path}', " \
                            "#{expected_type} expected"
       end
 
       yaml
     rescue SystemCallError => e
-      raise ConfigError, "Cannot load YAML file at `#{path}': #{e}"
+      raise ConfigError, "Cannot load YAML file at '#{path}': #{e}"
     end
 
   end
-end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-registry
 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: sequel
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 4.32.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.43.0
+        version: 4.32.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -100,14 +100,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: rake
   requirement: !ruby/object:Gem::Requirement