Finish out each Reporter impl (#69)

* finish impl of space report, remove spaceRefs from org reporter for time being

* finish out org report interface impl

* name of summary report can be a big ol bytebuffer of orgs aggregated together. Maybe can be fixed later

* finish out impl of summary report

* README example should remove percentage memory used

Author: aegershman

README.md

@@ -37,24 +37,24 @@ cf usage-report -o voyager -o tenzing --format table
 
 ```txt
 org voyager is consuming 60416 MB of 83968 MB
-        space dev is consuming 25600 MB memory (30%) of org quota
+        space dev is consuming 25600 MB memory of org quota
                 AIs billable: 20
                 AIs canonical: 18 (13 running, 5 stopped)
                 SCS instances: 2
-        space test is consuming 34816 MB memory (41%) of org quota
+        space test is consuming 34816 MB memory of org quota
                 AIs billable: 20
                 AIs canonical: 19 (17 running, 2 stopped)
                 SCS instances: 1
 org tenzing is consuming 0 MB of 83968 MB
-        space dev is consuming 0 MB memory (0%) of org quota
+        space dev is consuming 0 MB memory of org quota
                 AIs billable: 2
                 AIs canonical: 0 (0 running, 0 stopped)
                 SCS instances: 2
-        space test is consuming 0 MB memory (0%) of org quota
+        space test is consuming 0 MB memory of org quota
                 AIs billable: 2
                 AIs canonical: 0 (0 running, 0 stopped)
                 SCS instances: 2
-        space integration is consuming 0 MB memory (0%) of org quota
+        space integration is consuming 0 MB memory of org quota
                 AIs billable: 1
                 AIs canonical: 0 (0 running, 0 stopped)
                 SCS instances: 1

models/org_report.go

@@ -10,7 +10,6 @@ type OrgReporter interface {
 type OrgReport struct {
 	orgRef          Org
 	spaceReportsRef []SpaceReporter
-	// spacesRef       []Space
 }
 
 // NewOrgReport -
@@ -23,10 +22,10 @@ func NewOrgReport(org Org) *OrgReport {
 	return &OrgReport{
 		orgRef:          org,
 		spaceReportsRef: spaceReports,
-		// spacesRef:       org.Spaces,
 	}
 }
 
+// SpaceReports -
 func (o *OrgReport) SpaceReports() []SpaceReporter {
 	return o.spaceReportsRef
 }
@@ -52,7 +51,6 @@ func (o *OrgReport) AppsCount() int {
 // MemoryQuota -
 func (o *OrgReport) MemoryQuota() int {
 	return o.orgRef.MemoryQuota
-
 }
 
 // MemoryUsage -
@@ -102,24 +100,22 @@ func (o *OrgReport) ServicesSuiteForPivotalPlatformCount() int {
 
 }
 
-// StoppedAppInstancesCount - TODO
+// StoppedAppInstancesCount -
 func (o *OrgReport) StoppedAppInstancesCount() int {
-	// count := 0
-	// for _, space := range o.spaceReportsRef {
-	// 	count += space.ServicesSuiteForPivotalPlatformCount()
-	// }
-	// return count
-	return 0
+	count := 0
+	for _, space := range o.spaceReportsRef {
+		count += space.StoppedAppInstancesCount()
+	}
+	return count
 }
 
-// StoppedAppsCount - TODO
+// StoppedAppsCount -
 func (o *OrgReport) StoppedAppsCount() int {
-	// count := 0
-	// for _, space := range o.spaceReportsRef {
-	// 	count += space.ServicesSuiteForPivotalPlatformCount()
-	// }
-	// return count
-	return 0
+	count := 0
+	for _, space := range o.spaceReportsRef {
+		count += space.StoppedAppsCount()
+	}
+	return count
 }
 
 // SpringCloudServicesCount -

models/space_report.go

@@ -53,6 +53,7 @@ func (s *SpaceReport) ServicesSuiteForPivotalPlatformCount() int {
 	return count
 }
 
+// Name -
 func (s *SpaceReport) Name() string {
 	return s.spaceRef.Name
 }
@@ -88,9 +89,9 @@ func (s *SpaceReport) BillableAppInstancesCount() int {
 	return count
 }
 
-// ConsumedMemory returns the amount of memory consumed by all
+// MemoryUsage returns the amount of memory consumed by all
 // running canonical application instances within a space
-func (s *SpaceReport) ConsumedMemory() int {
+func (s *SpaceReport) MemoryUsage() int {
 	count := 0
 	for _, app := range s.spaceRef.Apps {
 		count += int(app.RunningInstances * app.Memory)
@@ -139,18 +140,17 @@ func (s *SpaceReport) ServicesCount() int {
 	return count
 }
 
+// MemoryQuota - TODO unimplemented on 'space' level
 func (s *SpaceReport) MemoryQuota() int {
-	return 0
-}
-
-func (s *SpaceReport) MemoryUsage() int {
-	return 0
+	return -1
 }
 
+// StoppedAppInstancesCount -
 func (s *SpaceReport) StoppedAppInstancesCount() int {
-	return 0
+	return s.AppInstancesCount() - s.RunningAppInstancesCount()
 }
 
+// StoppedAppsCount -
 func (s *SpaceReport) StoppedAppsCount() int {
-	return 0
+	return s.AppsCount() - s.RunningAppsCount()
 }

models/summary_report.go

@@ -1,5 +1,7 @@
 package models
 
+import "bytes"
+
 // SummaryReporter -
 type SummaryReporter interface {
 	OrgReports() []OrgReporter
@@ -8,8 +10,8 @@ type SummaryReporter interface {
 
 // SummaryReport holds an aggregated view of multiple OrgReports
 type SummaryReport struct {
-	orgsRef       []Org
 	orgReportsRef []OrgReporter
+	orgsRef       []Org
 }
 
 // NewSummaryReport -
@@ -25,8 +27,18 @@ func NewSummaryReport(orgs []Org) *SummaryReport {
 	}
 }
 
+// OrgReports -
+func (s *SummaryReport) OrgReports() []OrgReporter {
+	return s.orgReportsRef
+}
+
+// Name -
 func (s *SummaryReport) Name() string {
-	return "nil"
+	var name bytes.Buffer
+	for _, org := range s.orgReportsRef {
+		name.WriteString(org.Name())
+	}
+	return name.String()
 }
 
 // ServicesSuiteForPivotalPlatformCount returns the number of service instances
@@ -35,11 +47,11 @@ func (s *SummaryReport) Name() string {
 // see: https://network.pivotal.io/products/pcf-services
 // (I know right? It's an intense function name)
 func (s *SummaryReport) ServicesSuiteForPivotalPlatformCount() int {
-	return 0
-}
-
-func (s *SummaryReport) OrgReports() []OrgReporter {
-	return s.orgReportsRef
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.ServicesSuiteForPivotalPlatformCount()
+	}
+	return count
 }
 
 // AppInstancesCount returns the count of declared canonical app instances
@@ -53,7 +65,11 @@ func (s *SummaryReport) OrgReports() []OrgReporter {
 //
 // then you'd have "5 app instances"
 func (s *SummaryReport) AppInstancesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.AppInstancesCount()
+	}
+	return count
 }
 
 // AppsCount returns the count of unique canonical app guids
@@ -67,31 +83,53 @@ func (s *SummaryReport) AppInstancesCount() int {
 //
 // then you'd have "3 unique apps"
 func (s *SummaryReport) AppsCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.AppsCount()
+	}
+	return count
 }
 
 // BillableAppInstancesCount returns the count of "billable" AIs
 //
 // This includes anything which Pivotal deems "billable" as an AI, even if CF
 // considers it a service; e.g., SCS instances (config server, service registry, etc.)
 func (s *SummaryReport) BillableAppInstancesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.BillableAppInstancesCount()
+	}
+	return count
 }
 
 // BillableServicesCount returns the count of "billable" SIs
 //
 // This includes anything which Pivotal deems "billable" as an SI; this might mean
 // subtracting certain services (like SCS) from the count of `cf services`
 func (s *SummaryReport) BillableServicesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.BillableServicesCount()
+	}
+	return count
 }
 
+// MemoryQuota -
 func (s *SummaryReport) MemoryQuota() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.MemoryQuota()
+	}
+	return count
 }
 
+// MemoryUsage -
 func (s *SummaryReport) MemoryUsage() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.MemoryUsage()
+	}
+	return count
 }
 
 // RunningAppInstancesCount returns the count of declared canonical app instances
@@ -105,7 +143,11 @@ func (s *SummaryReport) MemoryUsage() int {
 //
 // then you'd have "4 running app instances"
 func (s *SummaryReport) RunningAppInstancesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.RunningAppInstancesCount()
+	}
+	return count
 }
 
 // RunningAppsCount returns the count of unique canonical app
@@ -119,7 +161,11 @@ func (s *SummaryReport) RunningAppInstancesCount() int {
 //
 // then you'd have "2 running apps"
 func (s *SummaryReport) RunningAppsCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.RunningAppsCount()
+	}
+	return count
 }
 
 // ServicesCount returns total count of registered services
@@ -129,21 +175,40 @@ func (s *SummaryReport) RunningAppsCount() int {
 // those aren't considered in this result. This only counts services registered which
 // show up in `cf services`
 func (s *SummaryReport) ServicesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.ServicesCount()
+	}
+	return count
 }
 
 // SpringCloudServicesCount returns the number of service instances
 // from "spring cloud services" tile, e.g. config-server/service-registry/circuit-breaker/etc.
 //
 // see: https://network.pivotal.io/products/p-spring-cloud-services/
 func (s *SummaryReport) SpringCloudServicesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.SpringCloudServicesCount()
+	}
+	return count
 }
 
+// StoppedAppInstancesCount -
 func (s *SummaryReport) StoppedAppInstancesCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.StoppedAppInstancesCount()
+	}
+	return count
 }
 
+// StoppedAppsCount -
 func (s *SummaryReport) StoppedAppsCount() int {
-	return 0
+	count := 0
+	for _, report := range s.orgReportsRef {
+		count += report.StoppedAppsCount()
+	}
+	return count
+
 }