cmd/snap,daemon: review feedback

add unit tests for the changes to api REST data, simplify test json data for cmd_quota

Author: Meulengracht

cmd/snap/cmd_quota_test.go

@@ -290,20 +290,20 @@ func (s *quotaSuite) TestSetQuotaCpuHappy(c *check.C) {
 		cpuPercentage: 50,
 	}
 	// this data is not tested against, but it should still be valid
-	const getJsonTemplate = `{
+	const getJson = `{
 		"type": "sync",
 		"status-code": 200,
 		"result": {
 			"group-name":"foo",
-			"constraints": { "cpu":{"count":%d, "percentage":%d} },
+			"constraints": { "cpu":{"count":2, "percentage":50} },
 		}
 	}`
 	routes := map[string]http.HandlerFunc{
 		"/v2/quotas": s.makeFakeQuotaPostHandler(
 			c,
 			fakeHandlerOpts,
 		),
-		"/v2/quotas/foo": s.makeFakeGetQuotaGroupHandler(c, fmt.Sprintf(getJsonTemplate, 2, 50)),
+		"/v2/quotas/foo": s.makeFakeGetQuotaGroupHandler(c, getJson),
 		"/v2/changes/42": makeChangesHandler(c),
 	}
 	s.RedirectClientToTestServer(dispatchFakeHandlers(c, routes))
@@ -327,20 +327,20 @@ func (s *quotaSuite) TestSetQuotaSnapServices(c *check.C) {
 		cpuPercentage: 50,
 	}
 	// this data is not tested against, but it should still be valid
-	const getJsonTemplate = `{
+	const getJson = `{
 		"type": "sync",
 		"status-code": 200,
 		"result": {
 			"group-name":"foo",
-			"constraints": { "cpu":{"count":%d, "percentage":%d} },
+			"constraints": { "cpu":{"count":2, "percentage":50} },
 		}
 	}`
 	routes := map[string]http.HandlerFunc{
 		"/v2/quotas": s.makeFakeQuotaPostHandler(
 			c,
 			fakeHandlerOpts,
 		),
-		"/v2/quotas/foo": s.makeFakeGetQuotaGroupHandler(c, fmt.Sprintf(getJsonTemplate, 2, 50)),
+		"/v2/quotas/foo": s.makeFakeGetQuotaGroupHandler(c, getJson),
 		"/v2/changes/42": makeChangesHandler(c),
 	}
 	s.RedirectClientToTestServer(dispatchFakeHandlers(c, routes))

daemon/api_quotas.go

@@ -146,6 +146,7 @@ func getQuotaGroups(c *Command, r *http.Request, _ *auth.UserState) Response {
 			Parent:      group.ParentGroup,
 			Subgroups:   group.SubGroups,
 			Snaps:       group.Snaps,
+			Services:    group.Services,
 			Constraints: createQuotaValues(group),
 			Current:     currentUsage,
 		}

daemon/api_quotas_test.go

@@ -74,9 +74,9 @@ func (s *apiQuotaSuite) SetUpTest(c *check.C) {
 }
 
 func mockQuotas(st *state.State, c *check.C) {
-	err := servicestatetest.MockQuotaInState(st, "foo", "", nil, nil, quota.NewResourcesBuilder().WithMemoryLimit(16*quantity.SizeMiB).Build())
+	err := servicestatetest.MockQuotaInState(st, "foo", "", []string{"test-snap"}, nil, quota.NewResourcesBuilder().WithMemoryLimit(16*quantity.SizeMiB).Build())
 	c.Assert(err, check.IsNil)
-	err = servicestatetest.MockQuotaInState(st, "bar", "foo", nil, nil, quota.NewResourcesBuilder().WithMemoryLimit(4*quantity.SizeMiB).Build())
+	err = servicestatetest.MockQuotaInState(st, "bar", "foo", nil, []string{"test-snap.svc1"}, quota.NewResourcesBuilder().WithMemoryLimit(4*quantity.SizeMiB).Build())
 	c.Assert(err, check.IsNil)
 	err = servicestatetest.MockQuotaInState(st, "baz", "foo", nil, nil, quota.NewResourcesBuilder().WithMemoryLimit(quantity.SizeMiB).Build())
 	c.Assert(err, check.IsNil)
@@ -731,6 +731,7 @@ func (s *apiQuotaSuite) TestListQuotas(c *check.C) {
 		{
 			GroupName:   "bar",
 			Parent:      "foo",
+			Services:    []string{"test-snap.svc1"},
 			Constraints: &client.QuotaValues{Memory: 4 * quantity.SizeMiB},
 			Current:     &client.QuotaValues{Memory: quantity.Size(500)},
 		},
@@ -743,6 +744,7 @@ func (s *apiQuotaSuite) TestListQuotas(c *check.C) {
 		{
 			GroupName:   "foo",
 			Subgroups:   []string{"bar", "baz"},
+			Snaps:       []string{"test-snap"},
 			Constraints: &client.QuotaValues{Memory: 16 * quantity.SizeMiB},
 			Current:     &client.QuotaValues{Memory: quantity.Size(5000)},
 		},
@@ -840,6 +842,7 @@ func (s *apiQuotaSuite) TestGetQuota(c *check.C) {
 	c.Check(res, check.DeepEquals, client.QuotaGroupResult{
 		GroupName:   "bar",
 		Parent:      "foo",
+		Services:    []string{"test-snap.svc1"},
 		Constraints: &client.QuotaValues{Memory: quantity.Size(4194304)},
 		Current:     &client.QuotaValues{Memory: quantity.Size(500)},
 	})