Skip to content

Commit efda961

Browse files
dnephindnephin
committed
Move networking api types to the api/types/networking package.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
1 parent 1d775a5 commit efda961

File tree

11 files changed

+55
-51
lines changed

11 files changed

+55
-51
lines changed

‎api/client/network.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ import (
77
"text/tabwriter"
88

99
"github.com/docker/docker/api/types"
10+
"github.com/docker/docker/api/types/network"
1011
Cli "github.com/docker/docker/cli"
11-
"github.com/docker/docker/daemon/network"
1212
"github.com/docker/docker/opts"
1313
flag "github.com/docker/docker/pkg/mflag"
1414
"github.com/docker/docker/pkg/stringid"

‎api/server/router/network/backend.go‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
package network
22

33
import (
4-
// TODO: network config needs to be refactored out to a
5-
// different location
6-
"github.com/docker/docker/daemon/network"
4+
"github.com/docker/docker/api/types/network"
75

86
"github.com/docker/libnetwork"
97
)

‎api/server/router/network/network_routes.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import (
1010
"github.com/Sirupsen/logrus"
1111
"github.com/docker/docker/api/server/httputils"
1212
"github.com/docker/docker/api/types"
13+
"github.com/docker/docker/api/types/network"
1314
"github.com/docker/docker/daemon"
14-
"github.com/docker/docker/daemon/network"
1515
"github.com/docker/docker/pkg/parsers/filters"
1616
"github.com/docker/docker/runconfig"
1717
"github.com/docker/libnetwork"

‎api/types/network/network.go‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package network
2+
3+
// Address represents an IP address
4+
type Address struct {
5+
Addr string
6+
PrefixLen int
7+
}
8+
9+
// IPAM represents IP Address Management
10+
type IPAM struct {
11+
Driver string
12+
Config []IPAMConfig
13+
}
14+
15+
// IPAMConfig represents IPAM configurations
16+
type IPAMConfig struct {
17+
Subnet string `json:",omitempty"`
18+
IPRange string `json:",omitempty"`
19+
Gateway string `json:",omitempty"`
20+
AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
21+
}
22+
23+
// EndpointSettings stores the network endpoint details
24+
type EndpointSettings struct {
25+
EndpointID string
26+
Gateway string
27+
IPAddress string
28+
IPPrefixLen int
29+
IPv6Gateway string
30+
GlobalIPv6Address string
31+
GlobalIPv6PrefixLen int
32+
MacAddress string
33+
}

‎api/types/types.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"time"
66

7-
"github.com/docker/docker/daemon/network"
7+
"github.com/docker/docker/api/types/network"
88
"github.com/docker/docker/pkg/nat"
99
"github.com/docker/docker/pkg/version"
1010
"github.com/docker/docker/registry"

‎container/container_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ import (
1313
"syscall"
1414

1515
"github.com/Sirupsen/logrus"
16+
"github.com/docker/docker/api/types/network"
1617
"github.com/docker/docker/daemon/execdriver"
17-
"github.com/docker/docker/daemon/network"
1818
derr "github.com/docker/docker/errors"
1919
"github.com/docker/docker/pkg/chrootarchive"
2020
"github.com/docker/docker/pkg/nat"

‎daemon/container_operations_unix.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ import (
1313
"time"
1414

1515
"github.com/Sirupsen/logrus"
16+
networktypes "github.com/docker/docker/api/types/network"
1617
"github.com/docker/docker/container"
1718
"github.com/docker/docker/daemon/execdriver"
1819
"github.com/docker/docker/daemon/links"
@@ -440,7 +441,7 @@ func (daemon *Daemon) buildSandboxOptions(container *container.Container, n libn
440441

441442
func (daemon *Daemon) updateNetworkSettings(container *container.Container, n libnetwork.Network) error {
442443
if container.NetworkSettings == nil {
443-
container.NetworkSettings = &network.Settings{Networks: make(map[string]*network.EndpointSettings)}
444+
container.NetworkSettings = &network.Settings{Networks: make(map[string]*networktypes.EndpointSettings)}
444445
}
445446

446447
if !container.HostConfig.NetworkMode.IsHost() && runconfig.NetworkMode(n.Type()).IsHost() {
@@ -466,7 +467,7 @@ func (daemon *Daemon) updateNetworkSettings(container *container.Container, n li
466467
return runconfig.ErrConflictNoNetwork
467468
}
468469
}
469-
container.NetworkSettings.Networks[n.Name()] = new(network.EndpointSettings)
470+
container.NetworkSettings.Networks[n.Name()] = new(networktypes.EndpointSettings)
470471

471472
return nil
472473
}
@@ -550,8 +551,8 @@ func (daemon *Daemon) allocateNetwork(container *container.Container) error {
550551
}
551552
networkName = n.Name()
552553
}
553-
container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings)
554-
container.NetworkSettings.Networks[networkName] = new(network.EndpointSettings)
554+
container.NetworkSettings.Networks = make(map[string]*networktypes.EndpointSettings)
555+
container.NetworkSettings.Networks[networkName] = new(networktypes.EndpointSettings)
555556
updateSettings = true
556557
}
557558

@@ -812,7 +813,7 @@ func (daemon *Daemon) releaseNetwork(container *container.Container) {
812813
sid := container.NetworkSettings.SandboxID
813814
networks := container.NetworkSettings.Networks
814815
for n := range networks {
815-
networks[n] = &network.EndpointSettings{}
816+
networks[n] = &networktypes.EndpointSettings{}
816817
}
817818

818819
container.NetworkSettings = &network.Settings{Networks: networks}

‎daemon/inspect.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"time"
66

77
"github.com/docker/docker/api/types"
8+
networktypes "github.com/docker/docker/api/types/network"
89
"github.com/docker/docker/api/types/versions/v1p20"
910
"github.com/docker/docker/container"
1011
"github.com/docker/docker/daemon/exec"
@@ -223,7 +224,7 @@ func (daemon *Daemon) getBackwardsCompatibleNetworkSettings(settings *network.Se
223224

224225
// getDefaultNetworkSettings creates the deprecated structure that holds the information
225226
// about the bridge network for a container.
226-
func (daemon *Daemon) getDefaultNetworkSettings(networks map[string]*network.EndpointSettings) types.DefaultNetworkSettings {
227+
func (daemon *Daemon) getDefaultNetworkSettings(networks map[string]*networktypes.EndpointSettings) types.DefaultNetworkSettings {
227228
var settings types.DefaultNetworkSettings
228229

229230
if defaultNetwork, ok := networks["bridge"]; ok {

‎daemon/network.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"net"
77
"strings"
88

9-
"github.com/docker/docker/daemon/network"
9+
"github.com/docker/docker/api/types/network"
1010
"github.com/docker/libnetwork"
1111
)
1212

‎daemon/network/settings.go‎

Lines changed: 7 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,9 @@
11
package network
22

3-
import "github.com/docker/docker/pkg/nat"
4-
5-
// Address represents an IP address
6-
type Address struct {
7-
Addr string
8-
PrefixLen int
9-
}
10-
11-
// IPAM represents IP Address Management
12-
type IPAM struct {
13-
Driver string
14-
Config []IPAMConfig
15-
}
16-
17-
// IPAMConfig represents IPAM configurations
18-
type IPAMConfig struct {
19-
Subnet string `json:",omitempty"`
20-
IPRange string `json:",omitempty"`
21-
Gateway string `json:",omitempty"`
22-
AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
23-
}
3+
import (
4+
networktypes "github.com/docker/docker/api/types/network"
5+
"github.com/docker/docker/pkg/nat"
6+
)
247

258
// Settings stores configuration details about the daemon network config
269
// TODO Windows. Many of these fields can be factored out.,
@@ -30,22 +13,10 @@ type Settings struct {
3013
HairpinMode bool
3114
LinkLocalIPv6Address string
3215
LinkLocalIPv6PrefixLen int
33-
Networks map[string]*EndpointSettings
16+
Networks map[string]*networktypes.EndpointSettings
3417
Ports nat.PortMap
3518
SandboxKey string
36-
SecondaryIPAddresses []Address
37-
SecondaryIPv6Addresses []Address
19+
SecondaryIPAddresses []networktypes.Address
20+
SecondaryIPv6Addresses []networktypes.Address
3821
IsAnonymousEndpoint bool
3922
}
40-
41-
// EndpointSettings stores the network endpoint details
42-
type EndpointSettings struct {
43-
EndpointID string
44-
Gateway string
45-
IPAddress string
46-
IPPrefixLen int
47-
IPv6Gateway string
48-
GlobalIPv6Address string
49-
GlobalIPv6PrefixLen int
50-
MacAddress string
51-
}

0 commit comments

Comments
 (0)