Merge pull request moby#974 from mavenugo/alias

aluzzardi · web-flow · commit 682e0b69be20 · 2016-06-14T17:56:43.000-07:00
Use Aliases from service Network Attachment Config in Task Network Attachment
diff --git a/api/objects.pb.go b/api/objects.pb.go
diff --git a/api/objects.proto b/api/objects.proto
@@ -168,6 +168,9 @@ message NetworkAttachment {
 	// List of IPv4/IPv6 addresses that are assigned to the object
 	// as part of getting attached to this network.
 	repeated string addresses = 2;
+
+	// List of aliases by which a task is resolved in a network
+	repeated string aliases = 3;
 }
 
 message Network {
diff --git a/manager/allocator/network.go b/manager/allocator/network.go
@@ -442,7 +442,11 @@ func (a *Allocator) taskCreateNetworkAttachments(t *api.Task, s *api.Service) {
 		for _, na := range s.Spec.Networks {
 			n := store.GetNetwork(tx, na.Target)
 			if n != nil {
-				networks = append(networks, &api.NetworkAttachment{Network: n})
+				var aliases []string
+				for _, a := range na.Aliases {
+					aliases = append(aliases, a)
+				}
+				networks = append(networks, &api.NetworkAttachment{Network: n, Aliases: aliases})
 			}
 		}
 	})

Original file line number	Diff line number	Diff line change
`@@ -168,6 +168,9 @@ message NetworkAttachment {`
`168`	`168`	`// List of IPv4/IPv6 addresses that are assigned to the object`
`169`	`169`	`// as part of getting attached to this network.`
`170`	`170`	`repeated string addresses = 2;`
	`171`	`+`
	`172`	`+ // List of aliases by which a task is resolved in a network`
	`173`	`+ repeated string aliases = 3;`
`171`	`174`	`}`
`172`	`175`
`173`	`176`	`message Network {`
Original file line number	Diff line number	Diff line change
`@@ -442,7 +442,11 @@ func (a Allocator) taskCreateNetworkAttachments(t api.Task, s *api.Service) {`
`442`	`442`	`for _, na := range s.Spec.Networks {`
`443`	`443`	`n := store.GetNetwork(tx, na.Target)`
`444`	`444`	`if n != nil {`
`445`		`- networks = append(networks, &api.NetworkAttachment{Network: n})`
	`445`	`+ var aliases []string`
	`446`	`+ for _, a := range na.Aliases {`
	`447`	`+ aliases = append(aliases, a)`
	`448`	`+ }`
	`449`	`+ networks = append(networks, &api.NetworkAttachment{Network: n, Aliases: aliases})`
`446`	`450`	`}`
`447`	`451`	`}`
`448`	`452`	`})`