|
@@ -290,14 +290,13 @@ func TestBridge(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AddressIPv4": subnet,
|
|
|
- "FixedCIDR": cidr,
|
|
|
- "FixedCIDRv6": cidrv6,
|
|
|
- "EnableIPv6": true,
|
|
|
- "EnableICC": true,
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
- "EnableIPMasquerade": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
+ "AddressIPv4": subnet,
|
|
|
+ "FixedCIDR": cidr,
|
|
|
+ "FixedCIDRv6": cidrv6,
|
|
|
+ "EnableIPv6": true,
|
|
|
+ "EnableICC": true,
|
|
|
+ "EnableIPMasquerade": true,
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -391,8 +390,7 @@ func TestNetworkName(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -428,8 +426,7 @@ func TestNetworkType(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -455,8 +452,7 @@ func TestNetworkID(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -481,8 +477,8 @@ func TestDeleteNetworkWithActiveEndpoints(t *testing.T) {
|
|
|
}
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true}
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
+ }
|
|
|
option := options.Generic{
|
|
|
netlabel.GenericData: netOption,
|
|
|
}
|
|
@@ -522,8 +518,8 @@ func TestUnknownNetwork(t *testing.T) {
|
|
|
}
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true}
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
+ }
|
|
|
option := options.Generic{
|
|
|
netlabel.GenericData: netOption,
|
|
|
}
|
|
@@ -560,9 +556,9 @@ func TestUnknownEndpoint(t *testing.T) {
|
|
|
subnet.IP = ip
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AddressIPv4": subnet,
|
|
|
- "AllowNonDefaultBridge": true}
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
+ "AddressIPv4": subnet,
|
|
|
+ }
|
|
|
option := options.Generic{
|
|
|
netlabel.GenericData: netOption,
|
|
|
}
|
|
@@ -604,8 +600,7 @@ func TestNetworkEndpointsWalkers(t *testing.T) {
|
|
|
// Create network 1 and add 2 endpoint: ep11, ep12
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network1",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network1",
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -677,8 +672,7 @@ func TestNetworkEndpointsWalkers(t *testing.T) {
|
|
|
// Create network 2
|
|
|
netOption = options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network2",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network2",
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -735,8 +729,7 @@ func TestDuplicateEndpoint(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
}
|
|
|
n, err := createTestNetwork(bridgeNetType, "testnetwork", netOption)
|
|
@@ -786,8 +779,7 @@ func TestControllerQuery(t *testing.T) {
|
|
|
// Create network 1
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network1",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network1",
|
|
|
},
|
|
|
}
|
|
|
net1, err := createTestNetwork(bridgeNetType, "network1", netOption)
|
|
@@ -803,8 +795,7 @@ func TestControllerQuery(t *testing.T) {
|
|
|
// Create network 2
|
|
|
netOption = options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network2",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network2",
|
|
|
},
|
|
|
}
|
|
|
net2, err := createTestNetwork(bridgeNetType, "network2", netOption)
|
|
@@ -890,8 +881,7 @@ func TestNetworkQuery(t *testing.T) {
|
|
|
// Create network 1 and add 2 endpoint: ep11, ep12
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network1",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network1",
|
|
|
},
|
|
|
}
|
|
|
net1, err := createTestNetwork(bridgeNetType, "network1", netOption)
|
|
@@ -1012,8 +1002,7 @@ func TestEndpointJoin(t *testing.T) {
|
|
|
// Create network 1 and add 2 endpoint: ep11, ep12
|
|
|
n1, err := createTestNetwork(bridgeNetType, "testnetwork1", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork1",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork1",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1123,8 +1112,7 @@ func TestEndpointJoin(t *testing.T) {
|
|
|
n2, err := createTestNetwork(bridgeNetType, "testnetwork2",
|
|
|
options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork2",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork2",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1215,8 +1203,7 @@ func externalKeyTest(t *testing.T, reexec bool) {
|
|
|
|
|
|
n, err := createTestNetwork(bridgeNetType, "testnetwork", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1365,8 +1352,7 @@ func TestEndpointDeleteWithActiveContainer(t *testing.T) {
|
|
|
|
|
|
n, err := createTestNetwork(bridgeNetType, "testnetwork", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1429,8 +1415,7 @@ func TestEndpointMultipleJoins(t *testing.T) {
|
|
|
|
|
|
n, err := createTestNetwork(bridgeNetType, "testmultiple", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testmultiple",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testmultiple",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1501,8 +1486,7 @@ func TestLeaveAll(t *testing.T) {
|
|
|
|
|
|
n, err := createTestNetwork(bridgeNetType, "testnetwork", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1565,8 +1549,7 @@ func TestontainerInvalidLeave(t *testing.T) {
|
|
|
|
|
|
n, err := createTestNetwork(bridgeNetType, "testnetwork", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1632,8 +1615,7 @@ func TestEndpointUpdateParent(t *testing.T) {
|
|
|
|
|
|
n, err := createTestNetwork("bridge", "testnetwork", options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
})
|
|
|
if err != nil {
|
|
@@ -1738,9 +1720,8 @@ func TestEnableIPv6(t *testing.T) {
|
|
|
netOption := options.Generic{
|
|
|
netlabel.EnableIPv6: true,
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "FixedCIDRv6": cidrv6,
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
+ "FixedCIDRv6": cidrv6,
|
|
|
},
|
|
|
}
|
|
|
|
|
@@ -1911,8 +1892,7 @@ func TestResolvConf(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "testnetwork",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "testnetwork",
|
|
|
},
|
|
|
}
|
|
|
n, err := createTestNetwork("bridge", "testnetwork", netOption)
|
|
@@ -2181,8 +2161,7 @@ func createGlobalInstance(t *testing.T) {
|
|
|
|
|
|
netOption := options.Generic{
|
|
|
netlabel.GenericData: options.Generic{
|
|
|
- "BridgeName": "network",
|
|
|
- "AllowNonDefaultBridge": true,
|
|
|
+ "BridgeName": "network",
|
|
|
},
|
|
|
}
|
|
|
|