Add support for config-only and config-from options

aboch · aboch · commit 088518b04735 · 2017-05-17T16:57:34.000-07:00
Signed-off-by: Alessandro Boch &lt;aboch@docker.com&gt;
diff --git a/cli/command/network/create.go b/cli/command/network/create.go
@@ -25,6 +25,8 @@ type createOptions struct {
 	ipv6       bool
 	attachable bool
 	ingress    bool
+	configOnly bool
+	configFrom string
 
 	ipamDriver  string
 	ipamSubnet  []string
@@ -62,6 +64,10 @@ func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
 	flags.SetAnnotation("attachable", "version", []string{"1.25"})
 	flags.BoolVar(&options.ingress, "ingress", false, "Create swarm routing-mesh network")
 	flags.SetAnnotation("ingress", "version", []string{"1.29"})
+	flags.BoolVar(&opts.configOnly, "config-only", false, "Create a configuration only network")
+	flags.SetAnnotation("config-only", "version", []string{"1.30"})
+	flags.StringVar(&opts.configFrom, "config-from", "", "The network from which copying the configuration")
+	flags.SetAnnotation("config-from", "version", []string{"1.30"})
 
 	flags.StringVar(&options.ipamDriver, "ipam-driver", "default", "IP Address Management Driver")
 	flags.StringSliceVar(&options.ipamSubnet, "subnet", []string{}, "Subnet in CIDR format that represents a network segment")
@@ -96,10 +102,17 @@ func runCreate(dockerCli *command.DockerCli, options createOptions) error {
 		EnableIPv6:     options.ipv6,
 		Attachable:     options.attachable,
 		Ingress:        options.ingress,
-		Labels:         runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
+		ConfigOnly:     options.configOnly,
+		Labels:         runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
 	}
 
-	resp, err := client.NetworkCreate(context.Background(), options.name, nc)
+	if from := options.configFrom; from != "" {
+		nc.ConfigFrom = network.ConfigReference{
+			Network: from,
+		}
+	}
+
+	resp, err := client.NetworkCreate(context.Background(), opts.name, nc)
 	if err != nil {
 		return err
 	}
