Changed Labels to DriverOpts

Signed-off-by: Madhu Venugopal <madhu@docker.com>

api/api.go

@@ -279,8 +279,8 @@ func procCreateNetwork(c libnetwork.NetworkController, vars map[string]string, b
 	processCreateDefaults(c, &create)
 
 	options := []libnetwork.NetworkOption{}
-	if len(create.Labels) > 0 {
-		options = append(options, libnetwork.NetworkOptionLabels(create.Labels))
+	if len(create.DriverOpts) > 0 {
+		options = append(options, libnetwork.NetworkOptionDriverOpts(create.DriverOpts))
 	}
 	nw, err := c.NewNetwork(create.NetworkType, create.Name, options...)
 	if err != nil {

api/api_test.go

@@ -229,7 +229,7 @@ func TestCreateDeleteNetwork(t *testing.T) {
 		bridge.BridgeName:   "abc",
 		netlabel.EnableIPv6: "true",
 	}
-	nc := networkCreate{Name: "network_1", NetworkType: bridgeNetType, Labels: ops}
+	nc := networkCreate{Name: "network_1", NetworkType: bridgeNetType, DriverOpts: ops}
 	goodBody, err := json.Marshal(nc)
 	if err != nil {
 		t.Fatal(err)
@@ -263,7 +263,7 @@ func TestCreateDeleteNetwork(t *testing.T) {
 		netlabel.EnableIPv6: "true",
 		bridge.BridgeName:   "abc",
 	}
-	nc = networkCreate{Name: "network_2", NetworkType: bridgeNetType, Labels: labels}
+	nc = networkCreate{Name: "network_2", NetworkType: bridgeNetType, DriverOpts: labels}
 	goodBody, err = json.Marshal(nc)
 	if err != nil {
 		t.Fatal(err)
@@ -297,7 +297,7 @@ func TestGetNetworksAndEndpoints(t *testing.T) {
 	ops := map[string]string{
 		bridge.BridgeName: "api_test_nw",
 	}
-	nc := networkCreate{Name: "sh", NetworkType: bridgeNetType, Labels: ops}
+	nc := networkCreate{Name: "sh", NetworkType: bridgeNetType, DriverOpts: ops}
 	body, err := json.Marshal(nc)
 	if err != nil {
 		t.Fatal(err)
@@ -1837,7 +1837,7 @@ func TestEndToEnd(t *testing.T) {
 	}
 
 	// Create network
-	nc := networkCreate{Name: "network-fiftyfive", NetworkType: bridgeNetType, Labels: ops}
+	nc := networkCreate{Name: "network-fiftyfive", NetworkType: bridgeNetType, DriverOpts: ops}
 	body, err := json.Marshal(nc)
 	if err != nil {
 		t.Fatal(err)

api/types.go

@@ -36,7 +36,7 @@ type sandboxResource struct {
 type networkCreate struct {
 	Name        string            `json:"name"`
 	NetworkType string            `json:"network_type"`
-	Labels      map[string]string `json:"labels"`
+	DriverOpts  map[string]string `json:"driver_opts"`
 }
 
 // endpointCreate represents the body of the "create endpoint" http request message