Merge branch 'master' into feature/path_cleanup

.bazelrc.travis

-# This is from Bazel's former travis setup, to avoid blowing up the RAM usage.
-startup --host_jvm_args=-Xmx2500m
-startup --host_jvm_args=-Xms2500m
-startup --batch
-test --ram_utilization_factor=10
-
-# This is so we understand failures better
-build --verbose_failures
-
-# Disable curses to get nicer log
-build --curses=no
-test --curses=no
-
-# This is so we don't use sandboxed execution. Sandboxed execution
-# runs stuff in a container, and since Travis already runs its script
-# in a container (unless you require sudo in your .travis.yml) this
-# fails to run tests.
-build --spawn_strategy=standalone --genrule_strategy=standalone
-test --test_strategy=standalone
-
-# Below this line, .travis.yml will cat the default bazelrc.
-# This is needed so Bazel starts with the base workspace in its
-# package path.

.travis.bazel-0.14.1-installer-linux-x86_64.sh.sha256

-7b14e4fc76bf85c4abf805833e99f560f124a3b96d56e0712c693e94e19d1376  bazel-0.14.1-installer-linux-x86_64.sh

.travis.yml

@@ -13,17 +13,15 @@ addons:
       - unzip
       - python
 
-before_install:
-  - wget https://github.com/bazelbuild/bazel/releases/download/0.14.1/bazel-0.14.1-installer-linux-x86_64.sh
-  - sha256sum -c .travis.bazel-0.14.1-installer-linux-x86_64.sh.sha256
-  - bash bazel-0.14.1-installer-linux-x86_64.sh --user
+language: go
+
+go:
+  - 1.11.1
 
 script:
 - mkdir -p $HOME/gopath/src/github.com/bio-routing/
 - ln -s $TRAVIS_BUILD_DIR $HOME/gopath/src/github.com/bio-routing/bio-rd || true
-- cp .bazelrc.travis .bazelrc
-- bazel test //...
-- bazel coverage //...
-- bazel build //vendor/github.com/q3k/goveralls
-- bazel-bin/vendor/github.com/q3k/goveralls/linux_amd64_stripped/goveralls -coverprofile=$(find bazel-testlogs/ -iname coverage.dat -or -iname baseline_coverage.dat | paste -sd ',') -merge=false
-
+- cd $HOME/gopath/src/github.com/bio-routing/bio-rd
+- go test -v -cover -coverprofile=coverage.out ./...
+- go install github.com/bio-routing/bio-rd/vendor/github.com/q3k/goveralls/
+- $HOME/gopath/bin/goveralls -coverprofile=coverage.out -merge=false

BUILD.bazel

-load("@bazel_gazelle//:def.bzl", "gazelle")
-
-# gazelle:prefix github.com/bio-routing/bio-rd
-gazelle(
-    name = "gazelle",
-    external = "vendored",
-    prefix = "github.com/bio-routing/bio-rd",
-)

config/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "netlink.go",
-        "peer.go",
-        "server.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/config",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//net:go_default_library",
-        "//routingtable:go_default_library",
-        "//routingtable/filter:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = ["server_test.go"],
-    embed = [":go_default_library"],
-)

examples/bgp/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "main.go",
-        "main_ipv4.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/examples/bgp",
-    visibility = ["//visibility:private"],
-    deps = [
-        "//config:go_default_library",
-        "//net:go_default_library",
-        "//protocols/bgp/server:go_default_library",
-        "//routingtable:go_default_library",
-        "//routingtable/filter:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-    ],
-)
-
-go_binary(
-    name = "bgp",
-    embed = [":go_default_library"],
-    visibility = ["//visibility:public"],
-)

examples/bmp/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["main_bmp.go"],
-    importpath = "github.com/bio-routing/bio-rd/examples/bmp",
-    visibility = ["//visibility:private"],
-    deps = [
-        "//protocols/bgp/server:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-    ],
-)
-
-go_binary(
-    name = "bmp",
-    embed = [":go_default_library"],
-    visibility = ["//visibility:public"],
-)

fuzzing/packet/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_binary", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["gen_initial_corpus.go"],
-    importpath = "github.com/bio-routing/bio-rd/fuzzing/packet",
-    visibility = ["//visibility:private"],
-)
-
-go_binary(
-    name = "packet",
-    embed = [":go_default_library"],
-    visibility = ["//visibility:public"],
-)

