Add restrictions for default drivers/bridge name

- modified tests accordingly
- added extra tests for creating a couple of bridge nw and query them

Signed-off-by: Alessandro Boch <aboch@docker.com>
This commit is contained in:
Alessandro Boch
2015-06-08 08:32:08 -07:00
parent 7de305a2a4
commit d8f6a585ac
8 changed files with 389 additions and 51 deletions
+8 -1
View File
@@ -246,7 +246,14 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
t.Fatal(err)
}
nc := networkCreate{Name: "sh", NetworkType: bridgeNetType}
ops := options.Generic{
netlabel.GenericData: map[string]string{
"BridgeName": "api_test_nw",
"AllowNonDefaultBridge": "true",
},
}
nc := networkCreate{Name: "sh", NetworkType: bridgeNetType, Options: ops}
body, err := json.Marshal(nc)
if err != nil {
t.Fatal(err)