Browse Source

Merge pull request #510 from aboch/sc

Make lookupSandboxID() reliable
Madhu Venugopal 10 years ago
parent
commit
52bb21b7bd
2 changed files with 3 additions and 1 deletions
  1. 2 0
      libnetwork/client/client_test.go
  2. 1 1
      libnetwork/client/service.go

+ 2 - 0
libnetwork/client/client_test.go

@@ -87,6 +87,8 @@ func setupMockHTTPCallback() {
 				return nopCloser{bytes.NewBufferString("")}, dummyHTTPHdr, 400, fmt.Errorf("Bad Request")
 			} else if strings.Contains(path, fmt.Sprintf("sandboxes?container-id=%s", mockContainerID)) {
 				rsp = string(mockSbListJSON)
+			} else if strings.Contains(path, fmt.Sprintf("sandboxes?partial-container-id=%s", mockContainerID)) {
+				rsp = string(mockSbListJSON)
 			}
 		case "POST":
 			var data []byte

+ 1 - 1
libnetwork/client/service.go

@@ -115,7 +115,7 @@ func lookupContainerID(cli *NetworkCli, cnNameID string) (string, error) {
 }
 
 func lookupSandboxID(cli *NetworkCli, containerID string) (string, error) {
-	obj, _, err := readBody(cli.call("GET", fmt.Sprintf("/sandboxes?container-id=%s", containerID), nil, nil))
+	obj, _, err := readBody(cli.call("GET", fmt.Sprintf("/sandboxes?partial-container-id=%s", containerID), nil, nil))
 	if err != nil {
 		return "", err
 	}