fix check against desired number of instances to scale down to

Author: sethboyles

lib/cloud_controller/deployment_updater/actions/scale.rb

@@ -37,19 +37,19 @@ def call
             end
 
             ScaleDownCanceled.new(deployment).call
-            ScaleDownOldProcess.new(deployment, oldest_web_process_with_instances, instances_to_scale_down).call
+            ScaleDownOldProcess.new(deployment, oldest_web_process_with_instances, desired_old_instances).call
 
-            deploying_web_process.update(instances: instances_to_scale_up)
+            deploying_web_process.update(instances: desired_new_instances)
           end
         end
 
         private
 
-        def instances_to_scale_down
+        def desired_old_instances
           [(oldest_web_process_with_instances.instances - deployment.max_in_flight), 0].max
         end
 
-        def instances_to_scale_up
+        def desired_new_instances
           [deploying_web_process.instances + deployment.max_in_flight, deployment.original_web_process_instance_count].min
         end
 

lib/cloud_controller/deployment_updater/actions/scale_down_old_process.rb

@@ -2,22 +2,22 @@ module VCAP::CloudController
   module DeploymentUpdater
     module Actions
       class ScaleDownOldProcess
-        attr_reader :deployment, :process, :app, :instances_to_scale_down
+        attr_reader :deployment, :process, :app, :desired_instances
 
-        def initialize(deployment, process, instances_to_scale_down)
+        def initialize(deployment, process, desired_instances)
           @deployment = deployment
           @app = deployment.app
           @process = process
-          @instances_to_scale_down = instances_to_scale_down
+          @desired_instances = desired_instances
         end
 
         def call
-          if process.instances <= instances_to_scale_down && is_interim_process?(process)
+          if desired_instances == 0 && is_interim_process?(process)
             process.destroy
             return
           end
 
-          process.update(instances: instances_to_scale_down)
+          process.update(instances: desired_instances)
         end
 
         private

spec/unit/lib/cloud_controller/deployment_updater/actions/scale_spec.rb

@@ -267,18 +267,11 @@ module VCAP::CloudController
         )
       end
 
-      let!(:oldest_route_mapping) do
-        RouteMappingModel.make(app: oldest_web_process_with_instances.app, process_type: oldest_web_process_with_instances.type)
-      end
-
-      let!(:oldest_label) { ProcessLabelModel.make(resource_guid: oldest_web_process_with_instances.guid, key_name: 'test', value: 'bommel') }
-
       it 'destroys the oldest web process and ignores the original web process' do
         expect do
           subject.call
         end.not_to(change { ProcessModel.find(guid: web_process.guid) })
         expect(ProcessModel.find(guid: oldest_web_process_with_instances.guid)).to be_nil
-        expect(oldest_label).not_to exist
       end
     end