Skip to content

Commit

Permalink
Adopting new import paths
Browse files Browse the repository at this point in the history
  • Loading branch information
Oliver Herms committed Sep 9, 2018
1 parent 9fa30e7 commit fc0970b
Show file tree
Hide file tree
Showing 29 changed files with 87 additions and 88 deletions.
9 changes: 4 additions & 5 deletions annotation/annotation.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,10 @@ import (
"context"
"sync/atomic"

"github.com/taktv6/tflow2/annotation/bird"
"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/stats"

"github.com/bio-routing/tflow2/annotation/bird"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/stats"
"github.com/golang/glog"
"google.golang.org/grpc"
)
Expand Down
4 changes: 2 additions & 2 deletions annotation/annotation_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ package annotation
import (
"testing"

"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/netflow"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/netflow"
)

func TestTimestampAggr(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions annotation/bird/bird.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"sync"
"sync/atomic"

"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/stats"
"github.com/golang/glog"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/stats"
)

// QueryResult carries all useful information we extracted from a BIRD querys result
Expand Down
8 changes: 4 additions & 4 deletions database/breakdown.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ import (
"net"

"github.com/golang/glog"
"github.com/taktv6/tflow2/avltree"
"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/intfmapper"
"github.com/taktv6/tflow2/netflow"
"github.com/bio-routing/tflow2/avltree"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/intfmapper"
"github.com/bio-routing/tflow2/netflow"
)

// BreakdownKey is the key used for the brakedown map
Expand Down
10 changes: 5 additions & 5 deletions database/database.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ import (
"time"
"unsafe"

"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/intfmapper"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/intfmapper"

"github.com/golang/glog"
"github.com/golang/protobuf/proto"
"github.com/taktv6/tflow2/avltree"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/nfserver"
"github.com/bio-routing/tflow2/avltree"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/nfserver"
)

// FlowsByTimeRtr holds all keys (and thus is the only way) to our flows
Expand Down
10 changes: 5 additions & 5 deletions database/database_query.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ import (

"github.com/golang/glog"
"github.com/golang/protobuf/proto"
"github.com/taktv6/tflow2/avltree"
"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/intfmapper"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/stats"
"github.com/bio-routing/tflow2/avltree"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/intfmapper"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/stats"
)

// These constants are used in communication with the frontend
Expand Down
8 changes: 4 additions & 4 deletions database/database_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ import (

"github.com/stretchr/testify/assert"

"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/intfmapper"
"github.com/taktv6/tflow2/netflow"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/intfmapper"
"github.com/bio-routing/tflow2/netflow"
)

type intfMapper struct {
Expand Down
4 changes: 2 additions & 2 deletions database/map_tree.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"net"
"sync"

"github.com/taktv6/tflow2/avltree"
"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/avltree"
"github.com/bio-routing/tflow2/convert"
)

type mapTree struct {
Expand Down
8 changes: 4 additions & 4 deletions database/time_group.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ import (
"net"

"github.com/golang/glog"
"github.com/taktv6/tflow2/avltree"
"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/intfmapper"
"github.com/bio-routing/tflow2/avltree"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/intfmapper"
)

// TimeGroup groups all indices to flows of a particular router at a particular
Expand Down
10 changes: 5 additions & 5 deletions frontend/frontend.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ import (
"strings"

"github.com/golang/glog"
"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/database"
"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/intfmapper"
"github.com/taktv6/tflow2/stats"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/database"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/intfmapper"
"github.com/bio-routing/tflow2/stats"
)

// Frontend represents the web interface
Expand Down
4 changes: 2 additions & 2 deletions frontend/prometheus.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"net/http"

"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/database"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/database"
)

func (fe *Frontend) prometheusHandler(w http.ResponseWriter, r *http.Request) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/prometheus_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/taktv6/tflow2/database"
"github.com/bio-routing/tflow2/database"
)

func TestFormatBreakdownKey(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions frontend/translate.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"strconv"
"strings"

"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/database"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/database"
)

func (fe *Frontend) translateCondition(field, value string) (*database.Condition, error) {
Expand Down
2 changes: 1 addition & 1 deletion frontend/translate_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/stretchr/testify/assert"
"github.com/taktv6/tflow2/database"
"github.com/bio-routing/tflow2/database"
)

