dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-08-12 22:16:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TestHandleMACAddressBC

Browse Source 
- expCtrWideMAC was unused
- missing test for API 1.52

Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-11-03 18:30:26 +00:00
parent bb27db85fb
commit 2af22d3512
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
daemon/server/router/container/container_routes_test.go
View File

@@ -68,39 +68,39 @@ func TestHandleMACAddressBC(t *testing.T) {
expCtrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
},
{
name: "new api no macs",
name: "api 1.44 no macs",
apiVersion: "1.44",
networkMode: "aNetId",
epConfig: map[string]*network.EndpointSettings{"aNetName": {}},
},
{
name: "new api ep specific mac",
name: "api 1.44 ep specific mac",
apiVersion: "1.44",
networkMode: "aNetName",
epConfig: map[string]*network.EndpointSettings{"aNetName": {MacAddress: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66}}},
},
{
name: "new api migrate ctr-wide mac to new ep",
name: "api 1.44 migrate ctr-wide mac to new ep",
apiVersion: "1.44",
ctrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
networkMode: "aNetName",
epConfig: map[string]*network.EndpointSettings{},
expEpWithCtrWideMAC: "aNetName",
expWarning: "The container-wide MacAddress field is now deprecated",
expCtrWideMAC: nil,
expCtrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
},
{
name: "new api migrate ctr-wide mac to existing ep",
name: "api 1.44 migrate ctr-wide mac to existing ep",
apiVersion: "1.44",
ctrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
networkMode: "aNetName",
epConfig: map[string]*network.EndpointSettings{"aNetName": {}},
expEpWithCtrWideMAC: "aNetName",
expWarning: "The container-wide MacAddress field is now deprecated",
expCtrWideMAC: nil,
expCtrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
},
{
name: "new api mode vs name mismatch",
name: "api 1.44 mode vs name mismatch",
apiVersion: "1.44",
ctrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
networkMode: "aNetId",
@@ -109,7 +109,7 @@ func TestHandleMACAddressBC(t *testing.T) {
expCtrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
},
{
name: "new api mac mismatch",
name: "api 1.44 mac mismatch",
apiVersion: "1.44",
ctrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
networkMode: "aNetName",
@@ -117,6 +117,14 @@ func TestHandleMACAddressBC(t *testing.T) {
expError: "the container-wide MAC address must match the endpoint-specific MAC address",
expCtrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
},
{
name: "api 1.52 reject ctr-wide mac",
apiVersion: "1.52",
ctrWideMAC: network.HardwareAddr{0x11, 0x22, 0x33, 0x44, 0x55, 0x66},
networkMode: "aNetName",
epConfig: map[string]*network.EndpointSettings{},
expError: "container-wide MAC address no longer supported; use endpoint-specific MAC address instead",
},
}
for _, tc := range testcases {
@@ -147,7 +155,7 @@ func TestHandleMACAddressBC(t *testing.T) {
}
if tc.expEpWithCtrWideMAC != "" {
got := netCfg.EndpointsConfig[tc.expEpWithCtrWideMAC].MacAddress
assert.Check(t, is.DeepEqual(got, tc.ctrWideMAC, cmpopts.EquateEmpty()))
assert.Check(t, is.DeepEqual(got, tc.expCtrWideMAC, cmpopts.EquateEmpty()))
}
if tc.expEpWithNoMAC != "" {
got := netCfg.EndpointsConfig[tc.expEpWithNoMAC].MacAddress