clearlinux/libnetwork
2
0
Fork 0
mirror of https://github.com/clearlinux/libnetwork.git synced 2026-10-03 15:28:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Updating CallFunc to match the Docker CLI API changes

Browse Source 
Updated Docker deps to pickup UI changes

Signed-off-by: Madhu Venugopal <madhu@docker.com>
This commit is contained in:
Madhu Venugopal
2015-06-15 09:41:28 -07:00
parent 41ce4e0280
commit 3c58b7a79d
56 changed files with 4368 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/client.go
+3 -2
View File
@@ -4,6 +4,7 @@ import (
"fmt"
"io"
"io/ioutil"
"net/http"
"reflect"
"strings"
@@ -11,7 +12,7 @@ import (
)
// CallFunc provides environment specific call utility to invoke backend functions from UI
type CallFunc func(string, string, interface{}, map[string][]string) (io.ReadCloser, int, error)
type CallFunc func(string, string, interface{}, map[string][]string) (io.ReadCloser, http.Header, int, error)
// NetworkCli is the UI object for network subcmds
type NetworkCli struct {
@@ -96,7 +97,7 @@ func (cli *NetworkCli) Subcmd(chain, name, signature, description string, exitOn
return flags
}
func readBody(stream io.ReadCloser, statusCode int, err error) ([]byte, int, error) {
func readBody(stream io.ReadCloser, hdr http.Header, statusCode int, err error) ([]byte, int, error) {
if stream != nil {
defer stream.Close()
}
client/client_test.go
+7 -4
View File
@@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"io"
"net/http"
"os"
"strings"
"testing"
@@ -24,7 +25,7 @@ func TestMain(m *testing.M) {
os.Exit(m.Run())
}
var callbackFunc func(method, path string, data interface{}, headers map[string][]string) (io.ReadCloser, int, error)
var callbackFunc func(method, path string, data interface{}, headers map[string][]string) (io.ReadCloser, http.Header, int, error)
var mockNwJSON, mockNwListJSON, mockServiceJSON, mockServiceListJSON []byte
var mockNwName = "test"
var mockNwID = "2a3456789"
@@ -45,7 +46,9 @@ func setupMockHTTPCallback() {
srvList = append(srvList, ep)
mockServiceListJSON, _ = json.Marshal(srvList)
callbackFunc = func(method, path string, data interface{}, headers map[string][]string) (io.ReadCloser, int, error) {
dummyHTTPHdr := http.Header{}
callbackFunc = func(method, path string, data interface{}, headers map[string][]string) (io.ReadCloser, http.Header, int, error) {
var rsp string
switch method {
case "GET":
@@ -74,7 +77,7 @@ func setupMockHTTPCallback() {
} else if strings.HasSuffix(path, "services/"+mockServiceID) {
rsp = string(mockServiceJSON)
} else if strings.Contains(path, "containers") {
return nopCloser{bytes.NewBufferString("")}, 400, fmt.Errorf("Bad Request")
return nopCloser{bytes.NewBufferString("")}, dummyHTTPHdr, 400, fmt.Errorf("Bad Request")
}
case "POST":
var data []byte
@@ -90,7 +93,7 @@ func setupMockHTTPCallback() {
case "DELETE":
rsp = ""
}
return nopCloser{bytes.NewBufferString(rsp)}, 200, nil
return nopCloser{bytes.NewBufferString(rsp)}, dummyHTTPHdr, 200, nil
}
}