func TestTranslateCondition(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions ifserver/ifserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ import (
"sync/atomic"

"github.com/golang/glog"
"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/ipfix"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/srcache"
"github.com/taktv6/tflow2/stats"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/ipfix"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/srcache"
"github.com/bio-routing/tflow2/stats"
)

// fieldMap describes what information is at what index in the slice
Expand Down
2 changes: 1 addition & 1 deletion ifserver/template_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package ifserver
import (
"sync"

"github.com/taktv6/tflow2/ipfix"
"github.com/bio-routing/tflow2/ipfix"
)

type templateCache struct {
Expand Down
2 changes: 1 addition & 1 deletion intfmapper/intfmapper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"time"

"github.com/golang/glog"
"github.com/taktv6/tflow2/config"
"github.com/bio-routing/tflow2/config"

g "github.com/soniah/gosnmp"
)
Expand Down
2 changes: 1 addition & 1 deletion ipfix/decode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"net"
"unsafe"

"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion nf9/decode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"net"
"unsafe"

"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion nf9/decode_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"net"
"testing"

"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

/*func TestDecode(t *testing.T) {
Expand Down
12 changes: 6 additions & 6 deletions nfserver/nfserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ import (
"sync"
"sync/atomic"

"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/srcache"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/srcache"

"github.com/golang/glog"
"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/nf9"
"github.com/taktv6/tflow2/stats"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/nf9"
"github.com/bio-routing/tflow2/stats"
)

// fieldMap describes what information is at what index in the slice
Expand Down
2 changes: 1 addition & 1 deletion nfserver/template_cache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ package nfserver
import (
"sync"

"github.com/taktv6/tflow2/nf9"
"github.com/bio-routing/tflow2/nf9"
)

type templateCache struct {
Expand Down
2 changes: 1 addition & 1 deletion packet/ethernet.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import (
"net"
"unsafe"

"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sflow/decode.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import (
"unsafe"

"github.com/golang/glog"
"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion sflow/decode_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import (
"net"
"testing"

"github.com/taktv6/tflow2/convert"
"github.com/bio-routing/tflow2/convert"
)

func TestDecode(t *testing.T) {
Expand Down
14 changes: 7 additions & 7 deletions sfserver/sfserver.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ import (
"unsafe"

"github.com/golang/glog"
"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/packet"
"github.com/taktv6/tflow2/sflow"
"github.com/taktv6/tflow2/srcache"
"github.com/taktv6/tflow2/stats"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/packet"
"github.com/bio-routing/tflow2/sflow"
"github.com/bio-routing/tflow2/srcache"
"github.com/bio-routing/tflow2/stats"
)

// SflowServer represents a sflow Collector instance
Expand Down
6 changes: 3 additions & 3 deletions sfserver/sfserver_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (

"github.com/golang/glog"

"github.com/taktv6/tflow2/convert"
"github.com/taktv6/tflow2/packet"
"github.com/taktv6/tflow2/sflow"
"github.com/bio-routing/tflow2/convert"
"github.com/bio-routing/tflow2/packet"
"github.com/bio-routing/tflow2/sflow"
)

func TestIntegration(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion srcache/srcache.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"net"
"sync"

"github.com/taktv6/tflow2/config"
"github.com/bio-routing/tflow2/config"
)

// SamplerateCache caches information about samplerates
Expand Down
24 changes: 12 additions & 12 deletions tflow2.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ import (
"runtime"
"sync"

"github.com/bio-routing/tflow2/annotation"
"github.com/bio-routing/tflow2/config"
"github.com/bio-routing/tflow2/database"
"github.com/bio-routing/tflow2/frontend"
"github.com/bio-routing/tflow2/iana"
"github.com/bio-routing/tflow2/ifserver"
"github.com/bio-routing/tflow2/intfmapper"
"github.com/bio-routing/tflow2/netflow"
"github.com/bio-routing/tflow2/nfserver"
"github.com/bio-routing/tflow2/sfserver"
"github.com/bio-routing/tflow2/srcache"
"github.com/bio-routing/tflow2/stats"
"github.com/golang/glog"
"github.com/taktv6/tflow2/annotation"
"github.com/taktv6/tflow2/config"
"github.com/taktv6/tflow2/database"
"github.com/taktv6/tflow2/frontend"
"github.com/taktv6/tflow2/iana"
"github.com/taktv6/tflow2/ifserver"
"github.com/taktv6/tflow2/intfmapper"
"github.com/taktv6/tflow2/netflow"
"github.com/taktv6/tflow2/nfserver"
"github.com/taktv6/tflow2/sfserver"
"github.com/taktv6/tflow2/srcache"
"github.com/taktv6/tflow2/stats"
)

var (
Expand Down

0 comments on commit fc0970b

Please sign in to comment.