|
@@ -112,7 +112,7 @@ func TestJoinOptionParser(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
func TestJson(t *testing.T) {
|
|
func TestJson(t *testing.T) {
|
|
- nc := networkCreate{Name: "mynet", NetworkType: bridgeNetType}
|
|
|
|
|
|
+ nc := networkCreate{NetworkType: bridgeNetType}
|
|
b, err := json.Marshal(nc)
|
|
b, err := json.Marshal(nc)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
@@ -124,26 +124,10 @@ func TestJson(t *testing.T) {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- if nc.Name != ncp.Name || nc.NetworkType != ncp.NetworkType {
|
|
|
|
|
|
+ if nc.NetworkType != ncp.NetworkType {
|
|
t.Fatalf("Incorrect networkCreate after json encoding/deconding: %v", ncp)
|
|
t.Fatalf("Incorrect networkCreate after json encoding/deconding: %v", ncp)
|
|
}
|
|
}
|
|
|
|
|
|
- ec := endpointCreate{Name: "mioEp", NetworkID: "0xabcde"}
|
|
|
|
- b, err = json.Marshal(ec)
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- var ecp endpointCreate
|
|
|
|
- err = json.Unmarshal(b, &ecp)
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- if ec.Name != ecp.Name || ec.NetworkID != ecp.NetworkID {
|
|
|
|
- t.Fatalf("Incorrect endpointCreate after json encoding/deconding: %v", ecp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
jl := endpointJoin{ContainerID: "abcdef456789"}
|
|
jl := endpointJoin{ContainerID: "abcdef456789"}
|
|
b, err = json.Marshal(jl)
|
|
b, err = json.Marshal(jl)
|
|
if err != nil {
|
|
if err != nil {
|
|
@@ -157,7 +141,7 @@ func TestJson(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
if jl.ContainerID != jld.ContainerID {
|
|
if jl.ContainerID != jld.ContainerID {
|
|
- t.Fatalf("Incorrect endpointJoin after json encoding/deconding: %v", ecp)
|
|
|
|
|
|
+ t.Fatalf("Incorrect endpointJoin after json encoding/deconding: %v", jld)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
@@ -178,18 +162,18 @@ func TestCreateDeleteNetwork(t *testing.T) {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- goodVars := map[string]string{urlNwName: "myNet"}
|
|
|
|
- _, errRsp := procCreateNetwork(c, goodVars, badBody)
|
|
|
|
|
|
+ vars := make(map[string]string)
|
|
|
|
+ _, errRsp := procCreateNetwork(c, nil, badBody)
|
|
if errRsp == &createdResponse {
|
|
if errRsp == &createdResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
|
|
|
|
- incompleteBody, err := json.Marshal(networkCreate{Name: "myNet"})
|
|
|
|
|
|
+ incompleteBody, err := json.Marshal(networkCreate{})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- _, errRsp = procCreateNetwork(c, goodVars, incompleteBody)
|
|
|
|
|
|
+ _, errRsp = procCreateNetwork(c, vars, incompleteBody)
|
|
if errRsp == &createdResponse {
|
|
if errRsp == &createdResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
@@ -199,47 +183,31 @@ func TestCreateDeleteNetwork(t *testing.T) {
|
|
|
|
|
|
ops := make(map[string]interface{})
|
|
ops := make(map[string]interface{})
|
|
ops[netlabel.GenericData] = options.Generic{}
|
|
ops[netlabel.GenericData] = options.Generic{}
|
|
- nc := networkCreate{Name: "myNet", NetworkType: bridgeNetType, Options: ops}
|
|
|
|
|
|
+ nc := networkCreate{Name: "network_1", NetworkType: bridgeNetType, Options: ops}
|
|
goodBody, err := json.Marshal(nc)
|
|
goodBody, err := json.Marshal(nc)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- badVars := map[string]string{urlNwName: ""}
|
|
|
|
- _, errRsp = procCreateNetwork(c, badVars, goodBody)
|
|
|
|
- if errRsp == &createdResponse {
|
|
|
|
- t.Fatalf("Expected to fail but succeeded")
|
|
|
|
- }
|
|
|
|
- if errRsp.StatusCode != http.StatusBadRequest {
|
|
|
|
- t.Fatalf("Expected StatusBadRequest status code, got: %v", errRsp.StatusCode)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- badVars[urlNwName] = "badNetworkName"
|
|
|
|
- _, errRsp = procCreateNetwork(c, badVars, goodBody)
|
|
|
|
- if errRsp == &createdResponse {
|
|
|
|
- t.Fatalf("Expected to fail but succeeded")
|
|
|
|
- }
|
|
|
|
- if errRsp.StatusCode != http.StatusBadRequest {
|
|
|
|
- t.Fatalf("Expected StatusBadRequest status code, got: %v", errRsp.StatusCode)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- _, errRsp = procCreateNetwork(c, goodVars, goodBody)
|
|
|
|
|
|
+ _, errRsp = procCreateNetwork(c, vars, goodBody)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
- _, errRsp = procDeleteNetwork(c, badVars, nil)
|
|
|
|
|
|
+ vars[urlNwName] = ""
|
|
|
|
+ _, errRsp = procDeleteNetwork(c, vars, nil)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
|
|
|
|
- badVars[urlNwName] = ""
|
|
|
|
- _, errRsp = procDeleteNetwork(c, badVars, nil)
|
|
|
|
|
|
+ vars[urlNwName] = "abc"
|
|
|
|
+ _, errRsp = procDeleteNetwork(c, vars, nil)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
|
|
|
|
- _, errRsp = procDeleteNetwork(c, goodVars, nil)
|
|
|
|
|
|
+ vars[urlNwName] = "network_1"
|
|
|
|
+ _, errRsp = procDeleteNetwork(c, vars, nil)
|
|
if errRsp != &successResponse {
|
|
if errRsp != &successResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
@@ -263,7 +231,7 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- vars := map[string]string{urlNwName: "sh"}
|
|
|
|
|
|
+ vars := make(map[string]string)
|
|
inid, errRsp := procCreateNetwork(c, vars, body)
|
|
inid, errRsp := procCreateNetwork(c, vars, body)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
@@ -274,8 +242,7 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
ec1 := endpointCreate{
|
|
ec1 := endpointCreate{
|
|
- Name: "ep1",
|
|
|
|
- NetworkID: string(nid),
|
|
|
|
|
|
+ Name: "ep1",
|
|
ExposedPorts: []types.TransportPort{
|
|
ExposedPorts: []types.TransportPort{
|
|
types.TransportPort{Proto: types.TCP, Port: uint16(5000)},
|
|
types.TransportPort{Proto: types.TCP, Port: uint16(5000)},
|
|
types.TransportPort{Proto: types.UDP, Port: uint16(400)},
|
|
types.TransportPort{Proto: types.UDP, Port: uint16(400)},
|
|
@@ -291,12 +258,13 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
- ec2 := endpointCreate{Name: "ep2", NetworkID: nid}
|
|
|
|
|
|
+ ec2 := endpointCreate{Name: "ep2"}
|
|
b2, err := json.Marshal(ec2)
|
|
b2, err := json.Marshal(ec2)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ vars[urlNwName] = "sh"
|
|
vars[urlEpName] = "ep1"
|
|
vars[urlEpName] = "ep1"
|
|
ieid1, errRsp := procCreateEndpoint(c, vars, b1)
|
|
ieid1, errRsp := procCreateEndpoint(c, vars, b1)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
@@ -472,6 +440,7 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
|
|
if errRsp != &successResponse {
|
|
if errRsp != &successResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
+ delete(vars, urlEpName)
|
|
iepList, errRsp = procGetEndpoints(c, vars, nil)
|
|
iepList, errRsp = procGetEndpoints(c, vars, nil)
|
|
if errRsp != &successResponse {
|
|
if errRsp != &successResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
@@ -604,85 +573,46 @@ func TestCreateDeleteEndpoints(t *testing.T) {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- vars := map[string]string{urlNwName: "firstNet"}
|
|
|
|
|
|
+ vars := make(map[string]string)
|
|
i, errRsp := procCreateNetwork(c, vars, body)
|
|
i, errRsp := procCreateNetwork(c, vars, body)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
nid := i2s(i)
|
|
nid := i2s(i)
|
|
|
|
|
|
- vbad, err := json.Marshal("bad endppint create data")
|
|
|
|
|
|
+ vbad, err := json.Marshal("bad endppoint create data")
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- vars[urlEpName] = "ep1"
|
|
|
|
|
|
+ vars[urlNwName] = "firstNet"
|
|
_, errRsp = procCreateEndpoint(c, vars, vbad)
|
|
_, errRsp = procCreateEndpoint(c, vars, vbad)
|
|
if errRsp == &createdResponse {
|
|
if errRsp == &createdResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
|
|
|
|
- bad, err := json.Marshal(endpointCreate{Name: "ep1", NetworkID: "123456"})
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
- _, errRsp = procCreateEndpoint(c, vars, bad)
|
|
|
|
- if errRsp == &createdResponse {
|
|
|
|
- t.Fatalf("Expected to fail but succeeded")
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- soso, err := json.Marshal(endpointCreate{Name: "ep11", NetworkID: nid})
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
- _, errRsp = procCreateEndpoint(c, vars, soso)
|
|
|
|
- if errRsp != &mismatchResponse {
|
|
|
|
- t.Fatalf("Expected to fail with \"mismatchResponse\", but got: %v", errRsp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- bla, err := json.Marshal(endpointCreate{Name: "", NetworkID: nid})
|
|
|
|
- if err != nil {
|
|
|
|
- t.Fatal(err)
|
|
|
|
- }
|
|
|
|
- vars[urlNwName] = "firstNet"
|
|
|
|
- vars[urlEpName] = ""
|
|
|
|
- _, errRsp = procCreateEndpoint(c, vars, bla)
|
|
|
|
- if errRsp == &createdResponse {
|
|
|
|
- t.Fatalf("Expected to fail but succeeded: %v", errRsp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- b, err := json.Marshal(endpointCreate{Name: "firstEp", NetworkID: nid})
|
|
|
|
|
|
+ b, err := json.Marshal(endpointCreate{Name: ""})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
vars[urlNwName] = "secondNet"
|
|
vars[urlNwName] = "secondNet"
|
|
- vars[urlEpName] = "firstEp"
|
|
|
|
_, errRsp = procCreateEndpoint(c, vars, b)
|
|
_, errRsp = procCreateEndpoint(c, vars, b)
|
|
if errRsp == &createdResponse {
|
|
if errRsp == &createdResponse {
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
t.Fatalf("Expected to fail but succeeded")
|
|
}
|
|
}
|
|
|
|
|
|
vars[urlNwName] = "firstNet"
|
|
vars[urlNwName] = "firstNet"
|
|
- vars[urlEpName] = "ep1"
|
|
|
|
- _, errRsp = procCreateEndpoint(c, vars, b)
|
|
|
|
- if errRsp != &mismatchResponse {
|
|
|
|
- t.Fatalf("Expected to fail with \"mismatchResponse\", but got: %v", errRsp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- vars = make(map[string]string)
|
|
|
|
_, errRsp = procCreateEndpoint(c, vars, b)
|
|
_, errRsp = procCreateEndpoint(c, vars, b)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected failure but succeeded: %v", errRsp)
|
|
t.Fatalf("Expected failure but succeeded: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
- vars[urlNwName] = "firstNet"
|
|
|
|
- _, errRsp = procCreateEndpoint(c, vars, b)
|
|
|
|
- if errRsp == &successResponse {
|
|
|
|
- t.Fatalf("Expected failure but succeeded: %v", errRsp)
|
|
|
|
|
|
+ b, err = json.Marshal(endpointCreate{Name: "firstEp"})
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- vars[urlEpName] = "firstEp"
|
|
|
|
i, errRsp = procCreateEndpoint(c, vars, b)
|
|
i, errRsp = procCreateEndpoint(c, vars, b)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
@@ -714,8 +644,8 @@ func TestCreateDeleteEndpoints(t *testing.T) {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
- if ep0 != ep1 || ep0 != ep2 || ep0 != ep3 {
|
|
|
|
- t.Fatalf("Diffenrent queries returned different endpoints")
|
|
|
|
|
|
+ if ep0.ID() != ep1.ID() || ep0.ID() != ep2.ID() || ep0.ID() != ep3.ID() {
|
|
|
|
+ t.Fatalf("Diffenrent queries returned different endpoints: \nep0: %v\nep1: %v\nep2: %v\nep3: %v", ep0, ep1, ep2, ep3)
|
|
}
|
|
}
|
|
|
|
|
|
vars = make(map[string]string)
|
|
vars = make(map[string]string)
|
|
@@ -767,18 +697,17 @@ func TestJoinLeave(t *testing.T) {
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
- vars := map[string]string{urlNwName: "network"}
|
|
|
|
- i, errRsp := procCreateNetwork(c, vars, nb)
|
|
|
|
|
|
+ vars := make(map[string]string)
|
|
|
|
+ _, errRsp := procCreateNetwork(c, vars, nb)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
}
|
|
}
|
|
- nid := i2s(i)
|
|
|
|
|
|
|
|
- vars[urlEpName] = "epoint"
|
|
|
|
- eb, err := json.Marshal(endpointCreate{Name: "epoint", NetworkID: nid})
|
|
|
|
|
|
+ eb, err := json.Marshal(endpointCreate{Name: "endpoint"})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
+ vars[urlNwName] = "network"
|
|
_, errRsp = procCreateEndpoint(c, vars, eb)
|
|
_, errRsp = procCreateEndpoint(c, vars, eb)
|
|
if errRsp != &createdResponse {
|
|
if errRsp != &createdResponse {
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
t.Fatalf("Unexepected failure: %v", errRsp)
|
|
@@ -793,6 +722,7 @@ func TestJoinLeave(t *testing.T) {
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ vars[urlEpName] = "endpoint"
|
|
bad, err := json.Marshal(endpointJoin{})
|
|
bad, err := json.Marshal(endpointJoin{})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
@@ -812,44 +742,30 @@ func TestJoinLeave(t *testing.T) {
|
|
vars = make(map[string]string)
|
|
vars = make(map[string]string)
|
|
vars[urlNwName] = ""
|
|
vars[urlNwName] = ""
|
|
vars[urlEpName] = ""
|
|
vars[urlEpName] = ""
|
|
- vars[urlCnID] = cid
|
|
|
|
- _, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
|
|
- if errRsp == &successResponse {
|
|
|
|
- t.Fatalf("Expected failure, got: %v", errRsp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- vars[urlNwName] = "network1"
|
|
|
|
- vars[urlEpName] = ""
|
|
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
vars[urlNwName] = "network"
|
|
vars[urlNwName] = "network"
|
|
- vars[urlEpName] = "endpoint"
|
|
|
|
|
|
+ vars[urlEpName] = ""
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
vars[urlEpName] = "epoint"
|
|
vars[urlEpName] = "epoint"
|
|
- delete(vars, urlCnID)
|
|
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
_, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
|
|
- vars[urlCnID] = "who?"
|
|
|
|
- _, errRsp = procJoinEndpoint(c, vars, jlb)
|
|
|
|
- if errRsp == &successResponse {
|
|
|
|
- t.Fatalf("Expected failure, got: %v", errRsp)
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
- vars[urlCnID] = cid
|
|
|
|
|
|
+ vars[urlEpName] = "endpoint"
|
|
cdi, errRsp := procJoinEndpoint(c, vars, jlb)
|
|
cdi, errRsp := procJoinEndpoint(c, vars, jlb)
|
|
if errRsp != &successResponse {
|
|
if errRsp != &successResponse {
|
|
- t.Fatalf("Unexpected failure, got: %v", errRsp)
|
|
|
|
|
|
+ t.Fatalf("Expected failure, got: %v", errRsp)
|
|
}
|
|
}
|
|
|
|
+
|
|
cd := i2c(cdi)
|
|
cd := i2c(cdi)
|
|
if cd.SandboxKey == "" {
|
|
if cd.SandboxKey == "" {
|
|
t.Fatalf("Empty sandbox key")
|
|
t.Fatalf("Empty sandbox key")
|
|
@@ -898,6 +814,7 @@ func TestJoinLeave(t *testing.T) {
|
|
}
|
|
}
|
|
|
|
|
|
delete(vars, urlCnID)
|
|
delete(vars, urlCnID)
|
|
|
|
+ vars[urlEpName] = "endpoint"
|
|
_, errRsp = procLeaveEndpoint(c, vars, jlb)
|
|
_, errRsp = procLeaveEndpoint(c, vars, jlb)
|
|
if errRsp == &successResponse {
|
|
if errRsp == &successResponse {
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
t.Fatalf("Expected failure, got: %v", errRsp)
|
|
@@ -1194,15 +1111,24 @@ func TestHttpHandlerUninit(t *testing.T) {
|
|
|
|
|
|
handleRequest(rsp, req)
|
|
handleRequest(rsp, req)
|
|
if rsp.statusCode != http.StatusOK {
|
|
if rsp.statusCode != http.StatusOK {
|
|
- t.Fatalf("Unexpectded failure: (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
|
|
+ t.Fatalf("Expected (%d). Got: (%d): %s", http.StatusOK, rsp.statusCode, rsp.body)
|
|
}
|
|
}
|
|
|
|
|
|
- n, err := c.NewNetwork(bridgeNetType, "onenet", nil)
|
|
|
|
|
|
+ var list []*networkResource
|
|
|
|
+ err = json.Unmarshal(rsp.body, &list)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if len(list) != 0 {
|
|
|
|
+ t.Fatalf("Expected empty list. Got %v", list)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ n, err := c.NewNetwork(bridgeNetType, "didietro", nil)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
nwr := buildNetworkResource(n)
|
|
nwr := buildNetworkResource(n)
|
|
- expected, err := json.Marshal([]networkResource{*nwr})
|
|
|
|
|
|
+ expected, err := json.Marshal([]*networkResource{nwr})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
@@ -1230,7 +1156,7 @@ func TestHttpHandlerBadBody(t *testing.T) {
|
|
}
|
|
}
|
|
handleRequest := NewHTTPHandler(c)
|
|
handleRequest := NewHTTPHandler(c)
|
|
|
|
|
|
- req, err := http.NewRequest("POST", "/networks/name/zero-network", &localReader{beBad: true})
|
|
|
|
|
|
+ req, err := http.NewRequest("POST", "/networks", &localReader{beBad: true})
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
@@ -1241,7 +1167,7 @@ func TestHttpHandlerBadBody(t *testing.T) {
|
|
|
|
|
|
body := []byte{}
|
|
body := []byte{}
|
|
lr := newLocalReader(body)
|
|
lr := newLocalReader(body)
|
|
- req, err = http.NewRequest("POST", "/networks/name/zero-network", lr)
|
|
|
|
|
|
+ req, err = http.NewRequest("POST", "/networks", lr)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
@@ -1251,7 +1177,7 @@ func TestHttpHandlerBadBody(t *testing.T) {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
-func TestHttpHandlerGood(t *testing.T) {
|
|
|
|
|
|
+func TestEndToEnd(t *testing.T) {
|
|
defer netutils.SetupTestNetNS(t)()
|
|
defer netutils.SetupTestNetNS(t)()
|
|
|
|
|
|
rsp := newWriter()
|
|
rsp := newWriter()
|
|
@@ -1262,14 +1188,14 @@ func TestHttpHandlerGood(t *testing.T) {
|
|
}
|
|
}
|
|
handleRequest := NewHTTPHandler(c)
|
|
handleRequest := NewHTTPHandler(c)
|
|
|
|
|
|
- nc := networkCreate{Name: "zero-network", NetworkType: bridgeNetType}
|
|
|
|
|
|
+ // Create network
|
|
|
|
+ nc := networkCreate{Name: "network-fiftyfive", NetworkType: bridgeNetType}
|
|
body, err := json.Marshal(nc)
|
|
body, err := json.Marshal(nc)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
-
|
|
|
|
lr := newLocalReader(body)
|
|
lr := newLocalReader(body)
|
|
- req, err := http.NewRequest("POST", "/networks/name/zero-network", lr)
|
|
|
|
|
|
+ req, err := http.NewRequest("POST", "/networks", lr)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
@@ -1281,13 +1207,79 @@ func TestHttpHandlerGood(t *testing.T) {
|
|
t.Fatalf("Empty response body")
|
|
t.Fatalf("Empty response body")
|
|
}
|
|
}
|
|
|
|
|
|
- var id string
|
|
|
|
- err = json.Unmarshal(rsp.body, &id)
|
|
|
|
|
|
+ var nid string
|
|
|
|
+ err = json.Unmarshal(rsp.body, &nid)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
|
|
|
|
- req, err = http.NewRequest("GET", "/networks/id/"+id, nil)
|
|
|
|
|
|
+ // Query networks collection
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Expected StatusOK. Got (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ b0 := make([]byte, len(rsp.body))
|
|
|
|
+ copy(b0, rsp.body)
|
|
|
|
+
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks?name=network-fiftyfive", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Expected StatusOK. Got (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ if !bytes.Equal(b0, rsp.body) {
|
|
|
|
+ t.Fatalf("Expected same body from GET /networks and GET /networks?name=<nw> when only network <nw> exist.")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Query network by name
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks?name=culo", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Expected StatusOK. Got (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var list []*networkResource
|
|
|
|
+ err = json.Unmarshal(rsp.body, &list)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if len(list) != 0 {
|
|
|
|
+ t.Fatalf("Expected empty list. Got %v", list)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks?name=network-fiftyfive", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Unexpectded failure: (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ err = json.Unmarshal(rsp.body, &list)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if len(list) == 0 {
|
|
|
|
+ t.Fatalf("Expected non empty list")
|
|
|
|
+ }
|
|
|
|
+ if list[0].Name != "network-fiftyfive" || nid != list[0].ID {
|
|
|
|
+ t.Fatalf("Incongruent resource found: %v", list[0])
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Get network by id
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks/"+nid, nil)
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
@@ -1301,7 +1293,99 @@ func TestHttpHandlerGood(t *testing.T) {
|
|
if err != nil {
|
|
if err != nil {
|
|
t.Fatal(err)
|
|
t.Fatal(err)
|
|
}
|
|
}
|
|
- if nwr.Name != "zero-network" || id != nwr.ID {
|
|
|
|
- t.Fatalf("Incongruent resource found")
|
|
|
|
|
|
+ if nwr.Name != "network-fiftyfive" || nid != nwr.ID {
|
|
|
|
+ t.Fatalf("Incongruent resource found: %v", nwr)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Create endpoint
|
|
|
|
+ eb, err := json.Marshal(endpointCreate{Name: "ep-TwentyTwo"})
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ lr = newLocalReader(eb)
|
|
|
|
+ req, err = http.NewRequest("POST", "/networks/"+nid+"/endpoints", lr)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusCreated {
|
|
|
|
+ t.Fatalf("Unexpectded status code. Expected (%d). Got (%d): %s.", http.StatusCreated, rsp.statusCode, string(rsp.body))
|
|
|
|
+ }
|
|
|
|
+ if len(rsp.body) == 0 {
|
|
|
|
+ t.Fatalf("Empty response body")
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var eid string
|
|
|
|
+ err = json.Unmarshal(rsp.body, &eid)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Query endpoint(s)
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusNotFound {
|
|
|
|
+ t.Fatalf("Expected StatusNotFound. Got (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints?name=bla", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Unexpectded failure: (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+ var epList []*endpointResource
|
|
|
|
+ err = json.Unmarshal(rsp.body, &epList)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if len(epList) != 0 {
|
|
|
|
+ t.Fatalf("Expected empty list. Got %v", epList)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Query endpoint by name
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints?name=ep-TwentyTwo", nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Unexpectded failure: (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ err = json.Unmarshal(rsp.body, &epList)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if len(epList) == 0 {
|
|
|
|
+ t.Fatalf("Empty response body")
|
|
|
|
+ }
|
|
|
|
+ if epList[0].Name != "ep-TwentyTwo" || eid != epList[0].ID {
|
|
|
|
+ t.Fatalf("Incongruent resource found: %v", epList[0])
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ // Get endpoint by id
|
|
|
|
+ req, err = http.NewRequest("GET", "/networks/"+nid+"/endpoints/"+eid, nil)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ handleRequest(rsp, req)
|
|
|
|
+ if rsp.statusCode != http.StatusOK {
|
|
|
|
+ t.Fatalf("Unexpectded failure: (%d): %s", rsp.statusCode, rsp.body)
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ var epr endpointResource
|
|
|
|
+ err = json.Unmarshal(rsp.body, &epr)
|
|
|
|
+ if err != nil {
|
|
|
|
+ t.Fatal(err)
|
|
|
|
+ }
|
|
|
|
+ if epr.Name != "ep-TwentyTwo" || epr.ID != eid {
|
|
|
|
+ t.Fatalf("Incongruent resource found: %v", epr)
|
|
}
|
|
}
|
|
}
|
|
}
|