Merge pull request #601 from abhinandanpb/fix597

Fixing issue 597

Author: abhi

netmaster/master/network.go

@@ -119,23 +119,6 @@ func CreateNetwork(network intent.ConfigNetwork, stateDriver core.StateDriver, t
 	nwCfg.ID = networkID
 	nwCfg.StateDriver = stateDriver
 
-	// Allocate pkt tags
-	reqPktTag := uint(network.PktTag)
-	if nwCfg.PktTagType == "vlan" {
-		pktTag, err = gCfg.AllocVLAN(reqPktTag)
-		if err != nil {
-			return err
-		}
-	} else if nwCfg.PktTagType == "vxlan" {
-		extPktTag, pktTag, err = gCfg.AllocVXLAN(reqPktTag)
-		if err != nil {
-			return err
-		}
-	}
-
-	nwCfg.ExtPktTag = int(extPktTag)
-	nwCfg.PktTag = int(pktTag)
-
 	netutils.InitSubnetBitset(&nwCfg.IPAllocMap, nwCfg.SubnetLen)
 	subnetAddr := netutils.GetSubnetAddr(nwCfg.SubnetIP, nwCfg.SubnetLen)
 	nwCfg.SubnetIP = subnetAddr
@@ -169,6 +152,23 @@ func CreateNetwork(network intent.ConfigNetwork, stateDriver core.StateDriver, t
 		netutils.ReserveIPv6HostID(hostID, &nwCfg.IPv6AllocMap)
 	}
 
+	// Allocate pkt tags
+	reqPktTag := uint(network.PktTag)
+	if nwCfg.PktTagType == "vlan" {
+		pktTag, err = gCfg.AllocVLAN(reqPktTag)
+		if err != nil {
+			return err
+		}
+	} else if nwCfg.PktTagType == "vxlan" {
+		extPktTag, pktTag, err = gCfg.AllocVXLAN(reqPktTag)
+		if err != nil {
+			return err
+		}
+	}
+
+	nwCfg.ExtPktTag = int(extPktTag)
+	nwCfg.PktTag = int(pktTag)
+
 	err = nwCfg.Write()
 	if err != nil {
 		return err

netmaster/objApi/objapi_test.go

@@ -996,10 +996,10 @@ func TestNetworkAddDeleteACIMode(t *testing.T) {
 	checkCreateNetwork(t, false, "default", "contiv-ipv6", "", "vxlan", "10.1.1.1/16", "", 1, "2016:0617::/120", "")
 	verifyNetworkState(t, "default", "contiv-ipv6", "data", "vxlan", "10.1.1.1", "", 16, 1, 1, "2016:0617::", "", 120)
 	checkDeleteNetwork(t, false, "default", "contiv-ipv6")
+	checkGlobalSet(t, false, "default", "1-4094", "1-10000", "bridge")
 
 }
 
-/*
 // TestNetworkAddDelete tests network create/delete REST api
 func TestNetworkAddDelete(t *testing.T) {
 	// Basic vlan network
@@ -1095,7 +1095,6 @@ func TestNetworkAddDelete(t *testing.T) {
 	// Try deleting a non-existing network
 	checkDeleteNetwork(t, true, "default", "contiv")
 }
-*/
 
 func TestDynamicGlobalVlanRange(t *testing.T) {