Merge pull request #14051 from mavenugo/services

experimental services ui
2026-09-06 13:41:36 +00:00 · 2015-06-20 18:24:37 -07:00
parent 67f9bbcbd4 4736b17315
commit fef0e84b2d
10 changed files with 537 additions and 37 deletions
@@ -0,0 +1,113 @@
+// +build experimental
+
+package main
+
+import (
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/go-check/check"
+)
+
+func isServiceAvailable(c *check.C, name string, network string) bool {
+	status, body, err := sockRequest("GET", "/services", nil)
+	c.Assert(status, check.Equals, http.StatusOK)
+	c.Assert(err, check.IsNil)
+
+	var inspectJSON []struct {
+		Name    string
+		ID      string
+		Network string
+	}
+	if err = json.Unmarshal(body, &inspectJSON); err != nil {
+		c.Fatalf("unable to unmarshal response body: %v", err)
+	}
+	for _, s := range inspectJSON {
+		if s.Name == name && s.Network == network {
+			return true
+		}
+	}
+	return false
+
+}
+
+func isServiceNetworkAvailable(c *check.C, name string) bool {
+	status, body, err := sockRequest("GET", "/networks", nil)
+	c.Assert(status, check.Equals, http.StatusOK)
+	c.Assert(err, check.IsNil)
+
+	var inspectJSON []struct {
+		Name string
+		ID   string
+		Type string
+	}
+	if err = json.Unmarshal(body, &inspectJSON); err != nil {
+		c.Fatalf("unable to unmarshal response body: %v", err)
+	}
+	for _, n := range inspectJSON {
+		if n.Name == name {
+			return true
+		}
+	}
+	return false
+
+}
+
+func (s *DockerSuite) TestServiceApiCreateDelete(c *check.C) {
+	name := "testnetwork"
+	config := map[string]interface{}{
+		"name":         name,
+		"network_type": "bridge",
+	}
+
+	status, resp, err := sockRequest("POST", "/networks", config)
+	c.Assert(status, check.Equals, http.StatusCreated)
+	c.Assert(err, check.IsNil)
+
+	if !isServiceNetworkAvailable(c, name) {
+		c.Fatalf("Network %s not found", name)
+	}
+
+	var nid string
+	err = json.Unmarshal(resp, &nid)
+	if err != nil {
+		c.Fatal(err)
+	}
+
+	sname := "service1"
+	sconfig := map[string]interface{}{
+		"name":         sname,
+		"network_name": name,
+	}
+
+	status, resp, err = sockRequest("POST", "/services", sconfig)
+	c.Assert(status, check.Equals, http.StatusCreated)
+	c.Assert(err, check.IsNil)
+
+	if !isServiceAvailable(c, sname, name) {
+		c.Fatalf("Service %s.%s not found", sname, name)
+	}
+
+	var id string
+	err = json.Unmarshal(resp, &id)
+	if err != nil {
+		c.Fatal(err)
+	}
+
+	status, _, err = sockRequest("DELETE", fmt.Sprintf("/services/%s", id), nil)
+	c.Assert(status, check.Equals, http.StatusOK)
+	c.Assert(err, check.IsNil)
+
+	if isServiceAvailable(c, sname, name) {
+		c.Fatalf("Service %s.%s not deleted", sname, name)
+	}
+
+	status, _, err = sockRequest("DELETE", fmt.Sprintf("/networks/%s", nid), nil)
+	c.Assert(status, check.Equals, http.StatusOK)
+	c.Assert(err, check.IsNil)
+
+	if isNetworkAvailable(c, name) {
+		c.Fatalf("Network %s not deleted", name)
+	}
+}
@@ -9,12 +9,22 @@ import (
 	"github.com/go-check/check"
 )

