Merge pull request moby#1592 from mavenugo/exp

Santhosh Manohar · web-flow · commit fa65450a793c · 2016-12-13T14:18:17.000-08:00
Handling the new experimental daemon flag
diff --git a/libnetwork/config/config.go b/libnetwork/config/config.go
@@ -35,6 +35,7 @@ type Config struct {
 // DaemonCfg represents libnetwork core configuration
 type DaemonCfg struct {
 	Debug           bool
+	Experimental    bool
 	DataDir         string
 	DefaultNetwork  string
 	DefaultDriver   string
@@ -222,6 +223,14 @@ func OptionPluginGetter(pg plugingetter.PluginGetter) Option {
 	}
 }
 
+// OptionExperimental function returns an option setter for experimental daemon
+func OptionExperimental(exp bool) Option {
+	return func(c *Config) {
+		logrus.Debugf("Option Experimental: %v", exp)
+		c.Daemon.Experimental = exp
+	}
+}
+
 // ProcessOptions processes options and stores it in config
 func (c *Config) ProcessOptions(options ...Option) {
 	for _, opt := range options {
diff --git a/libnetwork/controller.go b/libnetwork/controller.go
@@ -188,7 +188,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {
 		return nil, err
 	}
 
-	for _, i := range getInitializers() {
+	for _, i := range getInitializers(c.cfg.Daemon.Experimental) {
 		var dcfg map[string]interface{}
 
 		// External plugins don't need config passed through daemon. They can
@@ -476,7 +476,7 @@ func (c *controller) ID() string {
 
 func (c *controller) BuiltinDrivers() []string {
 	drivers := []string{}
-	for _, i := range getInitializers() {
+	for _, i := range getInitializers(c.cfg.Daemon.Experimental) {
 		if i.ntype == "remote" {
 			continue
 		}
diff --git a/libnetwork/drivers_experimental_linux.go b/libnetwork/drivers_experimental_linux.go
@@ -1,5 +1,3 @@
-// +build experimental
-
 package libnetwork
 
 import "github.com/docker/libnetwork/drivers/ipvlan"
diff --git a/libnetwork/drivers_freebsd.go b/libnetwork/drivers_freebsd.go
@@ -5,7 +5,7 @@ import (
 	"github.com/docker/libnetwork/drivers/remote"
 )
 
-func getInitializers() []initializer {
+func getInitializers(experimental bool) []initializer {
 	return []initializer{
 		{null.Init, "null"},
 		{remote.Init, "remote"},
diff --git a/libnetwork/drivers_linux.go b/libnetwork/drivers_linux.go
@@ -9,7 +9,7 @@ import (
 	"github.com/docker/libnetwork/drivers/remote"
 )
 
-func getInitializers() []initializer {
+func getInitializers(experimental bool) []initializer {
 	in := []initializer{
 		{bridge.Init, "bridge"},
 		{host.Init, "host"},
@@ -19,6 +19,8 @@ func getInitializers() []initializer {
 		{overlay.Init, "overlay"},
 	}
 
-	in = append(in, additionalDrivers()...)
+	if experimental {
+		in = append(in, additionalDrivers()...)
+	}
 	return in
 }
diff --git a/libnetwork/drivers_solaris.go b/libnetwork/drivers_solaris.go
@@ -6,7 +6,7 @@ import (
 	"github.com/docker/libnetwork/drivers/solaris/overlay"
 )
 
-func getInitializers() []initializer {
+func getInitializers(experimental bool) []initializer {
 	return []initializer{
 		{overlay.Init, "overlay"},
 		{bridge.Init, "bridge"},
diff --git a/libnetwork/drivers_stub_linux.go b/libnetwork/drivers_stub_linux.go
diff --git a/libnetwork/drivers_windows.go b/libnetwork/drivers_windows.go
@@ -7,7 +7,7 @@ import (
 	"github.com/docker/libnetwork/drivers/windows/overlay"
 )
 
-func getInitializers() []initializer {
+func getInitializers(experimental bool) []initializer {
 	return []initializer{
 		{null.Init, "null"},
 		{overlay.Init, "overlay"},

Original file line number	Diff line number	Diff line change
`@@ -188,7 +188,7 @@ func New(cfgOptions ...config.Option) (NetworkController, error) {`
`188`	`188`	`return nil, err`
`189`	`189`	`}`
`190`	`190`
`191`		`- for _, i := range getInitializers() {`
	`191`	`+ for _, i := range getInitializers(c.cfg.Daemon.Experimental) {`
`192`	`192`	`var dcfg map[string]interface{}`
`193`	`193`
`194`	`194`	`// External plugins don't need config passed through daemon. They can`
`@@ -476,7 +476,7 @@ func (c *controller) ID() string {`
`476`	`476`
`477`	`477`	`func (c *controller) BuiltinDrivers() []string {`
`478`	`478`	`drivers := []string{}`
`479`		`- for _, i := range getInitializers() {`
	`479`	`+ for _, i := range getInitializers(c.cfg.Daemon.Experimental) {`
`480`	`480`	`if i.ntype == "remote" {`
`481`	`481`	`continue`
`482`	`482`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,3 @@`
`1`		`-// +build experimental`
`2`		`-`
`3`	`1`	`package libnetwork`
`4`	`2`
`5`	`3`	`import "github.com/docker/libnetwork/drivers/ipvlan"`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`	`"github.com/docker/libnetwork/drivers/remote"`
`6`	`6`	`)`
`7`	`7`
`8`		`-func getInitializers() []initializer {`
	`8`	`+func getInitializers(experimental bool) []initializer {`
`9`	`9`	`return []initializer{`
`10`	`10`	`{null.Init, "null"},`
`11`	`11`	`{remote.Init, "remote"},`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/docker/libnetwork/drivers/remote"`
`10`	`10`	`)`
`11`	`11`
`12`		`-func getInitializers() []initializer {`
	`12`	`+func getInitializers(experimental bool) []initializer {`
`13`	`13`	`in := []initializer{`
`14`	`14`	`{bridge.Init, "bridge"},`
`15`	`15`	`{host.Init, "host"},`
`@@ -19,6 +19,8 @@ func getInitializers() []initializer {`
`19`	`19`	`{overlay.Init, "overlay"},`
`20`	`20`	`}`
`21`	`21`
`22`		`- in = append(in, additionalDrivers()...)`
	`22`	`+ if experimental {`
	`23`	`+ in = append(in, additionalDrivers()...)`
	`24`	`+ }`
`23`	`25`	`return in`
`24`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/docker/libnetwork/drivers/solaris/overlay"`
`7`	`7`	`)`
`8`	`8`
`9`		`-func getInitializers() []initializer {`
	`9`	`+func getInitializers(experimental bool) []initializer {`
`10`	`10`	`return []initializer{`
`11`	`11`	`{overlay.Init, "overlay"},`
`12`	`12`	`{bridge.Init, "bridge"},`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/docker/libnetwork/drivers/windows/overlay"`
`8`	`8`	`)`
`9`	`9`
`10`		`-func getInitializers() []initializer {`
	`10`	`+func getInitializers(experimental bool) []initializer {`
`11`	`11`	`return []initializer{`
`12`	`12`	`{null.Init, "null"},`
`13`	`13`	`{overlay.Init, "overlay"},`