瀏覽代碼

Adding support for network/id/endpoints in api

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Madhu Venugopal 10 年之前
父節點
當前提交
b5a6c849e3
共有 2 個文件被更改,包括 3 次插入3 次删除
  1. 1 1
      libnetwork/api/api.go
  2. 2 2
      libnetwork/api/api_test.go

+ 1 - 1
libnetwork/api/api.go

@@ -89,7 +89,7 @@ func (h *httpHandler) initRouter() {
 			{"/networks/" + nwID, nil, procGetNetwork},
 			{"/networks/" + nwID, nil, procGetNetwork},
 			{"/networks/" + nwID + "/endpoints", []string{"name", epName}, procGetEndpoints},
 			{"/networks/" + nwID + "/endpoints", []string{"name", epName}, procGetEndpoints},
 			{"/networks/" + nwID + "/endpoints", []string{"partial-id", epPID}, procGetEndpoints},
 			{"/networks/" + nwID + "/endpoints", []string{"partial-id", epPID}, procGetEndpoints},
-
+			{"/networks/" + nwID + "/endpoints", nil, procGetEndpoints},
 			{"/networks/" + nwID + "/endpoints/" + epID, nil, procGetEndpoint},
 			{"/networks/" + nwID + "/endpoints/" + epID, nil, procGetEndpoint},
 		},
 		},
 		"POST": {
 		"POST": {

+ 2 - 2
libnetwork/api/api_test.go

@@ -1391,8 +1391,8 @@ func TestEndToEnd(t *testing.T) {
 		t.Fatal(err)
 		t.Fatal(err)
 	}
 	}
 	handleRequest(rsp, req)
 	handleRequest(rsp, req)
-	if rsp.statusCode != http.StatusNotFound {
-		t.Fatalf("Expected StatusNotFound. Got (%d): %s", rsp.statusCode, rsp.body)
+	if rsp.statusCode != http.StatusOK {
+		t.Fatalf("Expected StatusOK. Got (%d): %s", rsp.statusCode, rsp.body)
 	}
 	}
 
 
 	req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints?name=bla", nil)
 	req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints?name=bla", nil)