Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update module path to vanity import #22

Open
wants to merge 20 commits into
base: vl3_latest
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion applications/nsmrs/go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/cisco-app-networking/networkservicemesh/applications/nsmrs
module cisco-app-networking.github.io/networkservicemesh/applications/nsmrs

go 1.13

Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/connection/connection.pb.go

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

2 changes: 1 addition & 1 deletion controlplane/api/connection/connection.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package connection;
option go_package = "connection";

import "ptypes/timestamp/timestamp.proto";
import "github.com/networkservicemesh/networkservicemesh/controlplane/api/connectioncontext/connectioncontext.proto";
import "cisco-app-networking.github.io/networkservicemesh/controlplane/api/connectioncontext/connectioncontext.proto";

message Mechanism {
string cls = 1;
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/connection/connection_helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connectioncontext"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connectioncontext"
)

// IsRemote returns if connection is remote
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/connection/mechanisms/common/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (

"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
)

// SrcIP returns the source IP parameter of the Mechanism
Expand Down
4 changes: 2 additions & 2 deletions controlplane/api/connection/mechanisms/kernel/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
package kernel

import (
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
)

// Mechanism - kernel mechanism helper
Expand Down
4 changes: 2 additions & 2 deletions controlplane/api/connection/mechanisms/memif/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
package memif

import (
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"
)

