Merge pull request #319 from saramach/my-netplugin-branch

Add aci-opflex option to netctl CLI
contiv · Apr 13, 2016 · 7e5b4cf · 7e5b4cf
2 parents de2a672 + 3379781
commit 7e5b4cf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/netctl/commands.go b/netctl/commands.go
@@ -269,7 +269,7 @@ var Commands = []cli.Command{
 				Flags: []cli.Flag{
 					cli.StringFlag{
 						Name:  "fabric-mode, f",
-						Usage: "Fabric mode (aci or default)",
+						Usage: "Fabric mode (aci, aci-opflex or default)",
 						Value: "default",
 					},
 					cli.StringFlag{

diff --git a/netmaster/master/netmaster.go b/netmaster/master/netmaster.go
@@ -111,7 +111,10 @@ func validateTenantConfig(tenant *intent.ConfigTenant) error {
 // CreateGlobal sets the global state
 func CreateGlobal(stateDriver core.StateDriver, gc *intent.ConfigGlobal) error {
 	// check for valid values
-	if gc.NwInfraType != "default" && gc.NwInfraType != "aci" {
+	switch gc.NwInfraType {
+	case "default", "aci", "aci-opflex":
+		// These values are acceptable.
+	default:
 		return errors.New("Invalid fabric mode")
 	}
 	_, err := netutils.ParseTagRanges(gc.VLANs, "vlan")