net/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "ip.go",
-        "prefix.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/net",
-    visibility = ["//visibility:public"],
-    deps = ["//net/api:go_default_library"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "ip_test.go",
-        "prefix_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//net/api:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-    ],
-)

net/api/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library")
-
-proto_library(
-    name = "api_proto",
-    srcs = ["net.proto"],
-    visibility = ["//visibility:public"],
-)
-
-go_proto_library(
-    name = "api_go_proto",
-    importpath = "github.com/bio-routing/bio-rd/net/api",
-    proto = ":api_proto",
-    visibility = ["//visibility:public"],
-)
-
-go_library(
-    name = "go_default_library",
-    embed = [":api_go_proto"],
-    importpath = "github.com/bio-routing/bio-rd/net/api",
-    visibility = ["//visibility:public"],
-)

net/prefix_test.go

@@ -182,7 +182,7 @@ func TestAddr(t *testing.T) {
 	for _, test := range tests {
 		res := test.pfx.Addr()
 		if res != test.expected {
-			t.Errorf("Unexpected result for test %s: Got %d Expected %d", test.name, res, test.expected)
+			t.Errorf("Unexpected result for test %s: Got %v Expected %v", test.name, res, test.expected)
 		}
 	}
 }

protocols/bgp/packet/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "bgp.go",
-        "decode_options.go",
-        "decoder.go",
-        "encode_options.go",
-        "encoder.go",
-        "helper.go",
-        "mp_reach_nlri.go",
-        "mp_unreach_nlri.go",
-        "nlri.go",
-        "parameters.go",
-        "path_attribute_flags.go",
-        "path_attributes.go",
-        "update.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/bgp/packet",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//net:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//route:go_default_library",
-        "//util/decode:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "decoder_test.go",
-        "encoder_test.go",
-        "mp_reach_nlri_test.go",
-        "mp_unreach_nlri_test.go",
-        "nlri_test.go",
-        "path_attributes_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//net:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)

protocols/bgp/server/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "bmp_router.go",
-        "bmp_server.go",
-        "fake_conn.go",
-        "fsm.go",
-        "fsm_active.go",
-        "fsm_address_family.go",
-        "fsm_cease.go",
-        "fsm_connect.go",
-        "fsm_established.go",
-        "fsm_idle.go",
-        "fsm_manager.go",
-        "fsm_open_confirm.go",
-        "fsm_open_sent.go",
-        "peer.go",
-        "server.go",
-        "sockopt.go",
-        "tcplistener.go",
-        "update_helper.go",
-        "update_sender.go",
-        "util.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/bgp/server",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//config:go_default_library",
-        "//net:go_default_library",
-        "//protocols/bgp/packet:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//protocols/bmp/packet:go_default_library",
-        "//route:go_default_library",
-        "//routingtable:go_default_library",
-        "//routingtable/adjRIBIn:go_default_library",
-        "//routingtable/adjRIBOut:go_default_library",
-        "//routingtable/filter:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "bmp_router_test.go",
-        "bmp_server_test.go",
-        "fsm_address_family_test.go",
-        "fsm_open_sent_test.go",
-        "fsm_test.go",
-        "server_test.go",
-        "update_helper_test.go",
-        "update_sender_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//config:go_default_library",
-        "//net:go_default_library",
-        "//protocols/bgp/packet:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//protocols/bmp/packet:go_default_library",
-        "//route:go_default_library",
-        "//routingtable:go_default_library",
-        "//routingtable/adjRIBIn:go_default_library",
-        "//routingtable/filter:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//testing:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-    ],
-)

protocols/bgp/types/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "aggregator.go",
-        "as_path.go",
-        "community.go",
-        "large_community.go",
-        "unknown_attribute.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/bgp/types",
-    visibility = ["//visibility:public"],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "community_test.go",
-        "large_community_benchmark_test.go",
-        "large_community_test.go",
-        "unknown_attrinute_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = ["//vendor/github.com/stretchr/testify/assert:go_default_library"],
-)

