e5b3ebbc64
The behavior of service (create/update/scale) was changed in a recent PR to docker/cli. This commit serves to remedy test failures experienced when attempting to use service calls. Should not affect current behavior. Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
172 lines
6.5 KiB
Go
172 lines
6.5 KiB
Go
// +build !windows
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
|
|
"github.com/docker/docker/api/types/swarm"
|
|
"github.com/docker/docker/integration-cli/checker"
|
|
"github.com/go-check/check"
|
|
)
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdatePort(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
|
|
serviceName := "TestServiceUpdatePort"
|
|
serviceArgs := append([]string{"service", "create", "--detach", "--no-resolve-image", "--name", serviceName, "-p", "8080:8081", defaultSleepImage}, sleepCommandForDaemonPlatform()...)
|
|
|
|
// Create a service with a port mapping of 8080:8081.
|
|
out, err := d.Cmd(serviceArgs...)
|
|
c.Assert(err, checker.IsNil)
|
|
waitAndAssert(c, defaultReconciliationTimeout, d.CheckActiveContainerCount, checker.Equals, 1)
|
|
|
|
// Update the service: changed the port mapping from 8080:8081 to 8082:8083.
|
|
_, err = d.Cmd("service", "update", "--detach", "--publish-add", "8082:8083", "--publish-rm", "8081", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
// Inspect the service and verify port mapping
|
|
expected := []swarm.PortConfig{
|
|
{
|
|
Protocol: "tcp",
|
|
PublishedPort: 8082,
|
|
TargetPort: 8083,
|
|
PublishMode: "ingress",
|
|
},
|
|
}
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.EndpointSpec.Ports }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
var portConfig []swarm.PortConfig
|
|
if err := json.Unmarshal([]byte(out), &portConfig); err != nil {
|
|
c.Fatalf("invalid JSON in inspect result: %v (%s)", err, out)
|
|
}
|
|
c.Assert(portConfig, checker.DeepEquals, expected)
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateLabel(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name=test", "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service := d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 0)
|
|
|
|
// add label to empty set
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
|
|
|
|
// add label to non-empty set
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo2=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 2)
|
|
c.Assert(service.Spec.Labels["foo2"], checker.Equals, "bar")
|
|
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-rm", "foo2")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo2"], checker.Equals, "")
|
|
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-rm", "foo")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 0)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "")
|
|
|
|
// now make sure we can add again
|
|
out, err = d.Cmd("service", "update", "--detach", "test", "--label-add", "foo=bar")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
service = d.GetService(c, "test")
|
|
c.Assert(service.Spec.Labels, checker.HasLen, 1)
|
|
c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
testName := "test_secret"
|
|
id := d.CreateSecret(c, swarm.SecretSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: testName,
|
|
},
|
|
Data: []byte("TESTINGDATA"),
|
|
})
|
|
c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
|
|
testTarget := "testing"
|
|
serviceName := "test"
|
|
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", serviceName, "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
// add secret
|
|
out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
var refs []swarm.SecretReference
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 1)
|
|
|
|
c.Assert(refs[0].SecretName, checker.Equals, testName)
|
|
c.Assert(refs[0].File, checker.Not(checker.IsNil))
|
|
c.Assert(refs[0].File.Name, checker.Equals, testTarget)
|
|
|
|
// remove
|
|
out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--secret-rm", testName)
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 0)
|
|
}
|
|
|
|
func (s *DockerSwarmSuite) TestServiceUpdateConfigs(c *check.C) {
|
|
d := s.AddDaemon(c, true, true)
|
|
testName := "test_config"
|
|
id := d.CreateConfig(c, swarm.ConfigSpec{
|
|
Annotations: swarm.Annotations{
|
|
Name: testName,
|
|
},
|
|
Data: []byte("TESTINGDATA"),
|
|
})
|
|
c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("configs: %s", id))
|
|
testTarget := "/testing"
|
|
serviceName := "test"
|
|
|
|
out, err := d.Cmd("service", "create", "--detach", "--no-resolve-image", "--name", serviceName, "busybox", "top")
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
// add config
|
|
out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--config-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
var refs []swarm.ConfigReference
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 1)
|
|
|
|
c.Assert(refs[0].ConfigName, checker.Equals, testName)
|
|
c.Assert(refs[0].File, checker.Not(checker.IsNil))
|
|
c.Assert(refs[0].File.Name, checker.Equals, testTarget)
|
|
|
|
// remove
|
|
out, err = d.CmdRetryOutOfSequence("service", "update", "--detach", "test", "--config-rm", testName)
|
|
c.Assert(err, checker.IsNil, check.Commentf(out))
|
|
|
|
out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Configs }}", serviceName)
|
|
c.Assert(err, checker.IsNil)
|
|
|
|
c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
|
|
c.Assert(refs, checker.HasLen, 0)
|
|
}
|