bosh-director 1.2311.0 → 1.2334.0

data/lib/bosh/director/deployment_plan/idle_vm.rb

@@ -109,6 +109,11 @@ module Bosh::Director
       def changed?
         resource_pool_changed? || networks_changed?
       end
+
+      def clean_vm
+        self.vm = nil
+        self.current_state = nil
+      end
     end
   end
 end

data/lib/bosh/director/deployment_plan/resource_pool.rb

@@ -121,6 +121,13 @@ module Bosh::Director
         allocated_vm
       end
 
+      def deallocate_vm(idle_vm_cid)
+        deallocated_vm = @allocated_vms.find { |idle_vm| idle_vm.vm.cid == idle_vm_cid }
+        @allocated_vms.delete(deallocated_vm)
+        @idle_vms << deallocated_vm
+        deallocated_vm
+      end
+
       # "Active" VM is a VM that is currently running a job
       # @return [void]
       def mark_active_vm

data/lib/bosh/director/errand/job_manager.rb

@@ -36,6 +36,19 @@ module Bosh::Director
       instance_deleter = InstanceDeleter.new(@deployment)
       instance_deleter.delete_instances(
         @job.instances.map(&:model), event_log_stage)
+
+      deallocate_vms
+    end
+
+    private
+
+    def deallocate_vms
+      instance_cids = @job.instances.map { |i| i.model.vm.cid }
+
+      instance_cids.each do |cid|
+        idle_vm = @job.resource_pool.deallocate_vm(cid)
+        idle_vm.clean_vm
+      end
     end
   end
 end

data/lib/bosh/director/event_log.rb

@@ -38,7 +38,7 @@ module Bosh::Director
 
       def warn_deprecated(message)
         log_entry(
-          'time' => 0,
+          'time' => Time.now.to_i,
           'type' => 'deprecation',
           'message' => message,
         )

data/lib/bosh/director/resource_pool_updater.rb

@@ -119,8 +119,7 @@ module Bosh::Director
               @logger.info("Deleting outdated VM: #{vm_cid}")
               @cloud.delete_vm(vm_cid)
               vm = idle_vm.vm
-              idle_vm.vm = nil
-              idle_vm.current_state = nil
+              idle_vm.clean_vm
               vm.destroy
             end
           end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.2311.0'
+    VERSION = '1.2334.0'
   end
 end

data/lib/cloud/dummy.rb

@@ -8,12 +8,19 @@ module Bosh
       class NotImplemented < StandardError; end
 
       def initialize(options)
-        if options['dir'].nil?
-          raise ArgumentError, 'please provide base directory for dummy cloud'
-        end
-
         @options = options
+
         @base_dir = options['dir']
+        if @base_dir.nil?
+          raise ArgumentError, 'Must specify dir'
+        end
+
+        @agent_type = options['agent']['type']
+        unless %w(ruby go).include?(@agent_type)
+          raise ArgumentError, 'Unknown agent type provided'
+        end
+
+        @running_vms_dir = File.join(@base_dir, 'running_vms')
 
         FileUtils.mkdir_p(@base_dir)
       rescue Errno::EACCES
@@ -45,12 +52,12 @@ module Bosh
           mbus: @options['nats'],
         })
 
-        agent_cmd = agent_cmd(agent_id, root_dir, :ruby)
-        agent_log = "#{@options['dir']}/agent.#{agent_id}.log"
+        agent_cmd = agent_cmd(agent_id, root_dir)
+        agent_log = "#{@base_dir}/agent.#{agent_id}.log"
         agent_pid = Process.spawn(*agent_cmd, chdir: agent_base_dir(agent_id), out: agent_log, err: agent_log)
         Process.detach(agent_pid)
 
-        FileUtils.mkdir_p(File.join(@base_dir, 'running_vms'))
+        FileUtils.mkdir_p(@running_vms_dir)
         File.write(vm_file(agent_pid), agent_id)
 
         agent_pid.to_s
@@ -126,6 +133,23 @@ module Bosh
         raise NotImplemented, 'Dummy CPI does not implement validate_deployment'
       end
 
+      # Additional Dummy test helpers
+
+      def vm_cids
+        Dir.glob(File.join(@running_vms_dir, '*')).map { |vm| File.basename(vm) }
+      end
+
+      def kill_agents
+        vm_cids.each do |agent_pid|
+          begin
+            Process.kill('INT', agent_pid.to_i)
+          # rubocop:disable HandleExceptions
+          rescue Errno::ESRCH
+          # rubocop:enable HandleExceptions
+          end
+        end
+      end
+
       private
 
       def agent_id_for_vm_id(vm_id)
@@ -133,11 +157,14 @@ module Bosh
       end
 
       def agent_settings_file(agent_id)
-        File.join(agent_base_dir(agent_id), 'bosh', 'settings.json')
+        # Even though dummy CPI has complete access to agent execution file system
+        # it should never write directly to settings.json because
+        # the agent is responsible for retrieving the settings from the CPI.
+        File.join(agent_base_dir(agent_id), 'bosh', 'dummy-cpi-agent-env.json')
       end
 
       def agent_base_dir(agent_id)
-        "#{@options['dir']}/agent-base-dir-#{agent_id}"
+        "#{@base_dir}/agent-base-dir-#{agent_id}"
       end
 
       def write_agent_settings(agent_id, settings)
@@ -145,12 +172,12 @@ module Bosh
         File.write(agent_settings_file(agent_id), JSON.generate(settings))
       end
 
-      def agent_cmd(agent_id, root_dir, agent_type)
+      def agent_cmd(agent_id, root_dir)
         go_agent_exe = File.absolute_path('bosh/go_agent/out/bosh-agent')
         {
-          ruby: %W[bosh_agent      -b #{agent_base_dir(agent_id)} -I dummy -r #{root_dir} --no-alerts],
-          go:   %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy],
-        }[agent_type]
+          'ruby' => %W[bosh_agent      -b #{agent_base_dir(agent_id)} -I dummy -r #{root_dir} --no-alerts],
+          'go'   => %W[#{go_agent_exe} -b #{agent_base_dir(agent_id)} -I dummy -P dummy -M dummy],
+        }[@agent_type.to_s]
       end
 
       def read_agent_settings(agent_id)
@@ -162,7 +189,7 @@ module Bosh
       end
 
       def vm_file(vm_id)
-        File.join(@base_dir, 'running_vms', vm_id.to_s)
+        File.join(@running_vms_dir, vm_id.to_s)
       end
 
       def disk_file(disk_id)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.2311.0
+  version: 1.2334.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bcrypt-ruby
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -74,7 +74,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_common
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +82,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +90,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +98,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +106,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_aws_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -130,7 +130,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +138,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_vsphere_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2311.0
+        version: 1.2334.0
 - !ruby/object:Gem::Dependency
   name: bosh_vcloud_cpi
   requirement: !ruby/object:Gem::Requirement
@@ -493,7 +493,7 @@ dependencies:
         version: '1.0'
 description: ! 'BOSH Director
 
-  7df356'
+  839055'
 email: support@cloudfoundry.com
 executables:
 - bosh-director
@@ -748,7 +748,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2628192170011962430
+      hash: -1978715679933352968
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23