beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #34076 from yastij/33679-renaming-id-meth

Browse source 
renaming id() to state clearly that it's related to the networkAttachment
This commit is contained in:
Sebastiaan van Stijn 2017-07-14 00:29:09 -07:00 committed by GitHub
commit ce0ef9568d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
daemon/cluster/executor/container/adapter.go
View file

@ -199,7 +199,7 @@ func (c *containerAdapter) networkAttach(ctx context.Context) error {
}
}
return c.backend.UpdateAttachment(networkName, networkID, c.container.id(), config)
return c.backend.UpdateAttachment(networkName, networkID, c.container.networkAttachmentContainerID(), config)
}
func (c *containerAdapter) waitForDetach(ctx context.Context) error {
@ -218,7 +218,7 @@ func (c *containerAdapter) waitForDetach(ctx context.Context) error {
}
}
return c.backend.WaitForDetachment(ctx, networkName, networkID, c.container.taskID(), c.container.id())
return c.backend.WaitForDetachment(ctx, networkName, networkID, c.container.taskID(), c.container.networkAttachmentContainerID())
}
func (c *containerAdapter) create(ctx context.Context) error {

4
daemon/cluster/executor/container/container.go
View file

@ -89,7 +89,7 @@ func (c *containerConfig) setTask(t *api.Task) error {
return nil
}
func (c *containerConfig) id() string {
func (c *containerConfig) networkAttachmentContainerID() string {
attachment := c.task.Spec.GetAttachment()
if attachment == nil {
return ""
@ -115,7 +115,7 @@ func (c *containerConfig) nameOrID() string {
return c.name()
}
return c.id()
return c.networkAttachmentContainerID()
}
func (c *containerConfig) name() string {