Move links to sub pkg

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 147b09fae9527e760d74b5ef2f9558ee109f4009
Component: engine

components/engine/container.go

@@ -8,6 +8,7 @@ import (
 	"github.com/dotcloud/docker/engine"
 	"github.com/dotcloud/docker/execdriver"
 	"github.com/dotcloud/docker/graphdriver"
+	"github.com/dotcloud/docker/links"
 	"github.com/dotcloud/docker/nat"
 	"github.com/dotcloud/docker/pkg/mount"
 	"github.com/dotcloud/docker/pkg/term"
@@ -71,7 +72,7 @@ type Container struct {
 	VolumesRW  map[string]bool
 	hostConfig *runconfig.HostConfig
 
-	activeLinks map[string]*Link
+	activeLinks map[string]*links.Link
 }
 
 type BindMap struct {
@@ -537,7 +538,7 @@ func (container *Container) Start() (err error) {
 	}
 
 	if len(children) > 0 {
-		container.activeLinks = make(map[string]*Link, len(children))
+		container.activeLinks = make(map[string]*links.Link, len(children))
 
 		// If we encounter an error make sure that we rollback any network
 		// config and ip table changes
@@ -553,7 +554,7 @@ func (container *Container) Start() (err error) {
 				return fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
 			}
 
-			link, err := NewLink(
+			link, err := links.NewLink(
 				container.NetworkSettings.IPAddress,
 				child.NetworkSettings.IPAddress,
 				linkAlias,

components/engine/links/links.go

@@ -1,4 +1,4 @@
-package docker
+package links
 
 import (
 	"fmt"

components/engine/links/links_test.go

@@ -1,4 +1,4 @@
-package docker
+package links
 
 import (
 	"github.com/dotcloud/docker/nat"