app/lib/actions/katello/host/remove_subscriptions.rb in katello-3.3.2 vs app/lib/actions/katello/host/remove_subscriptions.rb in katello-3.4.0.rc1

- old
+ new

@@ -4,22 +4,24 @@ class RemoveSubscriptions < Actions::EntryAction middleware.use Actions::Middleware::KeepCurrentUser def plan(host, pools_with_quantities_params) action_subject(host) - pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity| - ::Katello::PoolWithQuantities.fetch(pool_with_quantity) - end - cp_consumer = host.subscription_facet.candlepin_consumer - entitlements = pools_with_quantities.map do |pool_with_quantities| - cp_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities) - end - pool_ids = [] - entitlements.flatten.each do |entitlement| - pool_ids << entitlement['pool']['id'] - plan_action(::Actions::Candlepin::Consumer::RemoveSubscription, :uuid => host.subscription_facet.uuid, - :entitlement_id => entitlement['id'], :pool_id => entitlement['pool']['id']) + sequence do + pools_with_quantities = pools_with_quantities_params.map do |pool_with_quantity| + ::Katello::PoolWithQuantities.fetch(pool_with_quantity) + end + cp_consumer = host.subscription_facet.candlepin_consumer + entitlements = pools_with_quantities.map do |pool_with_quantities| + cp_consumer.filter_entitlements(pool_with_quantities.pool.cp_id, pool_with_quantities.quantities) + end + + entitlements.flatten.each do |entitlement| + pool_ids << entitlement['pool']['id'] + plan_action(::Actions::Candlepin::Consumer::RemoveSubscription, :uuid => host.subscription_facet.uuid, + :entitlement_id => entitlement['id'], :pool_id => entitlement['pool']['id']) + end end plan_self(:host_id => host.id, :host_name => host.name, :pool_ids => pool_ids) end def finalize