Skip to content

Commit

Permalink
build(deps): Switch cn-infra to vanity import path (#1620)
Browse files Browse the repository at this point in the history 
Signed-off-by: Ondrej Fabry <ofabry@cisco.com>
  • Loading branch information
@ondrej-fabry
ondrej-fabry committed Feb 11, 2020
1 parent 4cdeef6 commit f7d1246
Show file tree
Hide file tree
Showing 331 changed files with 711 additions and 579 deletions.
6 changes: 3 additions & 3 deletions client/local_client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"context"

"github.com/golang/protobuf/proto"
"github.com/ligato/cn-infra/datasync/kvdbsync/local"
"github.com/ligato/cn-infra/datasync/syncbase"
"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync/local"
"go.ligato.io/cn-infra/v2/datasync/syncbase"
"go.ligato.io/cn-infra/v2/db/keyval"

"go.ligato.io/vpp-agent/v3/pkg/models"
orch "go.ligato.io/vpp-agent/v3/plugins/orchestrator"
Expand Down
2 changes: 1 addition & 1 deletion clientv2/linux/dbadapter/data_change_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package dbadapter

import (
"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

linuxclient "go.ligato.io/vpp-agent/v3/clientv2/linux"
vppclient "go.ligato.io/vpp-agent/v3/clientv2/vpp"
Expand Down
2 changes: 1 addition & 1 deletion clientv2/linux/dbadapter/data_resync_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package dbadapter

import (
"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

linuxclient "go.ligato.io/vpp-agent/v3/clientv2/linux"
vppclient "go.ligato.io/vpp-agent/v3/clientv2/vpp"
Expand Down
3 changes: 2 additions & 1 deletion clientv2/linux/localclient/localclient_api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
package localclient

import (
"github.com/ligato/cn-infra/datasync/kvdbsync/local"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync/local"

linuxclient "go.ligato.io/vpp-agent/v3/clientv2/linux"
"go.ligato.io/vpp-agent/v3/clientv2/linux/dbadapter"
)
Expand Down
3 changes: 2 additions & 1 deletion clientv2/linux/remoteclient/remoteclient_api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
package remoteclient

import (
"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

"go.ligato.io/vpp-agent/v3/clientv2/linux"
"go.ligato.io/vpp-agent/v3/clientv2/linux/dbadapter"
)
Expand Down
3 changes: 2 additions & 1 deletion clientv2/vpp/dbadapter/data_change_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package dbadapter
import (
"context"

"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

"go.ligato.io/vpp-agent/v3/pkg/models"

vppclient "go.ligato.io/vpp-agent/v3/clientv2/vpp"
Expand Down
3 changes: 2 additions & 1 deletion clientv2/vpp/dbadapter/data_resync_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ package dbadapter
import (
"context"

"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

"go.ligato.io/vpp-agent/v3/pkg/models"

vppclient "go.ligato.io/vpp-agent/v3/clientv2/vpp"
Expand Down
2 changes: 1 addition & 1 deletion clientv2/vpp/localclient/localclient_api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
package localclient

import (
"github.com/ligato/cn-infra/datasync/kvdbsync/local"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync/local"

vppclient "go.ligato.io/vpp-agent/v3/clientv2/vpp"
"go.ligato.io/vpp-agent/v3/clientv2/vpp/dbadapter"
Expand Down
3 changes: 2 additions & 1 deletion clientv2/vpp/remoteclient/remoteclient_api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
package remoteclient

import (
"github.com/ligato/cn-infra/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval"

"go.ligato.io/vpp-agent/v3/clientv2/vpp"
"go.ligato.io/vpp-agent/v3/clientv2/vpp/dbadapter"
//"github.com/ligato/vpp-agent/clientv2/vpp/grpcadapter"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/cli/cli.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/docker/cli/cli/streams"
"github.com/docker/docker/pkg/term"

"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/api"
"go.ligato.io/vpp-agent/v3/cmd/agentctl/client"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/cli/config.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"strings"
"time"

"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/logging"
)

const (
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/cli/flags.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import (
"github.com/spf13/pflag"
"github.com/spf13/viper"

"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/client"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/cli/viper.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (
"github.com/mitchellh/mapstructure"
"github.com/spf13/viper"

"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/logging"
)

// viperSetConfigFile setups viper to handle config file.
Expand Down
4 changes: 2 additions & 2 deletions cmd/agentctl/client/api.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"google.golang.org/grpc"

"github.com/ligato/cn-infra/db/keyval"
"github.com/ligato/cn-infra/health/probe"
"go.ligato.io/cn-infra/v2/db/keyval"
"go.ligato.io/cn-infra/v2/health/probe"

"go.ligato.io/vpp-agent/v3/client"
"go.ligato.io/vpp-agent/v3/cmd/agentctl/api/types"
Expand Down
8 changes: 4 additions & 4 deletions cmd/agentctl/client/client.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,10 +31,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/credentials"

"github.com/ligato/cn-infra/db/keyval"
"github.com/ligato/cn-infra/db/keyval/etcd"
"github.com/ligato/cn-infra/logging"
"github.com/ligato/cn-infra/logging/logrus"
"go.ligato.io/cn-infra/v2/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval/etcd"
"go.ligato.io/cn-infra/v2/logging"
"go.ligato.io/cn-infra/v2/logging/logrus"

"go.ligato.io/vpp-agent/v3/client"
"go.ligato.io/vpp-agent/v3/client/remoteclient"
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/client/infra.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ import (
"fmt"
"path"

"github.com/ligato/cn-infra/health/probe"
"github.com/sirupsen/logrus"
"go.ligato.io/cn-infra/v2/health/probe"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/api/types"
)
Expand Down
10 changes: 5 additions & 5 deletions cmd/agentctl/client/kvdb.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,11 @@ import (
"path"
"strings"

"github.com/ligato/cn-infra/datasync"
"github.com/ligato/cn-infra/db/keyval"
"github.com/ligato/cn-infra/db/keyval/kvproto"
"github.com/ligato/cn-infra/logging"
"github.com/ligato/cn-infra/servicelabel"
"go.ligato.io/cn-infra/v2/datasync"
"go.ligato.io/cn-infra/v2/db/keyval"
"go.ligato.io/cn-infra/v2/db/keyval/kvproto"
"go.ligato.io/cn-infra/v2/logging"
"go.ligato.io/cn-infra/v2/servicelabel"
)

// KVDBClient provides client access to the KVDB server.
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/commands/commands.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"fmt"
"os"

"github.com/ligato/cn-infra/logging"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/cli"
)
Expand Down
2 changes: 1 addition & 1 deletion cmd/agentctl/commands/dump.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import (
"text/tabwriter"

"github.com/golang/protobuf/proto"
"github.com/ligato/cn-infra/logging"
"github.com/spf13/cobra"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/api/types"
agentcli "go.ligato.io/vpp-agent/v3/cmd/agentctl/cli"
Expand Down
4 changes: 2 additions & 2 deletions cmd/agentctl/commands/import.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ import (

"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/ligato/cn-infra/logging"
"github.com/ligato/cn-infra/servicelabel"
"github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"go.ligato.io/cn-infra/v2/logging"
"go.ligato.io/cn-infra/v2/servicelabel"

agentcli "go.ligato.io/vpp-agent/v3/cmd/agentctl/cli"
"go.ligato.io/vpp-agent/v3/pkg/models"
Expand Down
4 changes: 2 additions & 2 deletions cmd/agentctl/commands/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (
"github.com/spf13/cobra"
"github.com/spf13/pflag"

"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/agentctl/cli"
"go.ligato.io/vpp-agent/v3/pkg/debug"
Expand Down
4 changes: 2 additions & 2 deletions cmd/vpp-agent-init/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
package main

import (
"github.com/ligato/cn-infra/agent"
sv "github.com/ligato/cn-infra/exec/supervisor"
"go.ligato.io/cn-infra/v2/agent"
sv "go.ligato.io/cn-infra/v2/exec/supervisor"
)

func main() {
Expand Down
26 changes: 13 additions & 13 deletions cmd/vpp-agent/app/vpp_agent.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
package app

import (
"github.com/ligato/cn-infra/datasync"
"github.com/ligato/cn-infra/datasync/kvdbsync"
"github.com/ligato/cn-infra/datasync/kvdbsync/local"
"github.com/ligato/cn-infra/datasync/msgsync"
"github.com/ligato/cn-infra/datasync/resync"
"github.com/ligato/cn-infra/db/keyval/consul"
"github.com/ligato/cn-infra/db/keyval/etcd"
"github.com/ligato/cn-infra/db/keyval/redis"
"github.com/ligato/cn-infra/health/probe"
"github.com/ligato/cn-infra/health/statuscheck"
"github.com/ligato/cn-infra/infra"
"github.com/ligato/cn-infra/logging/logmanager"
"github.com/ligato/cn-infra/messaging/kafka"
"go.ligato.io/cn-infra/v2/datasync"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync/local"
"go.ligato.io/cn-infra/v2/datasync/msgsync"
"go.ligato.io/cn-infra/v2/datasync/resync"
"go.ligato.io/cn-infra/v2/db/keyval/consul"
"go.ligato.io/cn-infra/v2/db/keyval/etcd"
"go.ligato.io/cn-infra/v2/db/keyval/redis"
"go.ligato.io/cn-infra/v2/health/probe"
"go.ligato.io/cn-infra/v2/health/statuscheck"
"go.ligato.io/cn-infra/v2/infra"
"go.ligato.io/cn-infra/v2/logging/logmanager"
"go.ligato.io/cn-infra/v2/messaging/kafka"

"go.ligato.io/vpp-agent/v3/plugins/configurator"
linux_ifplugin "go.ligato.io/vpp-agent/v3/plugins/linux/ifplugin"
Expand Down
8 changes: 4 additions & 4 deletions cmd/vpp-agent/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"os"
"time"

"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/datasync/kvdbsync"
"github.com/ligato/cn-infra/datasync/resync"
"github.com/ligato/cn-infra/logging"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/datasync/kvdbsync"
"go.ligato.io/cn-infra/v2/datasync/resync"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/cmd/vpp-agent/app"
"go.ligato.io/vpp-agent/v3/pkg/debug"
Expand Down
6 changes: 3 additions & 3 deletions examples/custom_model/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@ import (
"time"

"github.com/golang/protobuf/proto"
"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/infra"
"github.com/ligato/cn-infra/logging/logrus"
"github.com/namsral/flag"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/infra"
"go.ligato.io/cn-infra/v2/logging/logrus"
"google.golang.org/grpc"

"go.ligato.io/vpp-agent/v3/client"
Expand Down
9 changes: 5 additions & 4 deletions examples/govpp_call/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@ import (
"time"

govppapi "git.fd.io/govpp.git/api"
"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/logging"
"github.com/ligato/cn-infra/logging/logrus"
"github.com/ligato/cn-infra/utils/safeclose"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/logging"
"go.ligato.io/cn-infra/v2/logging/logrus"
"go.ligato.io/cn-infra/v2/utils/safeclose"

"go.ligato.io/vpp-agent/v3/cmd/vpp-agent/app"
"go.ligato.io/vpp-agent/v3/plugins/govppmux"
l2Api "go.ligato.io/vpp-agent/v3/plugins/vpp/binapi/vpp1908/l2"
Expand Down
6 changes: 3 additions & 3 deletions examples/grpc_vpp/notifications/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@ import (
"net"
"time"

"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/infra"
"github.com/ligato/cn-infra/logging/logrus"
"github.com/namsral/flag"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/infra"
"go.ligato.io/cn-infra/v2/logging/logrus"
"golang.org/x/net/context"
"google.golang.org/grpc"

Expand Down
6 changes: 3 additions & 3 deletions examples/grpc_vpp/remote_client/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (

"github.com/golang/protobuf/jsonpb"
"github.com/golang/protobuf/proto"
"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/infra"
"github.com/ligato/cn-infra/logging/logrus"
"github.com/namsral/flag"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/infra"
"go.ligato.io/cn-infra/v2/logging/logrus"
"google.golang.org/grpc"

"go.ligato.io/vpp-agent/v3/proto/ligato/configurator"
Expand Down
4 changes: 2 additions & 2 deletions examples/grpc_vpp/stats_poller/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"net"
"time"

"github.com/ligato/cn-infra/agent"
"github.com/ligato/cn-infra/infra"
"github.com/namsral/flag"
"go.ligato.io/cn-infra/v2/agent"
"go.ligato.io/cn-infra/v2/infra"
"golang.org/x/net/context"
"google.golang.org/grpc"

Expand Down
2 changes: 1 addition & 1 deletion examples/kvscheduler/acl/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"time"

"github.com/ligato/cn-infra/agent"
"go.ligato.io/cn-infra/v2/agent"

"go.ligato.io/vpp-agent/v3/clientv2/vpp/localclient"
"go.ligato.io/vpp-agent/v3/plugins/orchestrator"
Expand Down
2 changes: 1 addition & 1 deletion examples/kvscheduler/interconnect/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"time"

"github.com/ligato/cn-infra/agent"
"go.ligato.io/cn-infra/v2/agent"

"go.ligato.io/vpp-agent/v3/clientv2/linux/localclient"
linux_ifplugin "go.ligato.io/vpp-agent/v3/plugins/linux/ifplugin"
Expand Down
2 changes: 1 addition & 1 deletion examples/kvscheduler/l2/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"log"
"time"

"github.com/ligato/cn-infra/agent"
"go.ligato.io/cn-infra/v2/agent"

"go.ligato.io/vpp-agent/v3/clientv2/linux/localclient"
linux_ifplugin "go.ligato.io/vpp-agent/v3/plugins/linux/ifplugin"
Expand Down
4 changes: 2 additions & 2 deletions examples/kvscheduler/mock_plugins/ifplugin/descriptor/interface.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ import (
"net"
"strings"

"github.com/ligato/cn-infra/idxmap"
"github.com/ligato/cn-infra/logging"
"github.com/pkg/errors"
"go.ligato.io/cn-infra/v2/idxmap"
"go.ligato.io/cn-infra/v2/logging"

"go.ligato.io/vpp-agent/v3/examples/kvscheduler/mock_plugins/ifplugin/descriptor/adapter"
"go.ligato.io/vpp-agent/v3/examples/kvscheduler/mock_plugins/ifplugin/mockcalls"
Expand Down

0 comments on commit f7d1246

Please sign in to comment.