bosh_cpi 1.2200.0 → 1.2291.0

data/lib/bosh/cpi.rb

@@ -1,3 +1,5 @@
 module Bosh
   module Cpi; end
 end
+
+require 'bosh/cpi/cli'

data/lib/bosh/cpi/cli.rb

@@ -0,0 +1,110 @@
+require 'json'
+
+class Bosh::Cpi::Cli
+  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
+    delete_disk
+    attach_disk
+    detach_disk
+    snapshot_disk
+    delete_snapshot
+    get_disks
+    ping
+  ).freeze
+
+  RPC_METHOD_TO_RUBY_METHOD = {
+    'has_vm' => 'has_vm?',
+  }.freeze
+
+  INVALID_CALL_ERROR_TYPE = 'InvalidCall'.freeze
+  UNKNOWN_ERROR_TYPE      = 'Unknown'.freeze
+
+  def initialize(cpi, result_io)
+    @cpi = cpi
+    @result_io = result_io
+  end
+
+  def run(json)
+    begin
+      request = JSON.load(json)
+    rescue JSON::ParserError
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Request cannot be deserialized', false)
+    end
+
+    method = request['method']
+    unless method.is_a?(String)
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Method must be a String', false)
+    end
+
+    unless KNOWN_RPC_METHODS.include?(method)
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Method is not known', false)
+    end
+
+    arguments = request['arguments']
+    unless arguments.is_a?(Array)
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Arguments must be an Array', false)
+    end
+
+    context = request['context']
+    unless context.is_a?(Hash) && context['director_uuid'].is_a?(String)
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Request should include context with director uuid', false)
+    end
+
+    configure_director(context['director_uuid'])
+
+    ruby_method = RPC_METHOD_TO_RUBY_METHOD[method] || method
+
+    begin
+      result = @cpi.public_send(ruby_method, *arguments)
+    rescue Bosh::Clouds::RetriableCloudError => e
+      return error_response(error_name(e), e.message, e.ok_to_retry)
+    rescue Bosh::Clouds::CloudError, Bosh::Clouds::CpiError => e
+      return error_response(error_name(e), e.message, false)
+    rescue ArgumentError
+      return error_response(INVALID_CALL_ERROR_TYPE, 'Arguments are not correct', false)
+    rescue Exception => e
+      return error_response(UNKNOWN_ERROR_TYPE, e.message, false)
+    end
+
+    result_response(result)
+  end
+
+  private
+
+  def configure_director(director_uuid)
+    Bosh::Clouds::Config.uuid = director_uuid
+  end
+
+  def error_response(type, message, ok_to_retry)
+    hash = {
+      result: nil,
+      error: {
+        type: type,
+        message: message,
+        ok_to_retry: ok_to_retry,
+      },
+    }
+    @result_io.print(JSON.dump(hash)); nil
+  end
+
+  def result_response(result)
+    hash = {
+      result: result,
+      error: nil,
+    }
+    @result_io.print(JSON.dump(hash)); nil
+  end
+
+  def error_name(error)
+    error.class.name
+  end
+end

data/lib/cloud.rb

@@ -170,9 +170,7 @@ module Bosh
       not_implemented(:delete_disk)
     end
 
-    ##
     # Attaches a disk
-    #
     # @param [String] vm vm id that was once returned by {#create_vm}
     # @param [String] disk disk id that was once returned by {#create_disk}
     # @return [void]
@@ -182,6 +180,7 @@ module Bosh
 
     # Take snapshot of disk
     # @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={})
       not_implemented(:snapshot_disk)
@@ -189,13 +188,12 @@ module Bosh
 
     # Delete a disk snapshot
     # @param [String] snapshot_id snapshot id to delete
+    # @return [void]
     def delete_snapshot(snapshot_id)
       not_implemented(:delete_snapshot)
     end
 
-    ##
     # Detaches a disk
-    #
     # @param [String] vm vm id that was once returned by {#create_vm}
     # @param [String] disk disk id that was once returned by {#create_disk}
     # @return [void]
@@ -203,18 +201,14 @@ module Bosh
       not_implemented(:detach_disk)
     end
 
-    ##
     # List the attached disks of the VM.
-    #
     # @param [String] vm_id is the CPI-standard vm_id (eg, returned from current_vm_id)
-    #
     # @return [array[String]] list of opaque disk_ids that can be used with the
     # other disk-related methods on the CPI
     def get_disks(vm_id)
       not_implemented(:get_disks)
     end
 
-    ##
     # Validates the deployment
     # @api not_yet_used
     def validate_deployment(old_manifest, new_manifest)

data/lib/cloud/config.rb

@@ -5,7 +5,7 @@ module Bosh::Clouds
 
     class << self
       extend Forwardable
-      def_delegators :@delegate, :db, :logger, :uuid, :task_checkpoint
+      def_delegators :@delegate, :db, :logger, :uuid, :uuid=, :task_checkpoint
     end
 
     # @param [Bosh::Director::Config] config director config file

data/lib/cloud/errors.rb

@@ -1,5 +1,4 @@
 module Bosh::Clouds
-
   class CpiError < StandardError; end
   class NotImplemented < CpiError; end
   class NotSupported < CpiError; end
@@ -19,5 +18,4 @@ module Bosh::Clouds
   class DiskNotAttached < RetriableCloudError; end
   class DiskNotFound < RetriableCloudError; end
   class VMCreationFailed < RetriableCloudError; end
-
 end

data/lib/cloud/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Clouds
-    VERSION = '1.2200.0'
+    VERSION = '1.2291.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh_cpi
 version: !ruby/object:Gem::Version
-  version: 1.2200.0
+  version: 1.2291.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,16 +26,17 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2200.0
+        version: 1.2291.0
 description: ! 'BOSH CPI
 
-  87cbf9'
+  51a1bb'
 email: support@cloudfoundry.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - lib/bosh/cpi.rb
+- lib/bosh/cpi/cli.rb
 - lib/bosh/cpi/compatibility_helpers.rb
 - lib/bosh/cpi/compatibility_helpers/delete_vm.rb
 - lib/bosh/cpi/tasks.rb
@@ -67,7 +68,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4489019858572925328
+      hash: -2726584133311882745
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23