bosh-director 1.3196.0 → 1.3197.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d7c6f7bf6221c4fa4f4b7caf35e9d55337756e64
-  data.tar.gz: a828b6b9c5aea0d6b621f457b5574342e6bf1c99
+  metadata.gz: 20232eba24a87aea3baeb18ec4b1a6933b661478
+  data.tar.gz: 02fa2dec119dc01d11893d142579b5c185c4a8a2
 SHA512:
-  metadata.gz: 5aab58e79857bfb1fad27ba5591c0e6521e76d969efe8237b5264d4a4ddade8bfa40345c08ab687d76872223fcb172a4b0d6261ba340b82268fa930d74626a0f
-  data.tar.gz: 9c3cb7905dd55bfc74bac1e82c20b782694ec065af62d8bc4ddc4abcae80afd05cacda16cdace6f6adafaa9c7cf09f889e537b4982fa9423b80d3d04230280aa
+  metadata.gz: 9bbfa06bc2fbd42e883c3c22e54b297b6ac66e5bf31f690156b52f0830ff2918cc90ad84f4e1808aeb9499f18d2c14eb379083afc4e4bfa05a912cda5e1b2706
+  data.tar.gz: 31245c2728449b30782468433d65febcad7c2b1bf3373f486537a8eef7c14f3279cba64a90266c0632dad62cd6dfdc48fdd6ea5c33f059167c848bf872f2e421

data/lib/bosh/director/cloudcheck_helper.rb

@@ -87,7 +87,7 @@ module Bosh::Director
     def create_instance_plan(instance_model, vm_env)
       vm_type = DeploymentPlan::VmType.new(instance_model.spec['vm_type'])
       env = DeploymentPlan::Env.new(vm_env)
-      stemcell = DeploymentPlan::Stemcell.new(instance_model.spec['stemcell'])
+      stemcell = DeploymentPlan::Stemcell.parse(instance_model.spec['stemcell'])
       stemcell.add_stemcell_model
       availability_zone = DeploymentPlan::AvailabilityZone.new(instance_model.availability_zone, instance_model.cloud_properties_hash)
 

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

@@ -128,13 +128,13 @@ module Bosh::Director
               "Stemcell not bound for resource pool `#{resource_pool.name}'"
           end
 
-          stemcell.bind_model(@deployment_plan)
+          stemcell.bind_model(@deployment_plan.model)
         end
         return
       end
 
       @deployment_plan.stemcells.each do |_, stemcell|
-        stemcell.bind_model(@deployment_plan)
+        stemcell.bind_model(@deployment_plan.model)
       end
     end
 

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

@@ -1,36 +1,27 @@
 module Bosh::Director
   module DeploymentPlan
     class CompilationInstancePool
-      def initialize(instance_reuser, vm_creator, deployment_plan, logger, instance_deleter)
+      def initialize(instance_reuser, vm_creator, deployment_plan, logger, instance_deleter, max_instance_count)
         @instance_reuser = instance_reuser
-        @vm_creator = vm_creator
-        @deployment_plan =  deployment_plan
         @logger = logger
         @instance_deleter = instance_deleter
+        @max_instance_count = max_instance_count
+        @instance_provider = InstanceProvider.new(deployment_plan, vm_creator, logger)
+        @mutex = Mutex.new
       end
 
       def with_reused_vm(stemcell)
         begin
-          instance = @instance_reuser.get_instance(stemcell)
-          if instance.nil?
-            instance_plan, instance = create_instance_plan(stemcell)
-            configure_instance_plan(instance_plan)
-            @instance_reuser.add_in_use_instance(instance_plan.instance, stemcell)
-          else
-            @logger.info("Reusing compilation VM `#{instance.model.vm_cid}' for stemcell `#{stemcell.model.desc}'")
-          end
-
-          yield instance
-
-          @instance_reuser.release_instance(instance)
+          instance_memo = obtain_instance_memo(stemcell)
+          yield instance_memo.instance
+          release_instance(instance_memo)
         rescue => e
