@@ -23,7 +23,7 @@ github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5

 github.com/imdario/mergo 0.2.1

 #get libnetwork packages

-github.com/docker/libnetwork 802895f7f342253a60f1666565e84707851a94f2

+github.com/docker/libnetwork 5537cb4b15c16eff2619db126ead3271e0ab45eb

 github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894

 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80

 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

@@ -413,6 +413,7 @@ func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

 		priIdx = -1

 		delIdx = -1

 		lIP    = net.ParseIP(d.bindAddress)

+		aIP    = net.ParseIP(d.advertiseAddress)

 	)

 	d.Lock()

@@ -440,7 +441,7 @@ func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

 	d.secMapWalk(func(rIPs string, spis []*spi) ([]*spi, bool) {

 		rIP := net.ParseIP(rIPs)

-		return updateNodeKey(lIP, rIP, spis, d.keys, newIdx, priIdx, delIdx), false

+		return updateNodeKey(lIP, aIP, rIP, spis, d.keys, newIdx, priIdx, delIdx), false

 	})

 	d.Lock()

@@ -471,7 +472,7 @@ func (d *driver) updateKeys(newKey, primary, pruneKey *key) error {

  *********************************************************/

 // Spis and keys are sorted in such away the one in position 0 is the primary

-func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx, delIdx int) []*spi {

+func updateNodeKey(lIP, aIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx, delIdx int) []*spi {

 	logrus.Debugf("Updating keys for node: %s (%d,%d,%d)", rIP, newIdx, priIdx, delIdx)

 	spis := idxs

@@ -480,8 +481,8 @@ func updateNodeKey(lIP, rIP net.IP, idxs []*spi, curKeys []*key, newIdx, priIdx,

 	// add new

 	if newIdx != -1 {

 		spis = append(spis, &spi{

-			forward: buildSPI(lIP, rIP, curKeys[newIdx].tag),

-			reverse: buildSPI(rIP, lIP, curKeys[newIdx].tag),

+			forward: buildSPI(aIP, rIP, curKeys[newIdx].tag),

+			reverse: buildSPI(rIP, aIP, curKeys[newIdx].tag),

 		})

 	}

@@ -612,13 +612,13 @@ func (n *network) initSandbox(restore bool) error {

 	var nlSock *nl.NetlinkSocket

 	sbox.InvokeFunc(func() {

 		nlSock, err = nl.Subscribe(syscall.NETLINK_ROUTE, syscall.RTNLGRP_NEIGH)

-		if err != nil {

-			err = fmt.Errorf("failed to subscribe to neighbor group netlink messages")

-		}

 	})

-	if nlSock != nil {

+	if err == nil {

 		go n.watchMiss(nlSock)

+	} else {

+		logrus.Errorf("failed to subscribe to neighbor group netlink messages for overlay network %s in sbox %s: %v",

+			n.id, sbox.Key(), err)

 	}

 	return nil

@@ -644,6 +644,9 @@ func (n *network) watchMiss(nlSock *nl.NetlinkSocket) {

 			}

 			if neigh.IP.To4() == nil {

+				if neigh.HardwareAddr != nil {

+					logrus.Debugf("Miss notification, l2 mac %v", neigh.HardwareAddr)

+				}

 				continue

 			}

@@ -73,7 +73,7 @@ func (d *driver) serfJoin(neighIP string) error {

 	if neighIP == "" {

 		return fmt.Errorf("no neighbor to join")

 	}

-	if _, err := d.serfInstance.Join([]string{neighIP}, false); err != nil {

+	if _, err := d.serfInstance.Join([]string{neighIP}, true); err != nil {

 		return fmt.Errorf("Failed to join the cluster at neigh IP %s: %v",

 			neighIP, err)

 	}

@@ -94,8 +94,8 @@ func (d *driver) notifyEvent(event ovNotify) {

 }

 func (d *driver) processEvent(u serf.UserEvent) {

-	logrus.Debugf("Received user event name:%s, payload:%s\n", u.Name,

-		string(u.Payload))

+	logrus.Debugf("Received user event name:%s, payload:%s LTime:%d \n", u.Name,

+		string(u.Payload), uint64(u.LTime))

 	var dummy, action, vtepStr, nid, eid, ipStr, maskStr, macStr string

 	if _, err := fmt.Sscan(u.Name, &dummy, &vtepStr, &nid, &eid); err != nil {

@@ -146,6 +146,7 @@ func (d *driver) processQuery(q *serf.Query) {

 		return

 	}

+	logrus.Debugf("Sending peer query resp mac %s, mask %s, vtep %s", peerMac, net.IP(peerIPMask), vtep)

 	q.Respond([]byte(fmt.Sprintf("%s %s %s", peerMac.String(), net.IP(peerIPMask).String(), vtep.String())))

 }

@@ -173,6 +174,7 @@ func (d *driver) resolvePeer(nid string, peerIP net.IP) (net.HardwareAddr, net.I

 			return nil, nil, nil, fmt.Errorf("failed to parse mac: %v", err)

 		}

+		logrus.Debugf("Received peer query response, mac %s, vtep %s, mask %s", macStr, vtepStr, maskStr)

 		return mac, net.IPMask(net.ParseIP(maskStr).To4()), net.ParseIP(vtepStr), nil

 	case <-time.After(time.Second):

@@ -48,6 +48,7 @@ type driver struct {

 	vxlanIdm         *idm.Idm

 	once             sync.Once

 	joinOnce         sync.Once

+	localJoinOnce    sync.Once

 	keys             []*key

 	sync.Mutex

 }

@@ -241,6 +242,12 @@ func (d *driver) nodeJoin(advertiseAddress, bindAddress string, self bool) {

 		d.bindAddress = bindAddress

 		d.Unlock()

+		// If containers are already running on this network update the

+		// advertiseaddress in the peerDB

+		d.localJoinOnce.Do(func() {

+			d.peerDBUpdateSelf()

+		})

+

 		// If there is no cluster store there is no need to start serf.

 		if d.store != nil {

 			if err := validateSelf(advertiseAddress); err != nil {

@@ -80,25 +80,29 @@ func (d *driver) peerDbWalk(f func(string, *peerKey, *peerEntry) bool) error {

 func (d *driver) peerDbNetworkWalk(nid string, f func(*peerKey, *peerEntry) bool) error {

 	d.peerDb.Lock()

 	pMap, ok := d.peerDb.mp[nid]

+	d.peerDb.Unlock()

+

 	if !ok {

-		d.peerDb.Unlock()

 		return nil

 	}

-	d.peerDb.Unlock()

+

+	mp := map[string]peerEntry{}

 	pMap.Lock()

 	for pKeyStr, pEntry := range pMap.mp {

+		mp[pKeyStr] = pEntry

+	}

+	pMap.Unlock()

+

+	for pKeyStr, pEntry := range mp {

 		var pKey peerKey

 		if _, err := fmt.Sscan(pKeyStr, &pKey); err != nil {

 			logrus.Warnf("Peer key scan on network %s failed: %v", nid, err)

 		}

-

 		if f(&pKey, &pEntry) {

-			pMap.Unlock()

 			return nil

 		}

 	}

-	pMap.Unlock()

 	return nil

 }

@@ -363,3 +367,12 @@ func (d *driver) pushLocalDb() {

 		return false

 	})

 }

+

+func (d *driver) peerDBUpdateSelf() {

+	d.peerDbWalk(func(nid string, pkey *peerKey, pEntry *peerEntry) bool {

+		if pEntry.isLocal {

+			pEntry.vtep = net.ParseIP(d.advertiseAddress)

+		}

+		return false

+	})

+}

@@ -26,10 +26,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 		return fmt.Errorf("could not find endpoint with id %s", eid)

 	}

-	if err := d.writeEndpointToStore(ep); err != nil {

-		return fmt.Errorf("failed to update overlay endpoint %s to local data store: %v", ep.id[0:7], err)

-	}

-

 	buf, err := proto.Marshal(&PeerRecord{

 		EndpointIP:       ep.addr.String(),

 		EndpointMAC:      ep.mac.String(),

@@ -43,9 +39,6 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,

 	if err := jinfo.AddTableEntry(ovPeerTable, eid, buf); err != nil {

 		logrus.Errorf("overlay: Failed adding table entry to joininfo: %v", err)

 	}

-

-	d.pushLocalEndpointEvent("join", nid, eid)

-

 	return nil

 }

@@ -106,7 +99,5 @@ func (d *driver) Leave(nid, eid string) error {

 		return err

 	}

-	d.pushLocalEndpointEvent("leave", nid, eid)

-

 	return nil

 }

@@ -7,9 +7,7 @@ import (

 	"github.com/Microsoft/hcsshim"

 	"github.com/Sirupsen/logrus"

-	"github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/driverapi"

-	"github.com/docker/libnetwork/types"

 )

 type endpointTable map[string]*endpoint

@@ -23,8 +21,6 @@ type endpoint struct {

 	remote    bool

 	mac       net.HardwareAddr

 	addr      *net.IPNet

-	dbExists  bool

-	dbIndex   uint64

 }

 func validateID(nid, eid string) error {

@@ -67,6 +63,7 @@ func (n *network) removeEndpointWithAddress(addr *net.IPNet) {

 			break

 		}

 	}

+

 	if networkEndpoint != nil {

 		delete(n.endpoints, networkEndpoint.id)

 	}

@@ -79,10 +76,6 @@ func (n *network) removeEndpointWithAddress(addr *net.IPNet) {

 		if err != nil {

 			logrus.Debugf("Failed to delete stale overlay endpoint (%s) from hns", networkEndpoint.id[0:7])

 		}

-

-		if err := n.driver.deleteEndpointFromStore(networkEndpoint); err != nil {

-			logrus.Debugf("Failed to delete stale overlay endpoint (%s) from store", networkEndpoint.id[0:7])

-		}

 	}

 }

@@ -93,19 +86,23 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

 		return err

 	}

-	// Since we perform lazy configuration make sure we try

-	// configuring the driver when we enter CreateEndpoint since

-	// CreateNetwork may not be called in every node.

-	if err := d.configure(); err != nil {

-		return err

-	}

-

 	n := d.network(nid)

 	if n == nil {

 		return fmt.Errorf("network id %q not found", nid)

 	}

-	ep := &endpoint{

+	ep := n.endpoint(eid)

+	if ep != nil {

+		logrus.Debugf("Deleting stale endpoint %s", eid)

+		n.deleteEndpoint(eid)

+

+		_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileId, "")

+		if err != nil {

+			return err

+		}

+	}

+

+	ep = &endpoint{

 		id:   eid,

 		nid:  n.id,

 		addr: ifInfo.Address(),

@@ -123,6 +120,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

 	// Todo: Add port bindings and qos policies here

 	hnsEndpoint := &hcsshim.HNSEndpoint{

+		Name:              eid,

 		VirtualNetwork:    n.hnsId,

 		IPAddress:         ep.addr.IP,

 		EnableInternalDNS: true,

@@ -167,9 +165,6 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

 	}

 	n.addEndpoint(ep)

-	if err := d.writeEndpointToStore(ep); err != nil {

-		return fmt.Errorf("failed to update overlay endpoint %s to local store: %v", ep.id[0:7], err)

-	}

 	return nil

 }

@@ -191,10 +186,6 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {

 	n.deleteEndpoint(eid)

-	if err := d.deleteEndpointFromStore(ep); err != nil {

-		logrus.Warnf("Failed to delete overlay endpoint %s from local store: %v", ep.id[0:7], err)

-	}

-

 	_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileId, "")

 	if err != nil {

 		return err

@@ -223,124 +214,3 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro

 	data["AllowUnqualifiedDNSQuery"] = true

 	return data, nil

 }

-

-func (d *driver) deleteEndpointFromStore(e *endpoint) error {

-	if d.localStore == nil {

-		return fmt.Errorf("overlay local store not initialized, ep not deleted")

-	}

-

-	if err := d.localStore.DeleteObjectAtomic(e); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func (d *driver) writeEndpointToStore(e *endpoint) error {

-	if d.localStore == nil {

-		return fmt.Errorf("overlay local store not initialized, ep not added")

-	}

-

-	if err := d.localStore.PutObjectAtomic(e); err != nil {

-		return err

-	}

-	return nil

-}

-

-func (ep *endpoint) DataScope() string {

-	return datastore.LocalScope

-}

-

-func (ep *endpoint) New() datastore.KVObject {

-	return &endpoint{}

-}

-

-func (ep *endpoint) CopyTo(o datastore.KVObject) error {

-	dstep := o.(*endpoint)

-	*dstep = *ep

-	return nil

-}

-

-func (ep *endpoint) Key() []string {

-	return []string{overlayEndpointPrefix, ep.id}

-}

-

-func (ep *endpoint) KeyPrefix() []string {

-	return []string{overlayEndpointPrefix}

-}

-

-func (ep *endpoint) Index() uint64 {

-	return ep.dbIndex

-}

-

-func (ep *endpoint) SetIndex(index uint64) {

-	ep.dbIndex = index

-	ep.dbExists = true

-}

-

-func (ep *endpoint) Exists() bool {

-	return ep.dbExists

-}

-

-func (ep *endpoint) Skip() bool {

-	return false

-}

-

-func (ep *endpoint) Value() []byte {

-	b, err := json.Marshal(ep)

-	if err != nil {

-		return nil

-	}

-	return b

-}

-

-func (ep *endpoint) SetValue(value []byte) error {

-	return json.Unmarshal(value, ep)

-}

-

-func (ep *endpoint) MarshalJSON() ([]byte, error) {

-	epMap := make(map[string]interface{})

-

-	epMap["id"] = ep.id

-	epMap["nid"] = ep.nid

-	epMap["remote"] = ep.remote

-	if ep.profileId != "" {

-		epMap["profileId"] = ep.profileId

-	}

-

-	if ep.addr != nil {

-		epMap["addr"] = ep.addr.String()

-	}

-	if len(ep.mac) != 0 {

-		epMap["mac"] = ep.mac.String()

-	}

-

-	return json.Marshal(epMap)

-}

-

-func (ep *endpoint) UnmarshalJSON(value []byte) error {

-	var (

-		err   error

-		epMap map[string]interface{}

-	)

-

-	json.Unmarshal(value, &epMap)

-

-	ep.id = epMap["id"].(string)

-	ep.nid = epMap["nid"].(string)

-	ep.remote = epMap["remote"].(bool)

-	if v, ok := epMap["profileId"]; ok {

-		ep.profileId = v.(string)

-	}

-	if v, ok := epMap["mac"]; ok {

-		if ep.mac, err = net.ParseMAC(v.(string)); err != nil {

-			return types.InternalErrorf("failed to decode endpoint interface mac address after json unmarshal: %s", v.(string))

-		}

-	}

-	if v, ok := epMap["addr"]; ok {

-		if ep.addr, err = types.ParseCIDR(v.(string)); err != nil {

-			return types.InternalErrorf("failed to decode endpoint interface ipv4 address after json unmarshal: %v", err)

-		}

-	}

-	return nil

-}

deleted file mode 100644

@@ -1,209 +0,0 @@

-package overlay

-

-import (

-	"encoding/json"

-	"fmt"

-	"sync"

-

-	"github.com/Microsoft/hcsshim"

-	"github.com/Sirupsen/logrus"

-	"github.com/docker/libnetwork/datastore"

-)

-

-const overlayNetworkPrefix = "overlay/network"

-

-type localNetwork struct {

-	id              string

-	hnsID           string

-	providerAddress string

-	dbIndex         uint64

-	dbExists        bool

-	sync.Mutex

-}

-

-func (d *driver) findHnsNetwork(n *network) error {

-	ln, err := d.getLocalNetworkFromStore(n.id)

-

-	if err != nil {

-		return err

-	}

-

-	if ln == nil {

-		subnets := []hcsshim.Subnet{}

-

-		for _, s := range n.subnets {

-			subnet := hcsshim.Subnet{

-				AddressPrefix: s.subnetIP.String(),

-			}

-

-			if s.gwIP != nil {

-				subnet.GatewayAddress = s.gwIP.IP.String()

-			}

-

-			vsidPolicy, err := json.Marshal(hcsshim.VsidPolicy{

-				Type: "VSID",

-				VSID: uint(s.vni),

-			})

-

-			if err != nil {

-				return err

-			}

-

-			subnet.Policies = append(subnet.Policies, vsidPolicy)

-			subnets = append(subnets, subnet)

-		}

-

-		network := &hcsshim.HNSNetwork{

-			Name:               n.name,

-			Type:               d.Type(),

-			Subnets:            subnets,

-			NetworkAdapterName: n.interfaceName,

-		}

-

-		configurationb, err := json.Marshal(network)

-		if err != nil {

-			return err

-		}

-

-		configuration := string(configurationb)

-		logrus.Infof("HNSNetwork Request =%v", configuration)

-

-		hnsresponse, err := hcsshim.HNSNetworkRequest("POST", "", configuration)

-		if err != nil {

-			return err

-		}

-

-		n.hnsId = hnsresponse.Id

-		n.providerAddress = hnsresponse.ManagementIP

-

-		// Save local host specific info

-		if err := d.writeLocalNetworkToStore(n); err != nil {

-			return fmt.Errorf("failed to update data store for network %v: %v", n.id, err)

-		}

-	} else {

-		n.hnsId = ln.hnsID

-		n.providerAddress = ln.providerAddress

-	}

-

-	return nil

-}

-

-func (d *driver) getLocalNetworkFromStore(nid string) (*localNetwork, error) {

-

-	if d.localStore == nil {

-		return nil, fmt.Errorf("overlay local store not initialized, network not found")

-	}

-

-	n := &localNetwork{id: nid}

-	if err := d.localStore.GetObject(datastore.Key(n.Key()...), n); err != nil {

-		return nil, nil

-	}

-

-	return n, nil

-}

-

-func (d *driver) deleteLocalNetworkFromStore(n *network) error {

-	if d.localStore == nil {

-		return fmt.Errorf("overlay local store not initialized, network not deleted")

-	}

-

-	ln, err := d.getLocalNetworkFromStore(n.id)

-

-	if err != nil {

-		return err

-	}

-

-	if err = d.localStore.DeleteObjectAtomic(ln); err != nil {

-		return err

-	}

-

-	return nil

-}

-

-func (d *driver) writeLocalNetworkToStore(n *network) error {

-	if d.localStore == nil {

-		return fmt.Errorf("overlay local store not initialized, network not added")

-	}

-

-	ln := &localNetwork{

-		id:              n.id,

-		hnsID:           n.hnsId,

-		providerAddress: n.providerAddress,

-	}

-

-	if err := d.localStore.PutObjectAtomic(ln); err != nil {

-		return err

-	}

-	return nil

-}

-

-func (n *localNetwork) DataScope() string {

-	return datastore.LocalScope

-}

-

-func (n *localNetwork) New() datastore.KVObject {

-	return &localNetwork{}

-}

-

-func (n *localNetwork) CopyTo(o datastore.KVObject) error {

-	dstep := o.(*localNetwork)

-	*dstep = *n

-	return nil

-}

-

-func (n *localNetwork) Key() []string {

-	return []string{overlayNetworkPrefix, n.id}

-}

-

-func (n *localNetwork) KeyPrefix() []string {

-	return []string{overlayNetworkPrefix}

-}

-

-func (n *localNetwork) Index() uint64 {

-	return n.dbIndex

-}

-

-func (n *localNetwork) SetIndex(index uint64) {

-	n.dbIndex = index

-	n.dbExists = true

-}

-

-func (n *localNetwork) Exists() bool {

-	return n.dbExists

-}

-

-func (n *localNetwork) Skip() bool {

-	return false

-}

-

-func (n *localNetwork) Value() []byte {

-	b, err := json.Marshal(n)

-	if err != nil {

-		return nil

-	}

-	return b

-}

-

-func (n *localNetwork) SetValue(value []byte) error {

-	return json.Unmarshal(value, n)

-}

-

-func (n *localNetwork) MarshalJSON() ([]byte, error) {

-	networkMap := make(map[string]interface{})

-

-	networkMap["id"] = n.id

-	networkMap["hnsID"] = n.hnsID

-	networkMap["providerAddress"] = n.providerAddress

-	return json.Marshal(networkMap)

-}

-

-func (n *localNetwork) UnmarshalJSON(value []byte) error {

-	var networkMap map[string]interface{}

-

-	json.Unmarshal(value, &networkMap)

-

-	n.id = networkMap["id"].(string)

-	n.hnsID = networkMap["hnsID"].(string)

-	n.providerAddress = networkMap["providerAddress"].(string)

-	return nil

-}

@@ -10,7 +10,6 @@ import (

 	"github.com/Microsoft/hcsshim"

 	"github.com/Sirupsen/logrus"

-	"github.com/docker/libnetwork/datastore"

 	"github.com/docker/libnetwork/driverapi"

 	"github.com/docker/libnetwork/netlabel"

 	"github.com/docker/libnetwork/types"

@@ -25,9 +24,8 @@ type networkTable map[string]*network

 type subnet struct {

 	vni      uint32

-	initErr  error

 	subnetIP *net.IPNet

-	gwIP     *net.IPNet

+	gwIP     *net.IP

 }

 type subnetJSON struct {

@@ -40,8 +38,6 @@ type network struct {

 	id              string

 	name            string

 	hnsId           string

-	dbIndex         uint64

-	dbExists        bool

 	providerAddress string

 	interfaceName   string

 	endpoints       endpointTable

@@ -65,22 +61,31 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d

 	var (

 		networkName   string

 		interfaceName string

+		staleNetworks []string

 	)

 	if id == "" {

 		return fmt.Errorf("invalid network id")

 	}

+	if nInfo == nil {

+		return fmt.Errorf("invalid network info structure")

+	}

+

 	if len(ipV4Data) == 0 || ipV4Data[0].Pool.String() == "0.0.0.0/0" {

 		return types.BadRequestErrorf("ipv4 pool is empty")

 	}

+	staleNetworks = make([]string, 0)

 	vnis := make([]uint32, 0, len(ipV4Data))

-	// Since we perform lazy configuration make sure we try

-	// configuring the driver when we enter CreateNetwork

-	if err := d.configure(); err != nil {

-		return err

+	existingNetwork := d.network(id)

+	if existingNetwork != nil {

+		logrus.Debugf("Network preexists. Deleting %s", id)

+		err := d.DeleteNetwork(id)

+		if err != nil {

+			logrus.Errorf("Error deleting stale network %s", err.Error())

+		}

 	}

 	n := &network{

@@ -119,23 +124,43 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d

 	// If we are getting vnis from libnetwork, either we get for

 	// all subnets or none.

-	if len(vnis) != 0 && len(vnis) < len(ipV4Data) {

-		return fmt.Errorf("insufficient vnis(%d) passed to overlay", len(vnis))

+	if len(vnis) < len(ipV4Data) {

+		return fmt.Errorf("insufficient vnis(%d) passed to overlay. Windows driver requires VNIs to be prepopulated", len(vnis))

 	}

 	for i, ipd := range ipV4Data {

 		s := &subnet{

 			subnetIP: ipd.Pool,

-			gwIP:     ipd.Gateway,

+			gwIP:     &ipd.Gateway.IP,

 		}

 		if len(vnis) != 0 {

 			s.vni = vnis[i]

 		}

+		d.Lock()

+		for _, network := range d.networks {

+			found := false

+			for _, sub := range network.subnets {

+				if sub.vni == s.vni {

+					staleNetworks = append(staleNetworks, network.id)

+					found = true

+					break

+				}

+			}

+			if found {

+				break

+			}

+		}

+		d.Unlock()

+

 		n.subnets = append(n.subnets, s)

 	}

+	for _, staleNetwork := range staleNetworks {

+		d.DeleteNetwork(staleNetwork)

+	}

+

 	n.name = networkName

 	if n.name == "" {

 		n.name = id

@@ -143,10 +168,6 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d

 	n.interfaceName = interfaceName

-	if err := n.writeToStore(); err != nil {

-		return fmt.Errorf("failed to update data store for network %v: %v", n.id, err)

-	}

-

 	if nInfo != nil {

 		if err := nInfo.TableEventRegister(ovPeerTable); err != nil {

 			return err

@@ -155,8 +176,13 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d

 	d.addNetwork(n)

-	err := d.findHnsNetwork(n)

-	genData["com.docker.network.windowsshim.hnsid"] = n.hnsId

+	err := d.createHnsNetwork(n)

+

+	if err != nil {

+		d.deleteNetwork(id)

+	} else {

+		genData["com.docker.network.windowsshim.hnsid"] = n.hnsId

+	}

 	return err

 }

@@ -166,23 +192,17 @@ func (d *driver) DeleteNetwork(nid string) error {

 		return fmt.Errorf("invalid network id")

 	}

-	// Make sure driver resources are initialized before proceeding

-	if err := d.configure(); err != nil {

-		return err

-	}

-

 	n := d.network(nid)

 	if n == nil {

-		return fmt.Errorf("could not find network with id %s", nid)

+		return types.ForbiddenErrorf("could not find network with id %s", nid)

 	}

 	_, err := hcsshim.HNSNetworkRequest("DELETE", n.hnsId, "")

 	if err != nil {

-		return err

+		return types.ForbiddenErrorf(err.Error())

 	}

 	d.deleteNetwork(nid)

-	d.deleteLocalNetworkFromStore(n)

 	return nil

 }

@@ -209,259 +229,107 @@ func (d *driver) deleteNetwork(nid string) {

 func (d *driver) network(nid string) *network {

 	d.Lock()

-	networks := d.networks

-	d.Unlock()

-

-	n, ok := networks[nid]

-	if !ok {

-		n = d.getNetworkFromStore(nid)

-		if n != nil {

-			n.driver = d

-			n.endpoints = endpointTable{}

-			networks[nid] = n

-		}

-	}

-

-	return n

+	defer d.Unlock()

+	return d.networks[nid]

 }

-func (d *driver) getNetworkFromStore(nid string) *network {

-	if d.store == nil {

-		return nil

-	}

-

-	n := &network{id: nid}

-	if err := d.store.GetObject(datastore.Key(n.Key()...), n); err != nil {

-		return nil

-	}

-

-	// As the network is being discovered from the global store, HNS may not be aware of it yet

-	err := d.findHnsNetwork(n)

-	if err != nil {

-		logrus.Errorf("Failed to find hns network: %v", err)

-		return nil

-	}

+// func (n *network) restoreNetworkEndpoints() error {

+// 	logrus.Infof("Restoring endpoints for overlay network: %s", n.id)

-	return n

-}

+// 	hnsresponse, err := hcsshim.HNSListEndpointRequest("GET", "", "")

+// 	if err != nil {

+// 		return err

+// 	}

-func (n *network) vxlanID(s *subnet) uint32 {

-	n.Lock()

-	defer n.Unlock()

+// 	for _, endpoint := range hnsresponse {

+// 		if endpoint.VirtualNetwork != n.hnsId {

+// 			continue

+// 		}

-	return s.vni

-}

+// 		ep := n.convertToOverlayEndpoint(&endpoint)

-func (n *network) setVxlanID(s *subnet, vni uint32) {

-	n.Lock()

-	s.vni = vni

-	n.Unlock()

-}

+// 		if ep != nil {

+// 			logrus.Debugf("Restored endpoint:%s Remote:%t", ep.id, ep.remote)

+// 			n.addEndpoint(ep)

+// 		}

+// 	}

-func (n *network) Key() []string {