protocols/bmp/packet/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "common_header.go",
-        "decode.go",
-        "information_tlv.go",
-        "initiation_message.go",
-        "peer_down.go",
-        "peer_up.go",
-        "per_peer_header.go",
-        "route_mirroring.go",
-        "route_monitoring.go",
-        "stats_report.go",
-        "termination_message.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/bmp/packet",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//util/decoder:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "common_header_test.go",
-        "decode_test.go",
-        "information_tlv_test.go",
-        "initiation_message_test.go",
-        "peer_down_test.go",
-        "peer_up_test.go",
-        "per_peer_header_test.go",
-        "route_mirroring_test.go",
-        "route_monitoring_test.go",
-        "stats_report_test.go",
-        "termination_message_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = ["//vendor/github.com/stretchr/testify/assert:go_default_library"],
-)

protocols/bmp/server/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "router.go",
-        "server.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/bmp/server",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//protocols/bgp/packet:go_default_library",
-        "//protocols/bmp/packet:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)

protocols/isis/packet/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "csnp.go",
-        "header.go",
-        "hello.go",
-        "isis.go",
-        "lsp.go",
-        "lsp_entry.go",
-        "psnp.go",
-        "tlv.go",
-        "tlv_area_addresses.go",
-        "tlv_authentication.go",
-        "tlv_checksum.go",
-        "tlv_dynamic_hostname.go",
-        "tlv_extended_ip_reachability.go",
-        "tlv_extended_is_reachability.go",
-        "tlv_ip_interface_address.go",
-        "tlv_is_neighbors.go",
-        "tlv_is_reachability.go",
-        "tlv_p2p_adj_state.go",
-        "tlv_padding.go",
-        "tlv_protocols_supported.go",
-        "tlv_unknown.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/isis/packet",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//protocols/isis/types:go_default_library",
-        "//util/decode:go_default_library",
-        "//util/math:go_default_library",
-        "//vendor/github.com/FMNSSun/libhash/fletcher:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "csnp_test.go",
-        "header_test.go",
-        "hello_test.go",
-        "isis_test.go",
-        "lsp_test.go",
-        "psnp_test.go",
-        "tlv_area_addresses_test.go",
-        "tlv_checksum_test.go",
-        "tlv_dynamic_hostname_test.go",
-        "tlv_ip_interface_address_test.go",
-        "tlv_is_neighbors_test.go",
-        "tlv_p2p_adj_state_test.go",
-        "tlv_padding_test.go",
-        "tlv_protocols_supported_test.go",
-        "tlv_unknown_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//protocols/isis/types:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-    ],
-)

protocols/isis/types/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = ["isis.go"],
-    importpath = "github.com/bio-routing/bio-rd/protocols/isis/types",
-    visibility = ["//visibility:public"],
-)

protocols/netlink/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "netlink.go",
-        "netlink_reader.go",
-        "netlink_writer.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/protocols/netlink",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//config:go_default_library",
-        "//net:go_default_library",
-        "//route:go_default_library",
-        "//routingtable:go_default_library",
-        "//routingtable/filter:go_default_library",
-        "//routingtable/locRIB:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-        "//vendor/github.com/vishvananda/netlink:go_default_library",
-    ],
-)

route/BUILD.bazel

-load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
-
-go_library(
-    name = "go_default_library",
-    srcs = [
-        "bgp_path.go",
-        "bgp_path_manager.go",
-        "netlink_path.go",
-        "path.go",
-        "route.go",
-        "static.go",
-    ],
-    importpath = "github.com/bio-routing/bio-rd/route",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//net:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//vendor/github.com/sirupsen/logrus:go_default_library",
-        "//vendor/github.com/taktv6/tflow2/convert:go_default_library",
-        "//vendor/github.com/vishvananda/netlink:go_default_library",
-    ],
-)
-
-go_test(
-    name = "go_default_test",
-    srcs = [
-        "bgp_path_test.go",
-        "bgp_test.go",
-        "path_test.go",
-        "route_test.go",
-    ],
-    embed = [":go_default_library"],
-    deps = [
-        "//net:go_default_library",
-        "//protocols/bgp/types:go_default_library",
-        "//vendor/github.com/stretchr/testify/assert:go_default_library",
-        "//vendor/github.com/vishvananda/netlink:go_default_library",
-    ],
-)