-func isNetworkPresent(c *check.C, name string) bool {
+func assertNwIsAvailable(c *check.C, name string) {
+	if !isNwPresent(c, name) {
+		c.Fatalf("Network %s not found in network ls o/p", name)
+	}
+}
+
+func assertNwNotAvailable(c *check.C, name string) {
+	if isNwPresent(c, name) {
+		c.Fatalf("Found network %s in network ls o/p", name)
+	}
+}
+
+func isNwPresent(c *check.C, name string) bool {
 	runCmd := exec.Command(dockerBinary, "network", "ls")
 	out, _, _, err := runCommandWithStdoutStderr(runCmd)
-	if err != nil {
-		c.Fatal(out, err)
-	}
+	c.Assert(err, check.IsNil)
 	lines := strings.Split(out, "\n")
 	for i := 1; i < len(lines)-1; i++ {
 		if strings.Contains(lines[i], name) {
@@ -27,28 +37,18 @@ func isNetworkPresent(c *check.C, name string) bool {
 func (s *DockerSuite) TestDockerNetworkLsDefault(c *check.C) {
 	defaults := []string{"bridge", "host", "none"}
 	for _, nn := range defaults {
-		if !isNetworkPresent(c, nn) {
-			c.Fatalf("Missing Default network : %s", nn)
-		}
+		assertNwIsAvailable(c, nn)
 	}
 }

 func (s *DockerSuite) TestDockerNetworkCreateDelete(c *check.C) {
 	runCmd := exec.Command(dockerBinary, "network", "create", "test")
-	out, _, _, err := runCommandWithStdoutStderr(runCmd)
-	if err != nil {
-		c.Fatal(out, err)
-	}
-	if !isNetworkPresent(c, "test") {
-		c.Fatalf("Network test not found")
-	}
+	_, _, _, err := runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertNwIsAvailable(c, "test")

 	runCmd = exec.Command(dockerBinary, "network", "rm", "test")
-	out, _, _, err = runCommandWithStdoutStderr(runCmd)
-	if err != nil {
-		c.Fatal(out, err)
-	}
-	if isNetworkPresent(c, "test") {
-		c.Fatalf("Network test is not removed")
-	}
+	_, _, _, err = runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertNwNotAvailable(c, "test")
 }
@@ -0,0 +1,86 @@
+// +build experimental
+
+package main
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+
+	"github.com/go-check/check"
+)
+
+func assertSrvIsAvailable(c *check.C, sname, name string) {
+	if !isSrvPresent(c, sname, name) {
+		c.Fatalf("Service %s on network %s not found in service ls o/p", sname, name)
+	}
+}
+
+func assertSrvNotAvailable(c *check.C, sname, name string) {
+	if isSrvPresent(c, sname, name) {
+		c.Fatalf("Found service %s on network %s in service ls o/p", sname, name)
+	}
+}
+
+func isSrvPresent(c *check.C, sname, name string) bool {
+	runCmd := exec.Command(dockerBinary, "service", "ls")
+	out, _, _, err := runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	lines := strings.Split(out, "\n")
+	for i := 1; i < len(lines)-1; i++ {
+		if strings.Contains(lines[i], sname) && strings.Contains(lines[i], name) {
+			return true
+		}
+	}
+	return false
+}
+
+func isCntPresent(c *check.C, cname, sname, name string) bool {
+	runCmd := exec.Command(dockerBinary, "service", "ls", "--no-trunc")
+	out, _, _, err := runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	lines := strings.Split(out, "\n")
+	for i := 1; i < len(lines)-1; i++ {
+		fmt.Println(lines)
+		if strings.Contains(lines[i], name) && strings.Contains(lines[i], sname) && strings.Contains(lines[i], cname) {
+			return true
+		}
+	}
+	return false
+}
+
+func (s *DockerSuite) TestDockerServiceCreateDelete(c *check.C) {
+	runCmd := exec.Command(dockerBinary, "network", "create", "test")
+	_, _, _, err := runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertNwIsAvailable(c, "test")
+
+	runCmd = exec.Command(dockerBinary, "service", "publish", "s1.test")
+	_, _, _, err = runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertSrvIsAvailable(c, "s1", "test")
+
+	runCmd = exec.Command(dockerBinary, "service", "unpublish", "s1.test")
+	_, _, _, err = runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertSrvNotAvailable(c, "s1", "test")
+
+	runCmd = exec.Command(dockerBinary, "network", "rm", "test")
+	_, _, _, err = runCommandWithStdoutStderr(runCmd)
+	c.Assert(err, check.IsNil)
+	assertNwNotAvailable(c, "test")
+}
+
+func (s *DockerSuite) TestDockerPublishServiceFlag(c *check.C) {
+	// Run saying the container is the backend for the specified service on the specified network
+	runCmd := exec.Command(dockerBinary, "run", "-d", "--expose=23", "--publish-service", "telnet.production", "busybox", "top")
+	out, _, err := runCommandWithOutput(runCmd)
+	c.Assert(err, check.IsNil)
+	cid := strings.TrimSpace(out)
+
+	// Verify container is attached in service ps o/p
+	assertSrvIsAvailable(c, "telnet", "production")
+	runCmd = exec.Command(dockerBinary, "rm", "-f", cid)
+	out, _, err = runCommandWithOutput(runCmd)
+	c.Assert(err, check.IsNil)
+}