Enhance global /v3/info/usage_summary endpoint

* return the same information as for /v3/organizations/:guid/usage_summary, aggregated over all orgs

Author: jochenehret

app/fetchers/global_usage_summary_fetcher.rb

@@ -21,11 +21,39 @@ def summary
 
         summary.memory_in_mb = running_task_memory + started_app_memory
 
+        summary.routes = Route.
+                         dataset.
+                         count
+
+        summary.service_instances = ServiceInstance.
+                                    dataset.
+                                    where(is_gateway_service: false).
+                                    count
+
+        summary.reserved_ports = Route.
+                                 join(:domains, id: :domain_id).
+                                 where { (Sequel[:domains][:router_group_guid] !~ nil) & (Sequel[:routes][:port] !~ nil) }.
+                                 count
+
+        summary.domains = Domain.
+                          dataset.
+                          where { Sequel[:owning_organization_id] !~ nil }.
+                          count
+
+        summary.per_app_tasks = TaskModel.
+                                dataset.
+                                where(state: [TaskModel::PENDING_STATE, TaskModel::RUNNING_STATE]).
+                                count
+
+        summary.service_keys = ServiceKey.
+                               dataset.
+                               count
+
         summary
       end
 
       class Summary
-        attr_accessor :started_instances, :memory_in_mb
+        attr_accessor :started_instances, :memory_in_mb, :routes, :service_instances, :reserved_ports, :domains, :per_app_tasks, :service_keys
       end
     end
   end

app/presenters/v3/info_usage_summary_presenter.rb

@@ -8,7 +8,13 @@ def to_hash
       {
         usage_summary: {
           started_instances: usage_summary.started_instances,
-          memory_in_mb: usage_summary.memory_in_mb
+          memory_in_mb: usage_summary.memory_in_mb,
+          routes: usage_summary.routes,
+          service_instances: usage_summary.service_instances,
+          reserved_ports: usage_summary.reserved_ports,
+          domains: usage_summary.domains,
+          per_app_tasks: usage_summary.per_app_tasks,
+          service_keys: usage_summary.service_keys
         },
         links: {
           self: { href: build_self }

spec/unit/presenters/v3/info_usage_summary_presenter_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'presenters/v3/info_usage_summary_presenter'
+require 'fetchers/global_usage_summary_fetcher'
+
+module VCAP::CloudController::Presenters::V3
+  RSpec.describe InfoUsageSummaryPresenter do
+    describe '#to_hash' do
+      let(:result) { InfoUsageSummaryPresenter.new(VCAP::CloudController::GlobalUsageSummaryFetcher.summary).to_hash }
+
+      it 'presents the global usage summary as json' do
+        expect(result[:usage_summary][:started_instances]).to eq(0)
+        expect(result[:usage_summary][:memory_in_mb]).to eq(0)
+        expect(result[:usage_summary][:routes]).to eq(0)
+        expect(result[:usage_summary][:service_instances]).to eq(0)
+        expect(result[:usage_summary][:reserved_ports]).to eq(0)
+        expect(result[:usage_summary][:domains]).to eq(1)
+        expect(result[:usage_summary][:per_app_tasks]).to eq(0)
+        expect(result[:usage_summary][:service_keys]).to eq(0)
+
+        expect(result[:links][:self][:href]).to match(%r{/v3/info/usage_summary$})
+      end
+    end
+  end
+end