Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
| ... | ... |
@@ -1126,7 +1126,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *check.C) {
|
| 1126 | 1126 |
c.Assert(waitRun("c0"), check.IsNil)
|
| 1127 | 1127 |
verifyIPAddresses(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988") |
| 1128 | 1128 |
|
| 1129 |
- // connect the container to the second network specifying the preferred ip addresses |
|
| 1129 |
+ // connect the container to the second network specifying an ip addresses |
|
| 1130 | 1130 |
dockerCmd(c, "network", "connect", "--ip", "172.30.55.44", "--ip6", "2001:db8:abcd::5544", "n1", "c0") |
| 1131 | 1131 |
verifyIPAddresses(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544") |
| 1132 | 1132 |
|
| ... | ... |
@@ -1134,7 +1134,7 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *check.C) {
|
| 1134 | 1134 |
dockerCmd(c, "stop", "c0") |
| 1135 | 1135 |
dockerCmd(c, "start", "c0") |
| 1136 | 1136 |
|
| 1137 |
- // verify preferred addresses are applied |
|
| 1137 |
+ // verify requested addresses are applied |
|
| 1138 | 1138 |
verifyIPAddresses(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988") |
| 1139 | 1139 |
verifyIPAddresses(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544") |
| 1140 | 1140 |
|
| ... | ... |
@@ -1145,13 +1145,13 @@ func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *check.C) {
|
| 1145 | 1145 |
|
| 1146 | 1146 |
} |
| 1147 | 1147 |
|
| 1148 |
-func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedPreferredIP(c *check.C) {
|
|
| 1149 |
- // preferred IP is not supported on predefined networks |
|
| 1148 |
+func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *check.C) {
|
|
| 1149 |
+ // requested IP is not supported on predefined networks |
|
| 1150 | 1150 |
for _, mode := range []string{"none", "host", "bridge", "default"} {
|
| 1151 | 1151 |
checkUnsupportedNetworkAndIP(c, mode) |
| 1152 | 1152 |
} |
| 1153 | 1153 |
|
| 1154 |
- // preferred IP is not supported on networks with no user defined subnets |
|
| 1154 |
+ // requested IP is not supported on networks with no user defined subnets |
|
| 1155 | 1155 |
dockerCmd(c, "network", "create", "n0") |
| 1156 | 1156 |
assertNwIsAvailable(c, "n0") |
| 1157 | 1157 |
|
| ... | ... |
@@ -29,9 +29,9 @@ var ( |
| 29 | 29 |
ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: port publishing and the container type network mode")
|
| 30 | 30 |
// ErrConflictNetworkExposePorts conflict between the expose option and the network mode |
| 31 | 31 |
ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: port exposing and the container type network mode")
|
| 32 |
- // ErrUnsupportedNetworkAndIP conflict between network mode and preferred ip address |
|
| 32 |
+ // ErrUnsupportedNetworkAndIP conflict between network mode and requested ip address |
|
| 33 | 33 |
ErrUnsupportedNetworkAndIP = fmt.Errorf("User specified IP address is supported on user defined networks only")
|
| 34 |
- // ErrUnsupportedNetworkNoSubnetAndIP conflict between network with no configured subnet and preferred ip address |
|
| 34 |
+ // ErrUnsupportedNetworkNoSubnetAndIP conflict between network with no configured subnet and requested ip address |
|
| 35 | 35 |
ErrUnsupportedNetworkNoSubnetAndIP = fmt.Errorf("User specified IP address is supported only when connecting to networks with user configured subnets")
|
| 36 | 36 |
// ErrUnsupportedNetworkAndAlias conflict between network mode and alias |
| 37 | 37 |
ErrUnsupportedNetworkAndAlias = fmt.Errorf("Network-scoped alias is supported only for containers in user defined networks")
|