Skip to content

Commit

Permalink
Merge pull request #159 from openconfig/import
Browse files Browse the repository at this point in the history 
Move imports to openconfig/kne
  • Loading branch information
@alexmasi
alexmasi authored Jun 29, 2022
2 parents 7d3a118 + 9d85e78 commit afffb61
Show file tree
Hide file tree
Showing 34 changed files with 81 additions and 81 deletions.
4 changes: 2 additions & 2 deletions api/clientset/v1beta1/fake/fake.go
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package fake

import (
toplogyv1client "github.com/google/kne/api/clientset/v1beta1"
topologyv1 "github.com/google/kne/api/types/v1beta1"
toplogyv1client "github.com/openconfig/kne/api/clientset/v1beta1"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
"k8s.io/apimachinery/pkg/runtime"
dfake "k8s.io/client-go/dynamic/fake"
"k8s.io/client-go/kubernetes/scheme"
Expand Down
2 changes: 1 addition & 1 deletion api/clientset/v1beta1/topology.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"k8s.io/client-go/kubernetes/scheme"
"k8s.io/client-go/rest"

topologyv1 "github.com/google/kne/api/types/v1beta1"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
)

// TopologyInterface provides access to the Topology CRD.
Expand Down
2 changes: 1 addition & 1 deletion api/clientset/v1beta1/topology_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"reflect"
"testing"

topologyv1 "github.com/google/kne/api/types/v1beta1"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
"github.com/h-fam/errdiff"
"github.com/kr/pretty"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
Expand Down
2 changes: 1 addition & 1 deletion cmd/deploy/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"os/exec"
"path/filepath"

"github.com/google/kne/deploy"
"github.com/openconfig/kne/deploy"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
"gopkg.in/yaml.v3"
Expand Down
6 changes: 3 additions & 3 deletions cmd/root.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"path/filepath"
"time"

