kemko/nomad
1
0
Fork 0
mirror of https://github.com/kemko/nomad.git synced 2026-01-05 01:45:44 +03:00
Code Issues Packages Projects Releases Wiki Activity

resources are expected by state store to be plural

Browse Source
This commit is contained in:
Chelsea Holland Komlo
2017-08-04 14:18:46 +00:00
parent 01640d8791
commit ca4ed646a9
4 changed files with 76 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
command/agent/resources_endpoint.go
View File

@@ -6,7 +6,7 @@ import (
)
// ResourcesRequest accepts a prefix and context and returns a list of matching
// prefixes for that context.
// IDs for that context.
func (s *HTTPServer) ResourcesRequest(resp http.ResponseWriter, req *http.Request) (interface{}, error) {
if req.Method == "POST" || req.Method == "PUT" {
return s.resourcesRequest(resp, req)

43
command/agent/resources_endpoint_test.go
View File

@@ -43,7 +43,7 @@ func TestHTTP_Resources_POST(t *testing.T) {
httpTest(t, nil, func(s *TestAgent) {
createJobForTest(testJob, s, t)
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "job"}
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
if err != nil {
@@ -60,11 +60,13 @@ func TestHTTP_Resources_POST(t *testing.T) {
assert.Equal(t, 1, len(res.Matches))
j := res.Matches["job"]
j := res.Matches["jobs"]
assert.Equal(t, 1, len(j))
assert.Equal(t, j[0], testJob)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
@@ -75,7 +77,7 @@ func TestHTTP_Resources_PUT(t *testing.T) {
httpTest(t, nil, func(s *TestAgent) {
createJobForTest(testJob, s, t)
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "job"}
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("PUT", "/v1/resources", encodeReq(data))
if err != nil {
@@ -92,11 +94,13 @@ func TestHTTP_Resources_PUT(t *testing.T) {
assert.Equal(t, 1, len(res.Matches))
j := res.Matches["job"]
j := res.Matches["jobs"]
assert.Equal(t, 1, len(j))
assert.Equal(t, j[0], testJob)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
@@ -113,7 +117,7 @@ func TestHTTP_Resources_MultipleJobs(t *testing.T) {
createJobForTest(testJobB, s, t)
createJobForTest(testJobC, s, t)
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "job"}
data := structs.ResourcesRequest{Prefix: testJobPrefix, Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
if err != nil {
@@ -130,12 +134,15 @@ func TestHTTP_Resources_MultipleJobs(t *testing.T) {
assert.Equal(t, 1, len(res.Matches))
j := res.Matches["job"]
j := res.Matches["jobs"]
assert.Equal(t, 2, len(j))
assert.Contains(t, j, testJobA)
assert.Contains(t, j, testJobB)
assert.NotContains(t, j, testJobC)
assert.Equal(t, res.Truncations["job"], false)
assert.NotEqual(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
@@ -145,15 +152,14 @@ func TestHTTP_ResoucesList_Evaluation(t *testing.T) {
state := s.Agent.server.State()
eval1 := mock.Eval()
eval2 := mock.Eval()
err := state.UpsertEvals(1000,
err := state.UpsertEvals(9000,
[]*structs.Evaluation{eval1, eval2})
if err != nil {
t.Fatalf("err: %v", err)
}
// Make the HTTP request
evalPrefix := eval1.ID[:len(eval1.ID)-2]
data := structs.ResourcesRequest{Prefix: evalPrefix, Context: "eval"}
prefix := eval1.ID[:len(eval1.ID)-2]
data := structs.ResourcesRequest{Prefix: prefix, Context: "evals"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
if err != nil {
t.Fatalf("err: %v", err)
@@ -169,19 +175,20 @@ func TestHTTP_ResoucesList_Evaluation(t *testing.T) {
assert.Equal(t, 1, len(res.Matches))
j := res.Matches["eval"]
j := res.Matches["evals"]
assert.Equal(t, 1, len(j))
assert.Contains(t, j, eval1.ID)
assert.NotContains(t, j, eval2.ID)
assert.Equal(t, res.Truncations["eval"], false)
assert.Equal(t, res.Truncations["evals"], false)
assert.Equal(t, "9000", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
func TestHTTP_Resources_NoJob(t *testing.T) {
t.Parallel()
httpTest(t, nil, func(s *TestAgent) {
data := structs.ResourcesRequest{Prefix: "12345", Context: "job"}
data := structs.ResourcesRequest{Prefix: "12345", Context: "jobs"}
req, err := http.NewRequest("POST", "/v1/resources", encodeReq(data))
if err != nil {
@@ -198,6 +205,8 @@ func TestHTTP_Resources_NoJob(t *testing.T) {
assert.Equal(t, 1, len(res.Matches))
assert.Equal(t, 0, len(res.Matches["jobs"]))
assert.Equal(t, "0", respW.HeaderMap.Get("X-Nomad-Index"))
})
}
@@ -211,7 +220,7 @@ func TestHTTP_Resources_NoContext(t *testing.T) {
state := s.Agent.server.State()
eval1 := mock.Eval()
eval1.ID = testJobID
err := state.UpsertEvals(1000,
err := state.UpsertEvals(9000,
[]*structs.Evaluation{eval1})
if err != nil {
t.Fatalf("err: %v", err)
@@ -232,8 +241,8 @@ func TestHTTP_Resources_NoContext(t *testing.T) {
res := resp.(structs.ResourcesResponse)
matchedJobs := res.Matches["job"]
matchedEvals := res.Matches["eval"]
matchedJobs := res.Matches["jobs"]
matchedEvals := res.Matches["evals"]
assert.Equal(t, 1, len(matchedJobs))
assert.Equal(t, 1, len(matchedEvals))