-          unless instance.nil? || instance_plan.nil?
-            @instance_reuser.remove_instance(instance)
-
+          remove_instance(instance_memo)
+          unless instance_memo.instance_plan.nil?
             if Config.keep_unreachable_vms
               @logger.info('Keeping reused compilation VM for debugging')
             else
-              delete_instance(instance_plan)
+              destroy_instance(instance_memo.instance_plan)
             end
           end
           raise e
@@ -40,32 +31,31 @@ module Bosh::Director
       def with_single_use_vm(stemcell)
         begin
           keep_failing_vm = false
-          instance_plan, instance = create_instance_plan(stemcell)
-          configure_instance_plan(instance_plan)
-          yield instance
+          instance_memo = InstanceMemo.new(@instance_provider, stemcell)
+          yield instance_memo.instance
         rescue => e
           @logger.info('Keeping single-use compilation VM for debugging')
           keep_failing_vm = Config.keep_unreachable_vms
           raise e
         ensure
-          unless instance.nil? || keep_failing_vm
-            delete_instance(instance_plan)
+          unless instance_memo.instance.nil? || keep_failing_vm
+            destroy_instance(instance_memo.instance_plan)
           end
         end
       end
 
       def delete_instances(number_of_workers)
         ThreadPool.new(:max_threads => number_of_workers).wrap do |pool|
-           @instance_reuser.each do |instance|
+           @instance_reuser.each do |instance_memo|
             pool.process do
-              @instance_reuser.remove_instance(instance)
+              @instance_reuser.remove_instance(instance_memo)
               instance_plan = DeploymentPlan::InstancePlan.new(
-                existing_instance: instance.model,
-                instance: instance,
+                existing_instance: instance_memo.instance.model,
+                instance: instance_memo.instance,
                 desired_instance: DeploymentPlan::DesiredInstance.new,
                 network_plans: []
               )
-              delete_instance(instance_plan)
+              destroy_instance(instance_plan)
             end
           end
         end
@@ -73,9 +63,50 @@ module Bosh::Director
 
       private
 
-      def delete_instance(instance_plan)
+      def remove_instance(instance_memo)
+        @mutex.synchronize do
+          @instance_reuser.remove_instance(instance_memo)
+        end
+      end
+
+      def release_instance(instance_memo)
+        @mutex.synchronize do
+          @instance_reuser.release_instance(instance_memo)
+        end
+      end
+
+      def obtain_instance_memo(stemcell)
+        instance_memo = nil
+        @mutex.synchronize do
+          instance_memo = @instance_reuser.get_instance(stemcell)
+          if instance_memo.nil?
+            if @instance_reuser.total_instance_count >= @max_instance_count
+              instance_memo = @instance_reuser.remove_idle_instance_not_matching_stemcell(stemcell)
+              destroy_instance(instance_memo.instance_plan)
+            end
+            @logger.debug("Creating new compilation VM for stemcell '#{stemcell.model.desc}'")
+            instance_memo = InstanceMemo.new(@instance_provider, stemcell)
+            @instance_reuser.add_in_use_instance(instance_memo, stemcell)
+          else
+            @logger.info("Reusing compilation VM `#{instance_memo.instance.model.vm_cid}' for stemcell `#{stemcell.model.desc}'")
+          end
+        end
+        return instance_memo
+      end
+
+      def destroy_instance(instance_plan)
         @instance_deleter.delete_instance_plan(instance_plan, EventLog::NullStage.new)
       end
+    end
+
+    private
+
+    class InstanceProvider
+      def initialize(deployment_plan, vm_creator, logger)
+        @deployment_plan = deployment_plan
+        @vm_creator = vm_creator
+        @logger = logger
+      end
 
       def create_instance_plan(stemcell)
         if @deployment_plan.compilation.vm_type
@@ -86,14 +117,14 @@ module Bosh::Director
 
         env = Env.new(@deployment_plan.compilation.env)
 
