From 41f80dd9efa9cfb3c236a217500e222da1acfe23 Mon Sep 17 00:00:00 2001
From: Oliver Herms <oliver.herms@exaring.de>
Date: Thu, 1 Nov 2018 00:40:07 +0100
Subject: [PATCH] Fix tests
---
apps/bmp-streamer/pkg/apiserver/BUILD.bazel | 1 +
apps/bmp-streamer/pkg/apiserver/server_test.go | 18 +++++++++---------
apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel | 8 ++++----
apps/bmp-streamer/pkg/bmpstreamer/bmp.proto | 4 ++--
route/api/BUILD.bazel | 4 ++--
route/api/route.proto | 2 +-
route/bgp_path_test.go | 8 ++++----
route/static_test.go | 4 ++--
8 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/apps/bmp-streamer/pkg/apiserver/BUILD.bazel b/apps/bmp-streamer/pkg/apiserver/BUILD.bazel
index e4644eec..c9b17e65 100644
--- a/apps/bmp-streamer/pkg/apiserver/BUILD.bazel
+++ b/apps/bmp-streamer/pkg/apiserver/BUILD.bazel
@@ -8,6 +8,7 @@ go_library(
deps = [
"//apps/bmp-streamer/pkg/bmpstreamer:go_default_library",
"//net:go_default_library",
+ "//net/api:go_default_library",
"//protocols/bgp/packet:go_default_library",
"//protocols/bgp/server:go_default_library",
"//route:go_default_library",
diff --git a/apps/bmp-streamer/pkg/apiserver/server_test.go b/apps/bmp-streamer/pkg/apiserver/server_test.go
index 62364af3..45f5a132 100644
--- a/apps/bmp-streamer/pkg/apiserver/server_test.go
+++ b/apps/bmp-streamer/pkg/apiserver/server_test.go
@@ -63,26 +63,26 @@ func TestUpdateToRIBUpdate(t *testing.T) {
},
expected: &pb.RIBUpdate{
Peer: &apinet.IP{
- Lower: 220,
- IsLegacy: true,
+ Lower: 220,
+ Version: apinet.IP_IPv4,
},
Advertisement: true,
Route: &apiroute.Route{
Pfx: &apinet.Prefix{
Address: &apinet.IP{
- Lower: 200,
- IsLegacy: true,
+ Lower: 200,
+ Version: apinet.IP_IPv4,
},
Pfxlen: 8,
},
Paths: []*apiroute.Path{
{
- Type: route.BGPPathType,
+ Type: apiroute.Path_BGP,
BGPPath: &apiroute.BGPPath{
PathIdentifier: 10,
NextHop: &apinet.IP{
- Lower: 210,
- IsLegacy: true,
+ Lower: 210,
+ Version: apinet.IP_IPv4,
},
LocalPref: 20,
ASPath: []*apiroute.ASPathSegment{
@@ -96,8 +96,8 @@ func TestUpdateToRIBUpdate(t *testing.T) {
EBGP: true,
BGPIdentifier: 1337,
Source: &apinet.IP{
- Lower: 220,
- IsLegacy: true,
+ Lower: 220,
+ Version: apinet.IP_IPv4,
},
Communities: []uint32{10000, 20000},
LargeCommunities: []*apiroute.LargeCommunity{
diff --git a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
index ede8926c..8ff63439 100644
--- a/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
+++ b/apps/bmp-streamer/pkg/bmpstreamer/BUILD.bazel
@@ -6,8 +6,8 @@ proto_library(
srcs = ["bmp.proto"],
visibility = ["//visibility:public"],
deps = [
- "//net/api:bio_net_proto",
- "//route/api:bio_route_proto",
+ "//github.com/bio-routing/bio-rd/net/api:api_proto",
+ "//github.com/bio-routing/bio-rd/route/api:api_proto",
],
)
@@ -18,8 +18,8 @@ go_proto_library(
proto = ":bmpstreamer_proto",
visibility = ["//visibility:public"],
deps = [
- "//net/api:go_default_library",
- "//route/api:go_default_library",
+ "//github.com/bio-routing/bio-rd/net/api:go_default_library",
+ "//github.com/bio-routing/bio-rd/route/api:go_default_library",
"//vendor/google.golang.org/grpc:go_default_library", # keep
],
)
diff --git a/apps/bmp-streamer/pkg/bmpstreamer/bmp.proto b/apps/bmp-streamer/pkg/bmpstreamer/bmp.proto
index c065ac86..f86455ee 100644
--- a/apps/bmp-streamer/pkg/bmpstreamer/bmp.proto
+++ b/apps/bmp-streamer/pkg/bmpstreamer/bmp.proto
@@ -2,8 +2,8 @@ syntax = "proto3";
package bmpstreamer;
-import "net/api/net.proto";
-import "route/api/route.proto";
+import "github.com/bio-routing/bio-rd/net/api/net.proto";
+import "github.com/bio-routing/bio-rd/route/api/route.proto";
service RIBService {
rpc adjRIBInStream(AdjRIBInStreamRequest) returns (stream RIBUpdate);
diff --git a/route/api/BUILD.bazel b/route/api/BUILD.bazel
index ff95321a..a20974ee 100644
--- a/route/api/BUILD.bazel
+++ b/route/api/BUILD.bazel
@@ -5,7 +5,7 @@ proto_library(
name = "bio_route_proto",
srcs = ["route.proto"],
visibility = ["//visibility:public"],
- deps = ["//net/api:bio_net_proto"],
+ deps = ["//github.com/bio-routing/bio-rd/net/api:api_proto"],
)
go_proto_library(
@@ -13,7 +13,7 @@ go_proto_library(
importpath = "github.com/bio-routing/bio-rd/route/api",
proto = ":bio_route_proto",
visibility = ["//visibility:public"],
- deps = ["//net/api:go_default_library"],
+ deps = ["//github.com/bio-routing/bio-rd/net/api:go_default_library"],
)
go_library(
diff --git a/route/api/route.proto b/route/api/route.proto
index c1846ad8..72aaaec3 100644
--- a/route/api/route.proto
+++ b/route/api/route.proto
@@ -2,7 +2,7 @@ syntax = "proto3";
package bio.route;
-import "net/api/net.proto";
+import "github.com/bio-routing/bio-rd/net/api/net.proto";
message Route {
bio.net.Prefix pfx = 1;
diff --git a/route/bgp_path_test.go b/route/bgp_path_test.go
index d7b6da66..897a3713 100644
--- a/route/bgp_path_test.go
+++ b/route/bgp_path_test.go
@@ -184,8 +184,8 @@ func TestBGPPathToProto(t *testing.T) {
expected: &pb.BGPPath{
PathIdentifier: 10,
NextHop: &netapi.IP{
- Lower: 210,
- Version: api.IP_IPv4,
+ Lower: 210,
+ Version: netapi.IP_IPv4,
},
LocalPref: 20,
ASPath: []*pb.ASPathSegment{
@@ -199,8 +199,8 @@ func TestBGPPathToProto(t *testing.T) {
EBGP: true,
BGPIdentifier: 1337,
Source: &netapi.IP{
- Lower: 220,
- IsLegacy: true,
+ Lower: 220,
+ Version: netapi.IP_IPv4,
},
Communities: []uint32{10000, 20000},
LargeCommunities: []*pb.LargeCommunity{
diff --git a/route/static_test.go b/route/static_test.go
index 7964e328..b6b84b2c 100644
--- a/route/static_test.go
+++ b/route/static_test.go
@@ -22,8 +22,8 @@ func TestStaticToProto(t *testing.T) {
},
expected: &api.StaticPath{
NextHop: &apinet.IP{
- IsLegacy: true,
- Lower: 123,
+ Version: apinet.IP_IPv4,
+ Lower: 123,
},
},
},
--
GitLab