type Mechanism interface {
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/connection/mechanisms/srv6/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import (

"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
)

// Mechanism - a vxlan mechanism utility wrapper
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/connection/mechanisms/vxlan/constant.go
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package vxlan

import (
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controlplane/api/connection/mechanisms/vxlan/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (

"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"
)

// Mechanism - a vxlan mechanism utility wrapper
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
package wireguard

import (
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"
)

const (
Expand Down
4 changes: 2 additions & 2 deletions controlplane/api/connection/mechanisms/wireguard/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ import (

"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/mechanisms/common"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/mechanisms/common"
)

// Mechanism - a wireguard mechanism utility wrapper
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/crossconnect/crossconnect.pb.go

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

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

package crossconnect;

import "github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/connection.proto";
import "cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/connection.proto";
import "ptypes/empty/empty.proto";

enum CrossConnectEventType {
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/crossconnect/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package crossconnect
import (
"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
)

// NewCrossConnect creates a new crossConnect
Expand Down
8 changes: 2 additions & 6 deletions controlplane/api/go.mod
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
module github.com/cisco-app-networking/networkservicemesh/controlplane/api
module cisco-app-networking.github.io/networkservicemesh/controlplane/api

go 1.13

require (
github.com/golang/protobuf v1.3.2
github.com/networkservicemesh/networkservicemesh/controlplane/api v0.0.0-00010101000000-000000000000
github.com/pkg/errors v0.8.1
google.golang.org/grpc v1.27.0
)

replace (
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 => github.com/census-instrumentation/opencensus-proto v0.0.3-0.20181214143942-ba49f56771b8
github.com/networkservicemesh/networkservicemesh/controlplane/api => ./
)
replace github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 => github.com/census-instrumentation/opencensus-proto v0.0.3-0.20181214143942-ba49f56771b8
13 changes: 4 additions & 9 deletions controlplane/api/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -23,31 +23,26 @@ golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHl
golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628=
golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa h1:F+8P+gmewFQYRk6JoLQLwjBCTu3mcIURZfNkVweuRKA=
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a h1:1BGLXjeY4akVXGgbC9HugT3Jv3hCI0z56oJR5vAMgBU=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9 h1:1/DFK4b7JH8DmkqhUk48onnSfrPzImPoVxuomtbT2nk=
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3onu1FJEFr0SW1gC7cKk1uF8kGRs=
golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 h1:gSJIx1SDwno+2ElGhA4+qG2zF97qiUzTM+rQ0klBOcE=
google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b h1:c8OBoXP3kTbDWWB/oVE3FkR851p4iZ3MPadz7zXEIPU=
google.golang.org/genproto v0.0.0-20200128133413-58ce757ed39b/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc=
google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
google.golang.org/grpc v1.27.0 h1:rRYRFMVgRv6E0D70Skyfsr28tDXIuuPZyWGMPdMcnXg=
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/networkservice/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"github.com/golang/protobuf/proto"
"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
)

// Clone clones request
Expand Down
2 changes: 1 addition & 1 deletion controlplane/api/networkservice/networkservice.pb.go

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

2 changes: 1 addition & 1 deletion controlplane/api/networkservice/networkservice.proto
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package networkservice;

option go_package = "networkservice";

import "github.com/networkservicemesh/networkservicemesh/controlplane/api/connection/connection.proto";
import "cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection/connection.proto";
import "ptypes/empty/empty.proto";

message NetworkServiceRequest {
Expand Down
2 changes: 1 addition & 1 deletion controlplane/build/Dockerfile.nsmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG GO_VERSION
FROM golang:${GO_VERSION}-alpine as build

ENV GOPROXY=${GOPROXY}
ENV PACKAGEPATH=github.com/networkservicemesh/networkservicemesh/controlplane
ENV PACKAGEPATH=cisco-app-networking.github.io/networkservicemesh/controlplane
ENV GO111MODULE=on

RUN mkdir /root/networkservicemesh
Expand Down
2 changes: 1 addition & 1 deletion controlplane/build/Dockerfile.proxy-nsmd
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ ARG GO_VERSION
FROM golang:${GO_VERSION}-alpine as build

ENV GOPROXY=${GOPROXY}
ENV PACKAGEPATH=github.com/networkservicemesh/networkservicemesh/controlplane
ENV PACKAGEPATH=cisco-app-networking.github.io/networkservicemesh/controlplane
ENV GO111MODULE=on

RUN mkdir /root/networkservicemesh
Expand Down
16 changes: 8 additions & 8 deletions controlplane/cmd/nsmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ import (

"github.com/pkg/errors"

"github.com/networkservicemesh/networkservicemesh/pkg/tools/jaeger"
"github.com/networkservicemesh/networkservicemesh/utils"
"cisco-app-networking.github.io/networkservicemesh/pkg/tools/jaeger"
"cisco-app-networking.github.io/networkservicemesh/utils"

"github.com/networkservicemesh/networkservicemesh/pkg/tools/spanhelper"
"cisco-app-networking.github.io/networkservicemesh/pkg/tools/spanhelper"

"github.com/networkservicemesh/networkservicemesh/pkg/probes"
"cisco-app-networking.github.io/networkservicemesh/pkg/probes"

"github.com/sirupsen/logrus"

"github.com/networkservicemesh/networkservicemesh/controlplane/pkg/model"
"github.com/networkservicemesh/networkservicemesh/controlplane/pkg/nsm"
"github.com/networkservicemesh/networkservicemesh/controlplane/pkg/nsmd"
"github.com/networkservicemesh/networkservicemesh/pkg/tools"
"cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/model"
"cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/nsm"
"cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/nsmd"
"cisco-app-networking.github.io/networkservicemesh/pkg/tools"
)

var version string
Expand Down
22 changes: 11 additions & 11 deletions controlplane/cmd/proxy-nsmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,23 +7,23 @@ import (
"strings"
"time"

"github.com/networkservicemesh/networkservicemesh/utils"
"cisco-app-networking.github.io/networkservicemesh/utils"

"github.com/networkservicemesh/networkservicemesh/pkg/probes/health"
"github.com/networkservicemesh/networkservicemesh/pkg/tools/jaeger"
"cisco-app-networking.github.io/networkservicemesh/pkg/probes/health"
"cisco-app-networking.github.io/networkservicemesh/pkg/tools/jaeger"

"github.com/networkservicemesh/networkservicemesh/pkg/probes"
"cisco-app-networking.github.io/networkservicemesh/pkg/probes"

"github.com/networkservicemesh/networkservicemesh/controlplane/pkg/nsmd"
"github.com/networkservicemesh/networkservicemesh/controlplane/pkg/serviceregistry"
"github.com/networkservicemesh/networkservicemesh/sdk/monitor/remote"
"cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/nsmd"
"cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/serviceregistry"
"cisco-app-networking.github.io/networkservicemesh/sdk/monitor/remote"

"github.com/sirupsen/logrus"

"github.com/networkservicemesh/networkservicemesh/controlplane/api/connection"
unified "github.com/networkservicemesh/networkservicemesh/controlplane/api/networkservice"
proxynetworkserviceserver "github.com/networkservicemesh/networkservicemesh/controlplane/pkg/remote/proxy_network_service_server"
"github.com/networkservicemesh/networkservicemesh/pkg/tools"
"cisco-app-networking.github.io/networkservicemesh/controlplane/api/connection"
unified "cisco-app-networking.github.io/networkservicemesh/controlplane/api/networkservice"
proxynetworkserviceserver "cisco-app-networking.github.io/networkservicemesh/controlplane/pkg/remote/proxy_network_service_server"
"cisco-app-networking.github.io/networkservicemesh/pkg/tools"
)

var version string
Expand Down
40 changes: 13 additions & 27 deletions controlplane/go.mod
Original file line number Diff line number Diff line change
@@ -1,37 +1,23 @@
module github.com/cisco-app-networking/networkservicemesh/controlplane
module cisco-app-networking.github.io/networkservicemesh/controlplane

go 1.13

require (
github.com/golang/protobuf v1.3.3
github.com/networkservicemesh/networkservicemesh/controlplane v0.0.0-00010101000000-000000000000
github.com/networkservicemesh/networkservicemesh/controlplane/api v0.3.0
github.com/networkservicemesh/networkservicemesh/forwarder/api v0.0.0-00010101000000-000000000000
github.com/networkservicemesh/networkservicemesh/pkg v0.3.0
github.com/networkservicemesh/networkservicemesh/sdk v0.0.0-00010101000000-000000000000
github.com/networkservicemesh/networkservicemesh/utils v0.3.0
github.com/onsi/gomega v1.7.0
cisco-app-networking.github.io/networkservicemesh/controlplane/api v1.0.13-vanity
cisco-app-networking.github.io/networkservicemesh/forwarder/api v1.0.13-vanity
cisco-app-networking.github.io/networkservicemesh/pkg v1.0.13-vanity
cisco-app-networking.github.io/networkservicemesh/sdk v1.0.13-vanity
cisco-app-networking.github.io/networkservicemesh/utils v1.0.13-vanity
github.com/golang/protobuf v1.4.2
github.com/onsi/gomega v1.10.3
github.com/opentracing/opentracing-go v1.1.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.1.0
github.com/sirupsen/logrus v1.4.2
github.com/uber/jaeger-lib v2.2.0+incompatible // indirect
golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa
golang.org/x/sys v0.0.0-20200124204421-9fbb57f87de9
github.com/sirupsen/logrus v1.6.0
golang.org/x/net v0.0.0-20201006153459-a7d1128ccaa0
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20200114203027-fcfc50b29cbb
google.golang.org/grpc v1.27.1
google.golang.org/grpc v1.29.1
)

replace (
github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 => github.com/census-instrumentation/opencensus-proto v0.0.3-0.20181214143942-ba49f56771b8
github.com/networkservicemesh/networkservicemesh => ../
github.com/networkservicemesh/networkservicemesh/controlplane => ./
github.com/networkservicemesh/networkservicemesh/controlplane/api => ./api
github.com/networkservicemesh/networkservicemesh/forwarder => ../forwarder
github.com/networkservicemesh/networkservicemesh/forwarder/api => ../forwarder/api
github.com/networkservicemesh/networkservicemesh/k8s/pkg/apis => ../k8s/pkg/apis
github.com/networkservicemesh/networkservicemesh/pkg => ../pkg
github.com/networkservicemesh/networkservicemesh/sdk => ../sdk
github.com/networkservicemesh/networkservicemesh/side-cars => ../side-cars
github.com/networkservicemesh/networkservicemesh/utils => ../utils
)
replace github.com/census-instrumentation/opencensus-proto v0.1.0-0.20181214143942-ba49f56771b8 => github.com/census-instrumentation/opencensus-proto v0.0.3-0.20181214143942-ba49f56771b8
Loading