Skip to content

Commit 453a17e

Browse files
authored
Fix space usage summary (#4482)
* only count managed service instances, not user provided service instances * this is consistent with the org usage summary and the global info usage summary
1 parent 3fc5eca commit 453a17e

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/presenters/v3/space_usage_summary_presenter.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ def to_hash
88
started_instances: started_instances,
99
memory_in_mb: space.memory_used,
1010
routes: space.routes_dataset.count,
11-
service_instances: space.service_instances_dataset.count,
11+
service_instances: space.managed_service_instances_dataset.count,
1212
reserved_ports: VCAP::CloudController::SpaceReservedRoutePorts.new(space).count,
1313
domains: space.organization.owned_private_domains_dataset.count,
1414
per_app_tasks: space.running_and_pending_tasks_count,

spec/unit/presenters/v3/space_usage_summary_presenter_spec.rb

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,9 @@ module VCAP::CloudController::Presenters::V3
4242
let(:broker) { VCAP::CloudController::ServiceBroker.make }
4343
let(:service) { VCAP::CloudController::Service.make(service_broker: broker) }
4444
let(:service_plan) { VCAP::CloudController::ServicePlan.make(service: service, public: true) }
45-
let(:service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space:, service_plan:) }
46-
let!(:service_key) { VCAP::CloudController::ServiceKey.make(service_instance:) }
45+
let!(:user_provided_service_instance) { VCAP::CloudController::UserProvidedServiceInstance.make(space:) }
46+
let(:managed_service_instance) { VCAP::CloudController::ManagedServiceInstance.make(space:, service_plan:) }
47+
let!(:service_key) { VCAP::CloudController::ServiceKey.make(service_instance: managed_service_instance) }
4748

4849
describe '#to_hash' do
4950
let(:result) { SpaceUsageSummaryPresenter.new(space).to_hash }

0 commit comments

Comments
 (0)