Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: add mock test for network operations on client side #1020

Merged
merged 1 commit into from
Apr 2, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 0 additions & 63 deletions client/network.go

This file was deleted.

22 changes: 22 additions & 0 deletions client/network_create.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package client

import (
"context"

"github.com/alibaba/pouch/apis/types"
)

// NetworkCreate creates a network.
func (client *APIClient) NetworkCreate(ctx context.Context, req *types.NetworkCreateConfig) (*types.NetworkCreateResp, error) {
resp, err := client.post(ctx, "/networks/create", nil, req, nil)
if err != nil {
return nil, err
}

network := &types.NetworkCreateResp{}

err = decodeBody(network, resp.Body)
ensureCloseReader(resp)

return network, err
}
75 changes: 75 additions & 0 deletions client/network_create_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,75 @@
package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
"testing"

"github.com/alibaba/pouch/apis/types"

"github.com/stretchr/testify/assert"
)

func TestNetworkCreateServerError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusInternalServerError, "Server error")),
}
_, err := client.NetworkCreate(context.Background(), &types.NetworkCreateConfig{})
if err == nil || !strings.Contains(err.Error(), "Server error") {
t.Fatalf("expected a Server Error, got %v", err)
}
}

func TestNetworkCreateDuplicatedError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusConflict, "Container already exists")),
}
_, err := client.NetworkCreate(context.Background(), &types.NetworkCreateConfig{})
if err == nil || strings.Contains(err.Error(), "duplicated container") {
t.Fatalf("expected a Container Already Exists Error, got %v", err)
}
}

func TestNetworkCreate(t *testing.T) {
expectedURL := "/networks/create"

httpClient := newMockClient(func(req *http.Request) (*http.Response, error) {
if !strings.HasPrefix(req.URL.Path, expectedURL) {
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
}
if req.Header.Get("Content-Type") == "application/json" {
createConfig := types.NetworkCreateConfig{}
if err := json.NewDecoder(req.Body).Decode(&createConfig); err != nil {
return nil, fmt.Errorf("failed to parse json: %v", err)
}
}

netCreateResp, err := json.Marshal(types.NetworkCreateResp{
ID: "network_id",
Warning: "warning",
})
if err != nil {
return nil, err
}
return &http.Response{
StatusCode: http.StatusCreated,
Body: ioutil.NopCloser(bytes.NewReader([]byte(netCreateResp))),
}, nil
})

client := &APIClient{
HTTPCli: httpClient,
}

res, err := client.NetworkCreate(context.Background(), &types.NetworkCreateConfig{})
if err != nil {
t.Fatal(err)
}
assert.Equal(t, res.ID, "network_id")
assert.Equal(t, res.Warning, "warning")
}
22 changes: 22 additions & 0 deletions client/network_inspect.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package client

import (
"context"

"github.com/alibaba/pouch/apis/types"
)

// NetworkInspect inspects a network.
func (client *APIClient) NetworkInspect(ctx context.Context, networkID string) (*types.NetworkInspectResp, error) {
resp, err := client.get(ctx, "/networks/"+networkID, nil, nil)
if err != nil {
return nil, err
}

network := &types.NetworkInspectResp{}

err = decodeBody(network, resp.Body)
ensureCloseReader(resp)

return network, err
}
76 changes: 76 additions & 0 deletions client/network_inspect_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
"testing"

"github.com/alibaba/pouch/apis/types"

"github.com/stretchr/testify/assert"
)

func TestNetworkInspectServerError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusInternalServerError, "Server error")),
}
_, err := client.NetworkInspect(context.Background(), "network_id")
if err == nil || !strings.Contains(err.Error(), "Server error") {
t.Fatalf("expected a Server Error, got %v", err)
}
}

func TestNetworkInspectNoFoundError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusConflict, "Not Found")),
}
_, err := client.NetworkInspect(context.Background(), "no network")
if err == nil || !strings.Contains(err.Error(), "Not Found") {
t.Fatalf("expected a Server Error, got %v", err)
}
}

func TestNetworkInspect(t *testing.T) {
expectedURL := "/networks/network_id"

httpClient := newMockClient(func(req *http.Request) (*http.Response, error) {
if !strings.HasPrefix(req.URL.Path, expectedURL) {
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
}
if req.Method != "GET" {
return nil, fmt.Errorf("expected GET method, got %s", req.Method)
}

netInspectResp, err := json.Marshal(types.NetworkInspectResp{
Driver: "bridge",
ID: "1",
Name: "net-1",
EnableIPV6: true,
})
if err != nil {
return nil, err
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte(netInspectResp))),
}, nil
})

client := &APIClient{
HTTPCli: httpClient,
}

network, err := client.NetworkInspect(context.Background(), "network_id")
if err != nil {
t.Fatal(err)
}
assert.Equal(t, network.Name, "net-1")
assert.Equal(t, network.ID, "1")
assert.Equal(t, network.EnableIPV6, true)
assert.Equal(t, network.Driver, "bridge")
}
22 changes: 22 additions & 0 deletions client/network_list.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
package client

import (
"context"

"github.com/alibaba/pouch/apis/types"
)

// NetworkList lists all the networks.
func (client *APIClient) NetworkList(ctx context.Context) (*types.NetworkListResp, error) {
resp, err := client.get(ctx, "/networks", nil, nil)
if err != nil {
return nil, err
}

network := &types.NetworkListResp{}
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not think the naming of network makes sense.

Maybe netListResp := &types.NetworkListResp{} is a little better.


err = decodeBody(network, resp.Body)
ensureCloseReader(resp)

return network, err
}
71 changes: 71 additions & 0 deletions client/network_list_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
package client

import (
"bytes"
"context"
"encoding/json"
"fmt"
"io/ioutil"
"net/http"
"strings"
"testing"

"github.com/alibaba/pouch/apis/types"

"github.com/stretchr/testify/assert"
)

func TestNetworkListServerError(t *testing.T) {
client := &APIClient{
HTTPCli: newMockClient(errorMockResponse(http.StatusInternalServerError, "Server error")),
}
_, err := client.NetworkList(context.Background())
if err == nil || !strings.Contains(err.Error(), "Server error") {
t.Fatalf("expected a Server Error, got %v", err)
}
}

func TestNetworkList(t *testing.T) {
expectedURL := "/networks"

httpClient := newMockClient(func(req *http.Request) (*http.Response, error) {
if !strings.HasPrefix(req.URL.Path, expectedURL) {
return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
}
if req.Method != "GET" {
return nil, fmt.Errorf("expected GET method, got %s", req.Method)
}

netListResp, err := json.Marshal(types.NetworkListResp{
Networks: []*types.NetworkInfo{
{
Driver: "bridge",
ID: "1",
Name: "net-1",
},
{
Driver: "bridge",
ID: "2",
Name: "net-2",
},
},
})
if err != nil {
return nil, err
}
return &http.Response{
StatusCode: http.StatusOK,
Body: ioutil.NopCloser(bytes.NewReader([]byte(netListResp))),
}, nil
})

client := &APIClient{
HTTPCli: httpClient,
}

network, err := client.NetworkList(context.Background())
if err != nil {
t.Fatal(err)
}
assert.Equal(t, len(network.Networks), 2)
}
16 changes: 16 additions & 0 deletions client/network_remove.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package client

import (
"context"
)

// NetworkRemove removes a network.
func (client *APIClient) NetworkRemove(ctx context.Context, networkID string) error {
resp, err := client.delete(ctx, "/networks/"+networkID, nil, nil)
if err != nil {
return err
}

ensureCloseReader(resp)
return err
}
Loading