-        @compile_job = CompilationJob.new(vm_type, stemcell, env, @deployment_plan.compilation.network_name)
+        compile_job = CompilationJob.new(vm_type, stemcell, env, @deployment_plan.compilation.network_name)
         availability_zone = @deployment_plan.compilation.availability_zone
-        instance = Instance.create_from_job(@compile_job, 0, 'started', @deployment_plan.model, {}, availability_zone, @logger)
+        instance = Instance.create_from_job(compile_job, 0, 'started', @deployment_plan.model, {}, availability_zone, @logger)
         instance.bind_new_instance_model
 
         compilation_network = @deployment_plan.network(@deployment_plan.compilation.network_name)
         reservation = DesiredNetworkReservation.new_dynamic(instance.model, compilation_network)
-        desired_instance = DeploymentPlan::DesiredInstance.new(@compile_job, nil)
+        desired_instance = DeploymentPlan::DesiredInstance.new(compile_job, nil)
         instance_plan = DeploymentPlan::InstancePlan.new(
           existing_instance: instance.model,
           instance: instance,
@@ -101,18 +132,34 @@ module Bosh::Director
           network_plans: [DeploymentPlan::NetworkPlanner::Plan.new(reservation: reservation)]
         )
 
-        @compile_job.add_instance_plans([instance_plan])
-
-        return instance_plan, instance
+        compile_job.add_instance_plans([instance_plan])
+        instance_plan
       end
 
-      def configure_instance_plan(instance_plan)
+      def create_instance(instance_plan)
         @deployment_plan.ip_provider.reserve(instance_plan.network_plans.first.reservation)
         @vm_creator.create_for_instance_plan(instance_plan, [])
+        instance_plan.instance
       end
     end
 
-    private
+    class InstanceMemo
+      attr_reader :instance_plan
+
+      def initialize(instance_provider, stemcell)
+        @instance_provider = instance_provider
+        @stemcell = stemcell
+      end
+
+      def instance
+        return @instance if @called
+        @called = true
+        @instance_plan = @instance_provider.create_instance_plan(@stemcell)
+        @instance = @instance_plan.instance
+        @instance_provider.create_instance(@instance_plan)
+        @instance
+      end
+    end
 
     class CompilationVmType
       attr_reader :cloud_properties

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

@@ -33,7 +33,7 @@ module Bosh::Director
             if @deployment.stemcells.has_key?(alias_val)
               raise StemcellAliasAlreadyExists, "Duplicate stemcell alias '#{alias_val}'"
             end
-            @deployment.add_stemcell(Stemcell.new(stemcell_hash))
+            @deployment.add_stemcell(Stemcell.parse(stemcell_hash))
           end
         end
       end

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

@@ -122,7 +122,13 @@ module Bosh::Director
         vm_creator = Bosh::Director::VmCreator.new(cloud, @logger, vm_deleter, disk_manager, job_renderer)
         dns_manager = DnsManagerProvider.create
         instance_deleter = Bosh::Director::InstanceDeleter.new(ip_provider, dns_manager, disk_manager)