"github.com/google/kne/cmd/deploy"
"github.com/google/kne/cmd/topology"
"github.com/google/kne/topo"
"github.com/openconfig/kne/cmd/deploy"
"github.com/openconfig/kne/cmd/topology"
"github.com/openconfig/kne/topo"
"github.com/kr/pretty"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
6 changes: 3 additions & 3 deletions cmd/topology/topology.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ import (
"os"
"path/filepath"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo"
"github.com/openconfig/kne/topo/node"
"github.com/openconfig/gnmi/errlist"
log "github.com/sirupsen/logrus"
"github.com/spf13/cobra"
Expand Down
10 changes: 5 additions & 5 deletions cmd/topology/topology_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ import (
"path/filepath"
"testing"

tfake "github.com/google/kne/api/clientset/v1beta1/fake"
cpb "github.com/google/kne/proto/controller"
tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo"
"github.com/google/kne/topo/node"
tfake "github.com/openconfig/kne/api/clientset/v1beta1/fake"
cpb "github.com/openconfig/kne/proto/controller"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"
Expand Down
8 changes: 4 additions & 4 deletions controller/server/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@ import (
"time"

log "github.com/golang/glog"
"github.com/google/kne/deploy"
cpb "github.com/google/kne/proto/controller"
tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo"
"github.com/openconfig/kne/deploy"
cpb "github.com/openconfig/kne/proto/controller"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials/alts"
Expand Down
4 changes: 2 additions & 2 deletions controller/server/main_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/google/go-cmp/cmp"
"github.com/google/go-cmp/cmp/cmpopts"
"github.com/google/kne/deploy"
cpb "github.com/google/kne/proto/controller"
"github.com/openconfig/kne/deploy"
cpb "github.com/openconfig/kne/proto/controller"
"github.com/h-fam/errdiff"
)

Expand Down
2 changes: 1 addition & 1 deletion deploy/deploy.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (

dtypes "github.com/docker/docker/api/types"
dclient "github.com/docker/docker/client"
kexec "github.com/google/kne/os/exec"
kexec "github.com/openconfig/kne/os/exec"
"github.com/openconfig/gnmi/errlist"
log "github.com/sirupsen/logrus"
"gopkg.in/yaml.v3"
Expand Down
4 changes: 2 additions & 2 deletions deploy/deploy_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
dtypes "github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network"
"github.com/golang/mock/gomock"
"github.com/google/kne/deploy/mocks"
"github.com/google/kne/os/exec"
"github.com/openconfig/kne/deploy/mocks"
"github.com/openconfig/kne/os/exec"
"github.com/h-fam/errdiff"
"github.com/kylelemons/godebug/diff"
"github.com/pkg/errors"
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/google/kne
module github.com/openconfig/kne

go 1.18

Expand Down
2 changes: 1 addition & 1 deletion kne_cli/main.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import (
"context"
"os"

"github.com/google/kne/cmd"
"github.com/openconfig/kne/cmd"
)

func main() {
Expand Down
2 changes: 1 addition & 1 deletion proto/controller.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ package controller;

import "topo.proto";

option go_package = "github.com/google/kne/proto/controller";
option go_package = "github.com/openconfig/kne/proto/controller";

// Topology manager service definition.
service TopologyManager {
Expand Down
2 changes: 1 addition & 1 deletion proto/controller/controller.pb.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion proto/topo.proto
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ syntax = "proto3";

package topo;

option go_package = "github.com/google/kne/proto/topo";
option go_package = "github.com/openconfig/kne/proto/topo";

// Topology message defines what nodes and links will be created
// inside the mesh.
Expand Down
4 changes: 2 additions & 2 deletions topo/node/ceos/ceos.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import (
"strings"
"time"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplicore "github.com/scrapli/scrapligo/driver/core"
scraplinetwork "github.com/scrapli/scrapligo/driver/network"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/ceos/ceos_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

topopb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topopb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplicore "github.com/scrapli/scrapligo/driver/core"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/cisco/cisco.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@ import (
"sort"
"strconv"

"github.com/google/kne/topo/node"
"github.com/openconfig/kne/topo/node"
log "github.com/sirupsen/logrus"
corev1 "k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/utils/pointer"

tpb "github.com/google/kne/proto/topo"
tpb "github.com/openconfig/kne/proto/topo"
)

func New(nodeImpl *node.Impl) (node.Node, error) {
Expand Down
4 changes: 2 additions & 2 deletions topo/node/cisco/cisco_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,13 @@ import (
"testing"

"github.com/google/go-cmp/cmp"
"github.com/google/kne/topo/node"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
"google.golang.org/protobuf/testing/protocmp"
"k8s.io/apimachinery/pkg/watch"
"k8s.io/client-go/kubernetes/fake"

tpb "github.com/google/kne/proto/topo"
tpb "github.com/openconfig/kne/proto/topo"
)

type fakeWatch struct {
Expand Down
4 changes: 2 additions & 2 deletions topo/node/cptx/cptx.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"strings"
"time"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
scraplicfg "github.com/scrapli/scrapligo/cfg"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplicore "github.com/scrapli/scrapligo/driver/core"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/cptx/cptx_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"time"

"github.com/google/go-cmp/cmp"
tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplicore "github.com/scrapli/scrapligo/driver/core"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/gobgp/gobgp.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package gobgp
import (
"fmt"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
)

func New(nodeImpl *node.Impl) (node.Node, error) {
Expand Down
4 changes: 2 additions & 2 deletions topo/node/gobgp/gobgp_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"

topopb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topopb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
)

Expand Down
4 changes: 2 additions & 2 deletions topo/node/host/host.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ package host
import (
"fmt"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
)

func New(nodeImpl *node.Impl) (node.Node, error) {
Expand Down
4 changes: 2 additions & 2 deletions topo/node/host/host_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"testing"

topopb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topopb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"
Expand Down
6 changes: 3 additions & 3 deletions topo/node/ixia/ixia.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"

topologyv1 "github.com/google/kne/api/types/v1beta1"
tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
)

var ixiaResource = "Ixiatgs"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/ixia/ixia_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package ixia
import (
"testing"

tpb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
tpb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
"google.golang.org/protobuf/encoding/prototext"
"google.golang.org/protobuf/proto"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/node.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"k8s.io/client-go/tools/remotecommand"
"k8s.io/utils/pointer"

topologyv1 "github.com/google/kne/api/types/v1beta1"
tpb "github.com/google/kne/proto/topo"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
tpb "github.com/openconfig/kne/proto/topo"
)

type Interface interface {
Expand Down
2 changes: 1 addition & 1 deletion topo/node/node_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

topopb "github.com/google/kne/proto/topo"
topopb "github.com/openconfig/kne/proto/topo"
)

func NewNR(impl *Impl) (Node, error) {
Expand Down
4 changes: 2 additions & 2 deletions topo/node/srl/srl.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"fmt"
"time"

topopb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topopb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplinetwork "github.com/scrapli/scrapligo/driver/network"
scraplitransport "github.com/scrapli/scrapligo/transport"
Expand Down
4 changes: 2 additions & 2 deletions topo/node/srl/srl_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ import (
"testing"
"time"

topopb "github.com/google/kne/proto/topo"
"github.com/google/kne/topo/node"
topopb "github.com/openconfig/kne/proto/topo"
"github.com/openconfig/kne/topo/node"
"github.com/h-fam/errdiff"
scraplibase "github.com/scrapli/scrapligo/driver/base"
scraplinetwork "github.com/scrapli/scrapligo/driver/network"
Expand Down
26 changes: 13 additions & 13 deletions topo/topo.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ import (

"github.com/ghodss/yaml"
"github.com/golang/protobuf/proto"
cpb "github.com/google/kne/proto/controller"
"github.com/google/kne/topo/node"
cpb "github.com/openconfig/kne/proto/controller"
"github.com/openconfig/kne/topo/node"
"github.com/kr/pretty"
log "github.com/sirupsen/logrus"
"google.golang.org/grpc/codes"
Expand All @@ -39,17 +39,17 @@ import (
"k8s.io/client-go/rest"
"k8s.io/client-go/tools/clientcmd"

topologyclientv1 "github.com/google/kne/api/clientset/v1beta1"
topologyv1 "github.com/google/kne/api/types/v1beta1"
tpb "github.com/google/kne/proto/topo"

_ "github.com/google/kne/topo/node/ceos"
_ "github.com/google/kne/topo/node/cisco"
_ "github.com/google/kne/topo/node/cptx"
_ "github.com/google/kne/topo/node/gobgp"
_ "github.com/google/kne/topo/node/host"
_ "github.com/google/kne/topo/node/ixia"
_ "github.com/google/kne/topo/node/srl"
topologyclientv1 "github.com/openconfig/kne/api/clientset/v1beta1"
topologyv1 "github.com/openconfig/kne/api/types/v1beta1"
tpb "github.com/openconfig/kne/proto/topo"

_ "github.com/openconfig/kne/topo/node/ceos"
_ "github.com/openconfig/kne/topo/node/cisco"
_ "github.com/openconfig/kne/topo/node/cptx"
_ "github.com/openconfig/kne/topo/node/gobgp"
_ "github.com/openconfig/kne/topo/node/host"
_ "github.com/openconfig/kne/topo/node/ixia"
_ "github.com/openconfig/kne/topo/node/srl"
)

var protojsonUnmarshaller = protojson.UnmarshalOptions{
Expand Down
Loading

0 comments on commit afffb61

Please sign in to comment.