From c8b246683be2cacc1eff27d9ce77346d932c4ef8 Mon Sep 17 00:00:00 2001 From: fraenkel Date: Wed, 30 Apr 2014 21:13:45 -0400 Subject: [PATCH] Display the entire org quota information --- src/cf/commands/organization/org.go | 7 +++++-- src/cf/commands/organization/org_test.go | 4 ++-- src/cf/models/quota.go | 5 ++++- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/src/cf/commands/organization/org.go b/src/cf/commands/organization/org.go index 2cd98f5ffde..d9b4e544146 100644 --- a/src/cf/commands/organization/org.go +++ b/src/cf/commands/organization/org.go @@ -3,6 +3,7 @@ package organization import ( "cf/command_metadata" "cf/configuration" + "cf/formatters" "cf/requirements" "cf/terminal" "errors" @@ -67,9 +68,11 @@ func (cmd *ShowOrg) Run(c *cli.Context) { spaces = append(spaces, space.Name) } - orgMemoryLimit := fmt.Sprintf("%s (%dM memory limit)", org.QuotaDefinition.Name, org.QuotaDefinition.MemoryLimit) + quota := org.QuotaDefinition + orgQuota := fmt.Sprintf("%s (%dM memory limit, %d routes, %d services, paid services %s)", + quota.Name, quota.MemoryLimit, quota.RoutesLimit, quota.ServicesLimit, formatters.Allowed(quota.NonBasicServicesAllowed)) cmd.ui.Say(" domains: %s", terminal.EntityNameColor(strings.Join(domains, ", "))) - cmd.ui.Say(" quota: %s", terminal.EntityNameColor(orgMemoryLimit)) + cmd.ui.Say(" quota: %s", terminal.EntityNameColor(orgQuota)) cmd.ui.Say(" spaces: %s", terminal.EntityNameColor(strings.Join(spaces, ", "))) } diff --git a/src/cf/commands/organization/org_test.go b/src/cf/commands/organization/org_test.go index 2a276b29c8e..147db6409a8 100644 --- a/src/cf/commands/organization/org_test.go +++ b/src/cf/commands/organization/org_test.go @@ -79,7 +79,7 @@ var _ = Describe("Testing with ginkgo", func() { org := models.Organization{} org.Name = "my-org" org.Guid = "my-org-guid" - org.QuotaDefinition = models.NewQuotaFields("cantina-quota", 512) + org.QuotaDefinition = models.NewQuotaFields("cantina-quota", 512, 2, 5, true) org.Spaces = []models.SpaceFields{developmentSpaceFields, stagingSpaceFields} org.Domains = []models.DomainFields{domainFields, cfAppDomainFields} @@ -95,7 +95,7 @@ var _ = Describe("Testing with ginkgo", func() { []string{"OK"}, []string{"my-org"}, []string{" domains:", "cfapps.io", "cf-app.com"}, - []string{" quota: ", "cantina-quota", "512M"}, + []string{" quota: ", "cantina-quota", "512M", "2 routes", "5 services", "paid services allowed"}, []string{" spaces:", "development", "staging"}, )) }) diff --git a/src/cf/models/quota.go b/src/cf/models/quota.go index 27434b5cd88..70b0a01cc5e 100644 --- a/src/cf/models/quota.go +++ b/src/cf/models/quota.go @@ -1,8 +1,11 @@ package models -func NewQuotaFields(name string, memory uint64) (q QuotaFields) { +func NewQuotaFields(name string, memory uint64, routes int, services int, nonbasicservices bool) (q QuotaFields) { q.Name = name q.MemoryLimit = memory + q.RoutesLimit = routes + q.ServicesLimit = services + q.NonBasicServicesAllowed = nonbasicservices return }