Making gateway optional

Author: abhi

Godeps/Godeps.json

@@ -118,7 +118,7 @@ var Commands = []cli.Command{
 					},
 					cli.StringFlag{
 						Name:  "gateway, g",
-						Usage: "Gateway - REQUIRED",
+						Usage: "Gateway",
 					},
 				},
 				Action: createNetwork,

Godeps/_workspace/src/github.com/contiv/contivmodel/app.json

@@ -251,8 +251,13 @@ func createNetwork(ctx *cli.Context) {
 	subnet := ctx.String("subnet")
 	gateway := ctx.String("gateway")
 
-	if subnet == "" || gateway == "" {
-		errExit(ctx, exitHelp, "Subnet and gateway are required", true)
+	if subnet == "" {
+		errExit(ctx, exitHelp, "Subnet is required", true)
+	}
+	if gateway != "" {
+		if ok := net.ParseIP(gateway); ok == nil {
+			errExit(ctx, exitHelp, "Invalid gateway - Enter in A.B.C.D format", true)
+		}
 	}
 
 	tenant := ctx.String("tenant")

Godeps/_workspace/src/github.com/contiv/contivmodel/contivModel.go

@@ -103,7 +103,6 @@ func CreateNetwork(network intent.ConfigNetwork, stateDriver core.StateDriver, t
 		PktTagType:  network.PktTagType,
 		SubnetIP:    subnetIP,
 		SubnetLen:   subnetLen,
-		Gateway:     network.Gateway,
 	}
 
 	nwCfg.ID = networkID
@@ -126,13 +125,16 @@ func CreateNetwork(network intent.ConfigNetwork, stateDriver core.StateDriver, t
 	nwCfg.ExtPktTag = int(extPktTag)
 	nwCfg.PktTag = int(pktTag)
 
-	// Reserve gateway IP address
-	ipAddrValue, err := netutils.GetIPNumber(nwCfg.SubnetIP, nwCfg.SubnetLen, 32, nwCfg.Gateway)
-	if err != nil {
-		log.Errorf("Error parsing gateway address %s. Err: %v", nwCfg.Gateway, err)
-		return err
+	if network.Gateway != "" {
+		nwCfg.Gateway = network.Gateway
+		// Reserve gateway IP address if gateway is specified
+		ipAddrValue, err := netutils.GetIPNumber(nwCfg.SubnetIP, nwCfg.SubnetLen, 32, nwCfg.Gateway)
+		if err != nil {
+			log.Errorf("Error parsing gateway address %s. Err: %v", nwCfg.Gateway, err)
+			return err
+		}
+		nwCfg.IPAllocMap.Set(ipAddrValue)
 	}
-	nwCfg.IPAllocMap.Set(ipAddrValue)
 
 	netutils.InitSubnetBitset(&nwCfg.IPAllocMap, nwCfg.SubnetLen)
 	err = nwCfg.Write()

Godeps/_workspace/src/github.com/contiv/contivmodel/network.json

@@ -6,6 +6,7 @@ import (
 	"github.com/Sirupsen/logrus"
 	"github.com/contiv/contivmodel/client"
 	. "gopkg.in/check.v1"
+	"sync"
 )
 
 func (s *systemtestSuite) TestNetworkAddDeleteVXLAN(c *C) {
@@ -99,6 +100,7 @@ func (s *systemtestSuite) TestNetworkAddDeleteTenantVLAN(c *C) {
 }
 
 func (s *systemtestSuite) testNetworkAddDeleteTenant(c *C, encap string) {
+	mutex := sync.Mutex{}
 	for i := 0; i < s.iterations; i++ {
 		var (
 			tenantNames = map[string][]string{}
@@ -141,7 +143,9 @@ func (s *systemtestSuite) testNetworkAddDeleteTenant(c *C, encap string) {
 			for _, network := range networks {
 				go func(network, tenant string, containers map[string][]*container) {
 					var err error
+					mutex.Lock()
 					containers[network], err = s.runContainers(numContainer, false, fmt.Sprintf("%s/%s", network, tenant), nil)
+					mutex.Unlock()
 					endChan <- err
 					endChan <- s.pingTest(containers[network])
 				}(network, tenant, containers)