diff options
| author | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-05-02 08:49:00 +0900 |
|---|---|---|
| committer | FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp> | 2016-05-02 08:49:00 +0900 |
| commit | 2a0751f07baff748b40b074d4edbfb460fc76af7 (patch) | |
| tree | 16add44e490ad092eb1ade5d1441c0a55c00fff4 | |
| parent | 54a19978eeae12ef01872485994c2b260fbdb297 (diff) | |
use socketplane/libovsdb instead of osrg fork
The version of libovsdb that osrg forked uses
github.com/socketplane/libovsdb/Godeps/, which has gone now. So our
fork doesn't work any more.
Let's try to use socketplane/libovsdb.
Signed-off-by: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
| -rw-r--r-- | openswitch/openswitch.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/openswitch/openswitch.go b/openswitch/openswitch.go index bf180bf4..898d6398 100644 --- a/openswitch/openswitch.go +++ b/openswitch/openswitch.go @@ -22,8 +22,8 @@ import ( "github.com/osrg/gobgp/gobgp/cmd" "github.com/osrg/gobgp/packet/bgp" "github.com/osrg/gobgp/server" - ovsdb "github.com/osrg/libovsdb" "github.com/satori/go.uuid" + ovsdb "github.com/socketplane/libovsdb" "net" "reflect" "strconv" @@ -157,7 +157,7 @@ func parseRouteToGobgp(route ovsdb.RowUpdate, nexthops map[string]ovsdb.Row) (*a nhId, ok := route.New.Fields["bgp_nexthops"].(ovsdb.UUID) if ok { for id, n := range nexthops { - if id == nhId.GoUuid { + if id == nhId.GoUUID { nh = append(nh, n.Fields["ip_address"]) } } @@ -378,7 +378,7 @@ func (m *OpsManager) handleRouteUpdate(update ovsdb.TableUpdate) []*server.GrpcR if vrf == nil { continue } - idx := vrf.(ovsdb.UUID).GoUuid + idx := vrf.(ovsdb.UUID).GoUUID if uuid.Equal(id, uuid.FromStringOrNil(idx)) { path, isWithdraw, isFromGobgp, err := parseRouteToGobgp(v, m.cache["BGP_Nexthop"]) if err != nil { @@ -736,7 +736,7 @@ type OpsManager struct { } func NewOpsManager(grpcCh chan *server.GrpcRequest) (*OpsManager, error) { - ops, err := ovsdb.ConnectUnix("") + ops, err := ovsdb.Connect("", 0) if err != nil { return nil, err } |