-        compilation_instance_pool = CompilationInstancePool.new(InstanceReuser.new, vm_creator, self, @logger, instance_deleter)
+        compilation_instance_pool = CompilationInstancePool.new(
+          InstanceReuser.new,
+          vm_creator,
+          self,
+          @logger,
+          instance_deleter,
+          compilation.workers)
         package_compile_step = DeploymentPlan::Steps::PackageCompileStep.new(
           jobs,
           compilation,

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

@@ -28,7 +28,7 @@ module Bosh::Director
           safe_property(spec, "cloud_properties", class: Hash, default: {})
 
         stemcell_spec = safe_property(spec, "stemcell", class: Hash)
-        @stemcell = Stemcell.new(stemcell_spec)
+        @stemcell = Stemcell.parse(stemcell_spec)
 
         @env = safe_property(spec, "env", class: Hash, default: {})
       end

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

@@ -1,51 +1,44 @@
-# Copyright (c) 2009-2012 VMware, Inc.
-
 module Bosh::Director
   module DeploymentPlan
     class Stemcell
-      include ValidationHelper
+      extend ValidationHelper
 
       attr_reader :alias
       attr_reader :os
-
-      # @return [String] Stemcell name
       attr_reader :name
-
-      # @return [String] Stemcell version
       attr_reader :version
-
-      # @return [Models::Stemcell] Stemcell DB model
       attr_reader :model
 
-      # @param [Hash] spec Raw stemcell spec according to deployment manifest
-      def initialize(spec)
-        @alias = safe_property(spec, "alias", :class => String, :optional => true)
-
-        @name = safe_property(spec, "name", :class => String, :optional => true)
-        @os = safe_property(spec, "os", :class => String, :optional => true)
+      def self.parse(spec)
+        name_alias = safe_property(spec, "alias", :class => String, :optional => true)
+        name = safe_property(spec, "name", :class => String, :optional => true)
+        os = safe_property(spec, "os", :class => String, :optional => true)
+        version = safe_property(spec, "version", :class => String)
 
-        if @name.nil? && @os.nil?
+        if name.nil? && os.nil?
           raise ValidationMissingField, "Required property `os' or `name' was not specified in object (#{spec})"
         end
 
-        if !@name.nil? && !@os.nil?
+        if !name.nil? && !os.nil?
           raise StemcellBothNameAndOS, "Properties `os' and `name' are both specified for stemcell, choose one. (#{spec})"
         end
 
-        @version = safe_property(spec, "version", :class => String)
+        new(name_alias, name, os, version)
+      end
 
+      def initialize(name_alias, name, os, version)
+        @alias = name_alias
+        @name = name
+        @os = os
+        @version = version
         @manager = Api::StemcellManager.new
-        @model = nil
       end
 
       def is_using_os?
         !@os.nil? && @name.nil?
       end
 
-      # Looks up the stemcell matching provided spec
-      # @return [void]
-      def bind_model(deployment_plan)
-        deployment_model = deployment_plan.model
+      def bind_model(deployment_model)
         if deployment_model.nil?
           raise DirectorError, "Deployment not bound in the deployment plan"
         end

data/lib/bosh/director/disk_manager.rb

@@ -109,7 +109,17 @@ module Bosh::Director
       end
     end
 
-    private
+    def orphan_mounted_persistent_disk(instance, disk)
+      unmount(instance, disk)
+
+      disk_cid = disk.disk_cid
+      if disk_cid.nil?
+        @logger.info('Skipping disk detaching, instance does not have a disk')
+        return
+      end
+
+      detach_and_orphan_disk(disk, instance.model)
+    end
 
     def attach_disk(instance_model)
       disk_cid = instance_model.persistent_disk_cid
@@ -124,6 +134,8 @@ module Bosh::Director
       end
     end
 
+    private
+
     def delete_orphan_snapshot(orphan_snapshot)
       begin
         snapshot_cid = orphan_snapshot.snapshot_cid
@@ -149,18 +161,6 @@ module Bosh::Director
       end
     end
 
-    def orphan_mounted_persistent_disk(instance, disk)
-      unmount(instance, disk)
-
-      disk_cid = disk.disk_cid
-      if disk_cid.nil?
-        @logger.info('Skipping disk detaching, instance does not have a disk')
-        return
-      end
-
-      detach_and_orphan_disk(disk, instance.model)
-    end
-
     def detach_and_orphan_disk(disk, instance_model)
       begin
         @logger.info("Detaching disk #{disk.disk_cid}")

data/lib/bosh/director/instance_reuser.rb

@@ -1,7 +1,6 @@
 module Bosh::Director
   class NilInstanceError < ArgumentError; end
 
-  # A class for maintaining Instance objects, making reusing Instances easier.
   class InstanceReuser
     def initialize
       @idle_instances_by_stemcell = {}
@@ -9,26 +8,23 @@ module Bosh::Director
       @mutex = Mutex.new
     end
 
-    # Adds an instance's information to the pool of VMs that can be reused.
-    # @param [DeploymentPlan::Instance] The instance for the new VM.
     def add_in_use_instance(instance, stemcell)
       raise NilInstanceError if instance.nil?
+      canonical_stemcell = canonical(stemcell)
       @mutex.synchronize do
-        @in_use_instances_by_stemcell[stemcell] ||= []
-        @in_use_instances_by_stemcell[stemcell] << instance
+        @in_use_instances_by_stemcell[canonical_stemcell] ||= []
+        @in_use_instances_by_stemcell[canonical_stemcell] << instance
       end
     end
 
-    # Returns the instance of a VM that is not in use and can be reused.
-    # @param [Models::Stemcell] stemcell The stemcell that the VM must be running.
-    # @return [DeploymentPlan::Instance] The instance for an existing unused VM, if one exists. Otherwise, nil.
     def get_instance(stemcell)
+      canonical_stemcell = canonical(stemcell)
       @mutex.synchronize do
-        return nil if @idle_instances_by_stemcell[stemcell].nil?
-        instance = @idle_instances_by_stemcell[stemcell].pop
+        return nil if @idle_instances_by_stemcell[canonical_stemcell].nil?
+        instance = @idle_instances_by_stemcell[canonical_stemcell].pop
         return nil if instance.nil?
-        @in_use_instances_by_stemcell[stemcell] ||= []
-        @in_use_instances_by_stemcell[stemcell] << instance
+        @in_use_instances_by_stemcell[canonical_stemcell] ||= []
+        @in_use_instances_by_stemcell[canonical_stemcell] << instance
         return instance
       end
     end
@@ -44,46 +40,66 @@ module Bosh::Director
       raise NilInstanceError if instance.nil?
       @mutex.synchronize do
         release_without_lock(instance)
-        @idle_instances_by_stemcell.each_value do |vms|
-          vms.each do |v|
-            vms.delete(v) if instance == v
+        @idle_instances_by_stemcell.each_value do |idle_instances|
+          idle_instances.each do |idle_instance|
+            idle_instances.delete(idle_instance) if instance == idle_instance
+          end
+        end
+      end
+    end
+
+    def remove_idle_instance_not_matching_stemcell(stemcell)
+      canonical_stemcell = canonical(stemcell)
+      @mutex.synchronize do
+        @idle_instances_by_stemcell.each do |stemcell, idle_instances|
+          if stemcell != canonical_stemcell && !idle_instances.empty?
+            return idle_instances.pop
           end
         end
       end
     end
 
-    # Gets the total number of compilation instances created with a given stemcell.
-    # @param [Models::Stemcell] stemcell The stemcell the VMs are running.
-    # @return [Integer] The number of instances running a given stemcell.
     def get_num_instances(stemcell)
+      canonical_stemcell = canonical(stemcell)
       @mutex.synchronize do
-        idle_count = @idle_instances_by_stemcell[stemcell].nil? ? 0 : @idle_instances_by_stemcell[stemcell].size
-        in_use_count = @in_use_instances_by_stemcell[stemcell].nil? ? 0 : @in_use_instances_by_stemcell[stemcell].size
+        idle_count = @idle_instances_by_stemcell.fetch(canonical_stemcell, []).size
+        in_use_count = @in_use_instances_by_stemcell.fetch(canonical_stemcell, []).size
         idle_count + in_use_count
       end
     end
 
-    # An iterator for all compilation VMs on all stemcells.
-    # @yield [DeploymentPlan::Instance] yields each instance in InstanceReuser.
+    def total_instance_count
+      @mutex.synchronize do
+        sum = 0
+        @idle_instances_by_stemcell.values.each{|instances| sum += instances.to_a.count }
+        @in_use_instances_by_stemcell.values.each{|instances| sum += instances.to_a.count }
+        sum
+      end
+    end
+
     def each
-      all_vms = (@idle_instances_by_stemcell.values + @in_use_instances_by_stemcell.values).flatten
-      all_vms.each do |vm|
-        yield vm
+      all_instances = (@idle_instances_by_stemcell.values + @in_use_instances_by_stemcell.values).flatten
+      all_instances.each do |instance|
+        yield instance
       end
     end
 
     private
 
     def release_without_lock(instance)
-      @in_use_instances_by_stemcell.each do |stemcell, vms|
-        vms.each do |v|
-          if instance == v
-            vms.delete(v)
-            @idle_instances_by_stemcell[stemcell] ||= []
-            @idle_instances_by_stemcell[stemcell] << instance
+      @in_use_instances_by_stemcell.each do |canonical_stemcell, in_use_instances|
+        in_use_instances.each do |in_use_instance|
+          if instance == in_use_instance
+            in_use_instances.delete(in_use_instance)
+            @idle_instances_by_stemcell[canonical_stemcell] ||= []
+            @idle_instances_by_stemcell[canonical_stemcell] << instance
           end
         end
       end
     end
+
+    def canonical(stemcell)
+      stemcell.desc
+    end
   end
 end

data/lib/bosh/director/jobs/attach_disk.rb

@@ -21,27 +21,103 @@ module Bosh::Director
       end
 
       def perform
-        instance = Models::Instance.filter(job: @job_name, uuid: @instance_id).to_a.first
+        instance = query_instance_model
 
         if instance.nil? || instance.deployment.name != @deployment_name
           raise AttachDiskErrorUnknownInstance, "Instance '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}' was not found"
         end
 
-        if instance.persistent_disk.nil?
-          raise AttachDiskNoPersistentDisk, "Job '#{@job_name}' is not configured with a persistent disk"
+        if instance.state != 'detached' && instance.state != 'stopped'
+          raise AttachDiskInvalidInstanceState, "Instance '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}' must be in 'bosh stopped' state"
         end
 
-        if instance.state != 'detached'
-          raise AttachDiskInvalidInstanceState, "Instance '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}' must be in 'bosh stopped --hard' state"
+        if instance.persistent_disk.nil?
+          raise AttachDiskNoPersistentDisk, "Job '#{@job_name}' is not configured with a persistent disk"
         end
 
+        previous_persistent_disk = instance.persistent_disk
         @transactor.retryable_transaction(instance.db) do
           instance.persistent_disk.update(active: false)
-          Models::PersistentDisk.create(disk_cid: @disk_cid, instance_id: instance.id, active: true, size: 1, cloud_properties: {})
+
+          orphan_disk = Models::OrphanDisk[:disk_cid => @disk_cid]
+          if orphan_disk
+
+            current_disk = Models::PersistentDisk[instance_id: instance.id]
+            if current_disk
+              create_orphan_disk_from_current_disk(current_disk)
+            end
+
+            create_new_disk_from_orphan_disk(orphan_disk, instance)
+          else
+            Models::PersistentDisk.create(disk_cid: @disk_cid, instance_id: instance.id, active: true, size: 1, cloud_properties: {})
+          end
+        end
+
+        if instance.state == 'stopped'
+          instance = query_instance_model
+          deployment_plan_instance = deployment_plan_instance(instance)
+          if deployment_plan_instance.nil?
+            raise AttachDiskErrorUnknownInstance, "Deployment plan instance not found for instance model with id #{@instance_id}"
+          end
+
+          disk_manager = DiskManager.new(Config.cloud, logger)
+          disk_manager.orphan_mounted_persistent_disk(deployment_plan_instance, previous_persistent_disk)
+          disk_manager.attach_disk(instance)
         end
 
         "attached disk '#{@disk_cid}' to '#{@job_name}/#{@instance_id}' in deployment '#{@deployment_name}'"
       end
+
+      private
+
+      def create_orphan_disk_from_current_disk(current_disk)
+        new_orphan_disk = Models::OrphanDisk.create(disk_cid: current_disk.disk_cid,
+                                                    size: current_disk.size,
+                                                    availability_zone: current_disk.instance.availability_zone,
+                                                    deployment_name: current_disk.instance.deployment.name,
+                                                    instance_name: current_disk.instance.name,
+                                                    cloud_properties: current_disk.cloud_properties)
+
+        current_disk.snapshots.each do |snapshot|
+          Models::OrphanSnapshot.create(orphan_disk: new_orphan_disk,
+                                        snapshot_cid: snapshot.snapshot_cid,
+                                        clean: snapshot.clean,
+                                        snapshot_created_at: snapshot.created_at)
+          snapshot.destroy
+        end
+
+        current_disk.destroy
+      end
+
+      def create_new_disk_from_orphan_disk(orphan_disk, instance)
+        new_disk = Models::PersistentDisk.create(disk_cid: orphan_disk.disk_cid,
+                                                 instance_id: instance.id,
+                                                 active: true,
+                                                 size: orphan_disk.size,
+                                                 cloud_properties: orphan_disk.cloud_properties)
+
+        orphan_disk.orphan_snapshots.each do |snapshot|
+          Models::Snapshot.create(persistent_disk: new_disk, snapshot_cid: snapshot.snapshot_cid, clean: snapshot.clean)
+          snapshot.destroy
+        end
+
+        orphan_disk.destroy
+      end
+
+      def query_instance_model
+        Models::Instance.filter(job: @job_name, uuid: @instance_id).to_a.first
+      end
+
+      def deployment_plan_instance(instance)
+        deployment_model = Api::DeploymentLookup.new.by_name(@deployment_name)
+        planner_factory = DeploymentPlan::PlannerFactory.create(logger)
+        deployment_plan = planner_factory.create_from_model(deployment_model)
+        job = deployment_plan.job(@job_name)
+
+        deployment_plan_instance = DeploymentPlan::Instance.create_from_job(job, 0, instance.state, deployment_model, instance.state, instance.availability_zone, logger)
+        deployment_plan_instance.bind_existing_instance_model(instance)
+        deployment_plan_instance
+      end
     end
   end
 end

data/lib/bosh/director/jobs/export_release.rb

@@ -27,7 +27,7 @@ module Bosh::Director
       def perform
         logger.info("Exporting release: #{@release_name}/#{@release_version} for #{@stemcell_os}/#{@stemcell_version}")
 
-        deployment_plan_stemcell = Bosh::Director::DeploymentPlan::Stemcell.new({
+        deployment_plan_stemcell = Bosh::Director::DeploymentPlan::Stemcell.parse({
             "os" => @stemcell_os,
             "version" => @stemcell_version
           })
@@ -45,7 +45,7 @@ module Bosh::Director
 
         planner_factory = DeploymentPlan::PlannerFactory.create(logger)
         planner = planner_factory.create_from_model(targeted_deployment)
-        deployment_plan_stemcell.bind_model(planner)
+        deployment_plan_stemcell.bind_model(planner.model)
 
         stemcell_model = deployment_plan_stemcell.model
         logger.info "Will compile with stemcell: #{stemcell_model.desc}"

data/lib/bosh/director/models/instance.rb

@@ -61,6 +61,10 @@ module Bosh::Director::Models
       self.dns_records = JSON.dump(list)
     end
 
+    def name
+      "#{self.job}/#{self.uuid}"
+    end
+
     def to_s
       "#{self.job}/#{self.index} (#{self.uuid})"
     end

data/lib/bosh/director/version.rb

@@ -1,5 +1,5 @@
 module Bosh
   module Director
-    VERSION = '1.3196.0'
+    VERSION = '1.3197.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bosh-director
 version: !ruby/object:Gem::Version
-  version: 1.3196.0
+  version: 1.3197.0
 platform: ruby
 authors:
 - VMware
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bosh_common
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh_cpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh-registry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: blobstore_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh-director-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh-template
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3196.0
+        version: 1.3197.0
 - !ruby/object:Gem::Dependency
   name: bosh_openstack_cpi
   requirement: !ruby/object:Gem::Requirement