Fix broken build because of beehive's api change

controller/ctrl.go

@@ -1,8 +1,8 @@
 package controller
 
 import (
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	"github.com/kandoo/beehive-netctrl/nom"
+	bh "github.com/kandoo/beehive"
 )
 
 func RegisterNOMController(h bh.Hive) {

controller/dicts.go

@@ -3,7 +3,7 @@ package controller
 import (
 	"encoding/json"
 
-	"github.com/soheilhy/beehive-netctrl/nom"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 const (

controller/flow.go

@@ -1,6 +1,6 @@
 package controller
 
-import "github.com/soheilhy/beehive/bh"
+import bh "github.com/kandoo/beehive"
 
 type addFlowHandler struct{}
 

controller/node.go

@@ -5,8 +5,8 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	bh "github.com/kandoo/beehive"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 type nodeConnectedHandler struct{}
@@ -15,7 +15,7 @@ func (h *nodeConnectedHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	nc := msg.Data().(nom.NodeConnected)
 
 	dict := ctx.Dict(nodeDriversDict)
-	k := bh.Key(nc.Node.ID)
+	k := string(nc.Node.ID)
 	n := nodeDrivers{}
 	if err := nom.DictGet(dict, k, &n); err != nil {
 		n.Node = nc.Node
@@ -41,14 +41,14 @@ func (h *nodeConnectedHandler) Map(msg bh.Msg,
 	ctx bh.MapContext) bh.MappedCells {
 
 	nc := msg.Data().(nom.NodeConnected)
-	return bh.MappedCells{{nodeDriversDict, bh.Key(nc.Node.ID)}}
+	return bh.MappedCells{{nodeDriversDict, string(nc.Node.ID)}}
 }
 
 type nodeDisconnectedHandler struct{}
 
 func (h *nodeDisconnectedHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	nd := msg.Data().(nom.NodeDisconnected)
-	k := bh.Key(nd.Node.ID)
+	k := string(nd.Node.ID)
 	n := nodeDrivers{}
 	if err := ctx.Dict(nodeDriversDict).GetGob(k, &n); err != nil {
 		return fmt.Errorf("Driver %v disconnects from %v before connecting",
@@ -67,5 +67,5 @@ func (h *nodeDisconnectedHandler) Map(msg bh.Msg,
 	ctx bh.MapContext) bh.MappedCells {
 
 	nd := msg.Data().(nom.NodeDisconnected)
-	return bh.MappedCells{{nodeDriversDict, bh.Key(nd.Node.ID)}}
+	return bh.MappedCells{{nodeDriversDict, string(nd.Node.ID)}}
 }

controller/pkt.go

@@ -1,16 +1,16 @@
 package controller
 
 import (
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	bh "github.com/kandoo/beehive"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 type pktOutHandler struct{}
 
 func (h *pktOutHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	pkt := msg.Data().(nom.PacketOut)
 	d := ctx.Dict(nodeDriversDict)
-	k := bh.Key(pkt.Node)
+	k := string(pkt.Node)
 	var nd nodeDrivers
 	if err := d.GetGob(k, &nd); err != nil {
 		return err
@@ -23,6 +23,6 @@ func (h *pktOutHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *pktOutHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDriversDict, bh.Key(msg.Data().(nom.PacketOut).Node)},
+		{nodeDriversDict, string(msg.Data().(nom.PacketOut).Node)},
 	}
 }

controller/port.go

@@ -3,8 +3,8 @@ package controller
 import (
 	"fmt"
 
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	bh "github.com/kandoo/beehive"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 type portStatusHandler struct{}
@@ -16,7 +16,7 @@ func (h *portStatusHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	// make sure we apply the log to the port status
 	data := msg.Data().(nom.PortStatusChanged)
 	dict := ctx.Dict(nodeDriversDict)
-	k := bh.Key(data.Port.Node)
+	k := string(data.Port.Node)
 	n := nodeDrivers{}
 	if err := dict.GetGob(k, &n); err != nil {
 		return fmt.Errorf("Node %v not found", data.Port.Node)
@@ -42,6 +42,6 @@ func (h *portStatusHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *portStatusHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDriversDict, bh.Key(msg.Data().(nom.PortStatusChanged).Port.Node)},
+		{nodeDriversDict, string(msg.Data().(nom.PortStatusChanged).Port.Node)},
 	}
 }

controller/query.go

@@ -1,6 +1,6 @@
 package controller
 
-import "github.com/soheilhy/beehive/bh"
+import bh "github.com/kandoo/beehive"
 
 type queryHandler struct{}
 

discovery/discovery.go

@@ -5,9 +5,9 @@ import (
 	"time"
 
 	"github.com/golang/glog"
-	"github.com/soheilhy/beehive-netctrl/net/ethernet"
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	bh "github.com/kandoo/beehive"
+	"github.com/kandoo/beehive-netctrl/net/ethernet"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 type LinkDiscovered struct {
@@ -77,7 +77,7 @@ func (h *nodeJoinedHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	joined := msg.Data().(nom.NodeJoined)
 	d := ctx.Dict(nodeDict)
 	n := nom.Node(joined)
-	k := bh.Key(n.UID())
+	k := string(n.UID())
 	var np nodePortsAndLinks
 	if err := d.GetGob(k, &np); err != nil {
 		glog.Warningf("%v rejoins", n)
@@ -89,7 +89,7 @@ func (h *nodeJoinedHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *nodeJoinedHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDict, bh.Key(nom.Node(msg.Data().(nom.NodeJoined)).UID())},
+		{nodeDict, string(nom.Node(msg.Data().(nom.NodeJoined)).UID())},
 	}
 }
 
@@ -98,7 +98,7 @@ type nodeLeftHandler struct{}
 func (h *nodeLeftHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	n := nom.Node(msg.Data().(nom.NodeLeft))
 	d := ctx.Dict(nodeDict)
-	k := bh.Key(n.UID())
+	k := string(n.UID())
 	if _, err := d.Get(k); err != nil {
 		return fmt.Errorf("%v is not joined", n)
 	}
@@ -108,7 +108,7 @@ func (h *nodeLeftHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *nodeLeftHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDict, bh.Key(nom.Node(msg.Data().(nom.NodeLeft)).UID())},
+		{nodeDict, string(nom.Node(msg.Data().(nom.NodeLeft)).UID())},
 	}
 }
 
@@ -117,7 +117,7 @@ type portUpdateHandler struct{}
 func (h *portUpdateHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	p := nom.Port(msg.Data().(nom.PortUpdated))
 	d := ctx.Dict(nodeDict)
-	k := bh.Key(p.Node)
+	k := string(p.Node)
 	var np nodePortsAndLinks
 	if err := d.GetGob(k, &np); err != nil {
 		glog.Warningf("%v added before its node", p)
@@ -138,7 +138,7 @@ func (h *portUpdateHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *portUpdateHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDict, bh.Key(msg.Data().(nom.PortUpdated).Node)},
+		{nodeDict, string(msg.Data().(nom.PortUpdated).Node)},
 	}
 }
 
@@ -148,9 +148,9 @@ type timeoutHandler struct{}
 
 func (h *timeoutHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	d := ctx.Dict(nodeDict)
-	d.ForEach(func(k bh.Key, v bh.Value) {
+	d.ForEach(func(k string, v []byte) {
 		var np nodePortsAndLinks
-		if err := nom.ObjGoDecode(&np, []byte(v)); err != nil {
+		if err := nom.ObjGoDecode(&np, v); err != nil {
 			glog.Errorf("Error in decoding value: %v", err)
 			return
 		}
@@ -180,7 +180,7 @@ func (h *pktInHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	}
 
 	d := ctx.Dict(nodeDict)
-	k := bh.Key(pin.Node)
+	k := string(pin.Node)
 	var np nodePortsAndLinks
 	if err := d.GetGob(k, &np); err != nil {
 		return fmt.Errorf("Node %v not found", pin.Node)
@@ -207,7 +207,7 @@ func (h *pktInHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *pktInHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	return bh.MappedCells{
-		{nodeDict, bh.Key(msg.Data().(nom.PacketIn).Node)},
+		{nodeDict, string(msg.Data().(nom.PacketIn).Node)},
 	}
 }
 
@@ -219,7 +219,7 @@ func (h *newLinkHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 	l := nom.Link(msg.Data().(NewLink))
 	n, _ := nom.ParsePortUID(l.From)
 	d := ctx.Dict(nodeDict)
-	k := bh.Key(n)
+	k := string(n)
 	var np nodePortsAndLinks
 	if err := d.GetGob(k, &np); err != nil {
 		return err
@@ -241,7 +241,7 @@ func (h *newLinkHandler) Rcv(msg bh.Msg, ctx bh.RcvContext) error {
 
 func (h *newLinkHandler) Map(msg bh.Msg, ctx bh.MapContext) bh.MappedCells {
 	n, _ := nom.ParsePortUID(msg.Data().(NewLink).From)
-	return bh.MappedCells{{nodeDict, bh.Key(n)}}
+	return bh.MappedCells{{nodeDict, string(n)}}
 }
 
 // RegisterDiscovery registers the handlers for topology discovery on the hive.

discovery/lldp.go

@@ -3,9 +3,9 @@ package discovery
 import (
 	"errors"
 
-	"github.com/soheilhy/beehive-netctrl/net/lldp"
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive/bh"
+	"github.com/kandoo/beehive-netctrl/net/lldp"
+	"github.com/kandoo/beehive-netctrl/nom"
+	bh "github.com/kandoo/beehive"
 )
 
 func sendLLDPPacket(n nom.Node, p nom.Port, ctx bh.RcvContext) {

discovery/lldp_test.go

@@ -3,7 +3,7 @@ package discovery
 import (
 	"testing"
 
-	"github.com/soheilhy/beehive-netctrl/nom"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 func TestLLDPEncode(t *testing.T) {

main.go

@@ -6,10 +6,10 @@ import (
 	"os"
 	"runtime/pprof"
 
-	"github.com/soheilhy/beehive-netctrl/controller"
-	"github.com/soheilhy/beehive-netctrl/discovery"
-	"github.com/soheilhy/beehive-netctrl/openflow"
-	"github.com/soheilhy/beehive/bh"
+	"github.com/kandoo/beehive-netctrl/controller"
+	"github.com/kandoo/beehive-netctrl/discovery"
+	"github.com/kandoo/beehive-netctrl/openflow"
+	bh "github.com/kandoo/beehive"
 )
 
 var cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")

net/lldp/lldp.go

@@ -12,7 +12,7 @@ import (
 
 	"github.com/packet/packet/src/go/packet"
 
-	"github.com/soheilhy/beehive-netctrl/net/ethernet"
+	"github.com/kandoo/beehive-netctrl/net/ethernet"
 )
 
 type LinkDiscoveryTLVType int

net/meta/meta.go

@@ -12,6 +12,6 @@ import (
 
 	"github.com/packet/packet/src/go/packet"
 
-	"github.com/soheilhy/beehive-netctrl/net/ethernet"
-	"github.com/soheilhy/beehive-netctrl/net/lldp"
+	"github.com/kandoo/beehive-netctrl/net/ethernet"
+	"github.com/kandoo/beehive-netctrl/net/lldp"
 )

nom/driver.go

@@ -1,15 +1,11 @@
 package nom
 
-import (
-	"encoding/json"
-
-	"github.com/soheilhy/beehive/bh"
-)
+import "encoding/json"
 
 // Driver represents the Bee that communicates with the actual networking
 // element and adapts the southbound protocol for using in NOM.
 type Driver struct {
-	BeeID bh.BeeID
+	BeeID uint64
 	Role  DriverRole
 }
 

nom/object.go

@@ -6,7 +6,7 @@ import (
 	"reflect"
 
 	"github.com/golang/glog"
-	"github.com/soheilhy/beehive/bh"
+	"github.com/kandoo/beehive/state"
 )
 
 // Object is the interface of all structs in the network object model.
@@ -42,7 +42,7 @@ func ObjGoEncode(obj interface{}) ([]byte, error) {
 	return buf.Bytes(), nil
 }
 
-func DictGet(d bh.Dict, k bh.Key, obj Object) error {
+func DictGet(d state.Dict, k string, obj Object) error {
 	v, err := d.Get(k)
 	if err != nil {
 		return err
@@ -57,7 +57,7 @@ func DictGet(d bh.Dict, k bh.Key, obj Object) error {
 	return nil
 }
 
-func DictPut(d bh.Dict, k bh.Key, obj Object) error {
+func DictPut(d state.Dict, k string, obj Object) error {
 	v, err := obj.GoEncode()
 	if err != nil {
 		return err

openflow/bh.go

@@ -5,7 +5,7 @@ import (
 
 	"github.com/golang/glog"
 
-	"github.com/soheilhy/beehive/bh"
+	bh "github.com/kandoo/beehive"
 )
 
 // OFConfig stores the configuration of the OpenFlow driver.

openflow/conn.go

@@ -4,9 +4,9 @@ import (
 	"io"
 
 	"github.com/golang/glog"
-	"github.com/soheilhy/beehive-netctrl/nom"
-	"github.com/soheilhy/beehive-netctrl/openflow/of"
-	"github.com/soheilhy/beehive/bh"
+	"github.com/kandoo/beehive-netctrl/nom"
+	"github.com/kandoo/beehive-netctrl/openflow/of"
+	bh "github.com/kandoo/beehive"
 )
 
 type ofConnConfig struct {

openflow/conv.go

@@ -3,7 +3,7 @@ package openflow
 import (
 	"strconv"
 
-	"github.com/soheilhy/beehive-netctrl/nom"
+	"github.com/kandoo/beehive-netctrl/nom"
 )
 
 func datapathIDToNodeID(dpID uint64) nom.NodeID {