gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-10-13 15:51:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request openziti/fabric#96 from openziti/openziti

Browse Source 
netfoundry/ziti-fabric -> openziti/fabric
This commit is contained in:
Michael Quigley
2020-05-26 17:19:18 -04:00
committed by GitHub
parent f18f9628f2 10e6a7ef93
commit bf7043c19d
147 changed files with 511 additions and 511 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/config.go
+10 -10
View File
@@ -20,16 +20,16 @@ import (
"bytes"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/config"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/transport"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/config"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/metrics"
"github.com/openziti/foundation/transport"
"gopkg.in/yaml.v2"
"io/ioutil"
"time"
controller/controller.go
+14 -14
View File
@@ -20,20 +20,20 @@ import (
"encoding/json"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_ctrl"
"github.com/netfoundry/ziti-fabric/controller/handler_mgmt"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-fabric/controller/xctrl_example"
"github.com/netfoundry/ziti-fabric/controller/xmgmt"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/controller/xt_ha"
"github.com/netfoundry/ziti-fabric/controller/xt_random"
"github.com/netfoundry/ziti-fabric/controller/xt_smartrouting"
"github.com/netfoundry/ziti-fabric/controller/xt_weighted"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/profiler"
"github.com/netfoundry/ziti-foundation/util/concurrenz"
"github.com/openziti/fabric/controller/handler_ctrl"
"github.com/openziti/fabric/controller/handler_mgmt"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/fabric/controller/xctrl_example"
"github.com/openziti/fabric/controller/xmgmt"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_ha"
"github.com/openziti/fabric/controller/xt_random"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/fabric/controller/xt_weighted"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/profiler"
"github.com/openziti/foundation/util/concurrenz"
)
type Controller struct {
controller/db/base_store.go
+1 -1
View File
@@ -17,7 +17,7 @@
package db
import (
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/boltz"
)
type store interface {
controller/db/migration.go
+3 -3
View File
@@ -1,9 +1,9 @@
package db
import (
"github.com/netfoundry/ziti-fabric/controller/xt_smartrouting"
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
"github.com/pkg/errors"
"strings"
"time"
controller/db/router_store.go
+2 -2
View File
@@ -17,8 +17,8 @@
package db
import (
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
)
import (
controller/db/service_store.go
+4 -4
View File
@@ -17,10 +17,10 @@
package db
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/controller/xt_smartrouting"
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
)
controller/db/stores.go
+1 -1
View File
@@ -17,7 +17,7 @@
package db
import (
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/boltz"
"reflect"
)
controller/db/terminator_store.go
+4 -4
View File
@@ -19,10 +19,10 @@ package db
import (
"encoding/binary"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/netfoundry/ziti-foundation/util/sequence"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
"github.com/openziti/foundation/util/sequence"
"go.etcd.io/bbolt"
)
controller/db/terminator_store_test.go
+2 -2
View File
@@ -19,8 +19,8 @@ package db
import (
"fmt"
"github.com/google/uuid"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-foundation/util/stringz"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/foundation/util/stringz"
"go.etcd.io/bbolt"
"math"
"testing"
controller/db/testing.go
+1 -1
View File
@@ -3,7 +3,7 @@ package db
import (
"github.com/google/uuid"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
"testing"
)
controller/handler_common/common.go
+1 -1
View File
@@ -2,7 +2,7 @@ package handler_common
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
func SendSuccess(request *channel2.Message, ch channel2.Channel, message string) {
controller/handler_ctrl/accept.go
+3 -3
View File
@@ -18,9 +18,9 @@ package handler_ctrl
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/foundation/channel2"
)
type CtrlAccepter struct {
controller/handler_ctrl/bind.go
+4 -4
View File
@@ -17,10 +17,10 @@
package handler_ctrl
import (
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
)
type bindHandler struct {
controller/handler_ctrl/close.go
+2 -2
View File
@@ -18,8 +18,8 @@ package handler_ctrl
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/foundation/channel2"
)
type closeHandler struct {
controller/handler_ctrl/connect.go
+3 -3
View File
@@ -22,9 +22,9 @@ import (
"errors"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/foundation/channel2"
)
type ConnectHandler struct {
controller/handler_ctrl/create_terminator.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
)
type createTerminatorHandler struct {
controller/handler_ctrl/fault.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"errors"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type faultHandler struct {
controller/handler_ctrl/inspect.go
+3 -3
View File
@@ -20,9 +20,9 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
)
type inspectHandler struct {
controller/handler_ctrl/link.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type linkHandler struct {
controller/handler_ctrl/metrics.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/metrics/metrics_pb"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/metrics"
"github.com/openziti/foundation/metrics/metrics_pb"
)
type metricsHandler struct {
controller/handler_ctrl/remove_terminator.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
)
type removeTerminatorHandler struct {
controller/handler_ctrl/session_request.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/ctrl_msg"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/ctrl_msg"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
"time"
)
controller/handler_ctrl/update_terminator.go
+6 -6
View File
@@ -19,12 +19,12 @@ package handler_ctrl
import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/storage/boltz"
"math"
)
controller/handler_mgmt/accept.go
+1 -1
View File
@@ -18,7 +18,7 @@ package handler_mgmt
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
type MgmtAccepter struct {
controller/handler_mgmt/bind.go
+4 -4
View File
@@ -17,10 +17,10 @@
package handler_mgmt
import (
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xmgmt"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xmgmt"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
)
type BindHandler struct {
controller/handler_mgmt/close.go
+1 -1
View File
@@ -18,7 +18,7 @@ package handler_mgmt
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
type xmgmtCloseHandler struct {
controller/handler_mgmt/connect.go
+2 -2
View File
@@ -18,8 +18,8 @@ package handler_mgmt
import (
"crypto/x509"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/foundation/channel2"
)
type ConnectHandler struct {
controller/handler_mgmt/create_router.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type createRouterHandler struct {
controller/handler_mgmt/create_service.go
+5 -5
View File
@@ -18,11 +18,11 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type createServiceHandler struct {
controller/handler_mgmt/create_terminator.go
+5 -5
View File
@@ -18,11 +18,11 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/pkg/errors"
)
controller/handler_mgmt/get_service.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type getServiceHandler struct {
controller/handler_mgmt/get_terminator.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type getTerminatorHandler struct {
controller/handler_mgmt/inspect.go
+5 -5
View File
@@ -20,11 +20,11 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/util/debugz"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/util/debugz"
"regexp"
"strings"
"sync"
controller/handler_mgmt/list_links.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type listLinksHandler struct {
controller/handler_mgmt/list_routers.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"reflect"
)
controller/handler_mgmt/list_services.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"reflect"
)
controller/handler_mgmt/list_sessions.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type listSessionsHandler struct {
controller/handler_mgmt/list_terminators.go
+4 -4
View File
@@ -20,10 +20,10 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"reflect"
)
controller/handler_mgmt/remove_router.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type removeRouterHandler struct {
controller/handler_mgmt/remove_service.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type removeServiceHandler struct {
controller/handler_mgmt/remove_session.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type removeSessionHandler struct {
controller/handler_mgmt/remove_terminator.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
)
type removeTerminatorHandler struct {
controller/handler_mgmt/set_link_cost.go
+5 -5
View File
@@ -20,11 +20,11 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type setLinkCostHandler struct {
controller/handler_mgmt/set_link_down.go
+5 -5
View File
@@ -20,11 +20,11 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type setLinkDownHandler struct {
controller/handler_mgmt/set_terminator_cost.go
+6 -6
View File
@@ -19,12 +19,12 @@ package handler_mgmt
import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/storage/boltz"
"math"
)
controller/handler_mgmt/stream_metrics.go
+6 -6
View File
@@ -20,12 +20,12 @@ import (
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes/timestamp"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/metrics/metrics_pb"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/metrics"
"github.com/openziti/foundation/metrics/metrics_pb"
"regexp"
)
controller/handler_mgmt/stream_sessions.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type streamSessionsHandler struct {
controller/handler_mgmt/stream_toggle_pipe_traces.go
+7 -7
View File
@@ -19,13 +19,13 @@ package handler_mgmt
import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
trace_pb "github.com/netfoundry/ziti-foundation/trace/pb"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
trace_pb "github.com/openziti/foundation/trace/pb"
"sync"
"time"
)
controller/handler_mgmt/stream_traces.go
+6 -6
View File
@@ -19,12 +19,12 @@ package handler_mgmt
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/handler_common"
"github.com/netfoundry/ziti-fabric/controller/network"
"github.com/netfoundry/ziti-fabric/pb/mgmt_pb"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/trace/pb"
"github.com/openziti/fabric/controller/handler_common"
"github.com/openziti/fabric/controller/network"
"github.com/openziti/fabric/pb/mgmt_pb"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/trace/pb"
)
type streamTracesHandler struct {
controller/models/base_model.go
+2 -2
View File
@@ -17,8 +17,8 @@
package models
import (
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
"time"
controller/network/assembly.go
+3 -3
View File
@@ -19,9 +19,9 @@ package network
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/util/info"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/util/info"
)
func (network *Network) assemble() {
controller/network/circuit.go
+2 -2
View File
@@ -18,8 +18,8 @@ package network
import (
"fmt"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/identity/identity"
)
type Circuit struct {
controller/network/circuit_test.go
+6 -6
View File
@@ -17,12 +17,12 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/transport"
"github.com/netfoundry/ziti-foundation/transport/tcp"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/transport"
"github.com/openziti/foundation/transport/tcp"
"github.com/stretchr/testify/assert"
"testing"
)
controller/network/controllers.go
+4 -4
View File
@@ -17,10 +17,10 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-foundation/storage/ast"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/storage/ast"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
)
controller/network/link.go
+2 -2
View File
@@ -17,8 +17,8 @@
package network
import (
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/util/info"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/util/info"
)
type Link struct {
controller/network/link_controller.go
+2 -2
View File
@@ -17,8 +17,8 @@
package network
import (
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/util/sequence"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/util/sequence"
"github.com/orcaman/concurrent-map"
"math"
)
controller/network/link_controller_test.go
+1 -1
View File
@@ -17,7 +17,7 @@
package network
import (
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/foundation/identity/identity"
"github.com/stretchr/testify/assert"
"testing"
)
controller/network/network.go
+11 -11
View File
@@ -22,17 +22,17 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/metrics/metrics_pb"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/netfoundry/ziti-foundation/util/concurrenz"
"github.com/netfoundry/ziti-foundation/util/sequence"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/metrics"
"github.com/openziti/foundation/metrics/metrics_pb"
"github.com/openziti/foundation/storage/boltz"
"github.com/openziti/foundation/util/concurrenz"
"github.com/openziti/foundation/util/sequence"
errors2 "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"sort"
controller/network/path_test.go
+3 -3
View File
@@ -17,9 +17,9 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/transport/tcp"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/transport/tcp"
"github.com/stretchr/testify/assert"
"testing"
)
controller/network/router.go
+5 -5
View File
@@ -17,11 +17,11 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/netfoundry/ziti-foundation/util/concurrenz"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/storage/boltz"
"github.com/openziti/foundation/util/concurrenz"
"github.com/orcaman/concurrent-map"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
controller/network/service.go
+3 -3
View File
@@ -18,9 +18,9 @@ package network
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/foundation/storage/boltz"
"github.com/orcaman/concurrent-map"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
controller/network/session.go
+2 -2
View File
@@ -17,8 +17,8 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/foundation/identity/identity"
"github.com/orcaman/concurrent-map"
)
controller/network/session_lifecycle.go
+1 -1
View File
@@ -17,7 +17,7 @@
package network
import (
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/foundation/identity/identity"
)
type SessionLifeCycleListener interface {
controller/network/smart.go
+1 -1
View File
@@ -18,7 +18,7 @@ package network
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/foundation/identity/identity"
"sort"
)
controller/network/terminator.go
+4 -4
View File
@@ -14,10 +14,10 @@
package network
import (
"github.com/netfoundry/ziti-fabric/controller/db"
"github.com/netfoundry/ziti-fabric/controller/models"
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/db"
"github.com/openziti/fabric/controller/models"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/foundation/storage/boltz"
"github.com/pkg/errors"
"go.etcd.io/bbolt"
"reflect"
controller/xctrl/ops.go
+2 -2
View File
@@ -17,8 +17,8 @@
package xctrl
import (
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"time"
)
controller/xctrl/xctrl.go
+3 -3
View File
@@ -17,9 +17,9 @@
package xctrl
import (
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/config"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/config"
"github.com/openziti/foundation/storage/boltz"
)
type Xctrl interface {
controller/xctrl_example/example.go
+3 -3
View File
@@ -21,9 +21,9 @@ import (
"encoding/binary"
"errors"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/storage/boltz"
"time"
)
controller/xctrl_example/receive.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"bytes"
"encoding/binary"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
type receiveHandler struct{}
controller/xmgmt/xmgmt.go
+2 -2
View File
@@ -17,8 +17,8 @@
package xmgmt
import (
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/config"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/config"
)
type Xmgmt interface {
controller/xt/registry.go
+1 -1
View File
@@ -17,7 +17,7 @@
package xt
import (
"github.com/netfoundry/ziti-foundation/storage/boltz"
"github.com/openziti/foundation/storage/boltz"
"sync"
"sync/atomic"
)
controller/xt_common/cost_visitor.go
+1 -1
View File
@@ -1,7 +1,7 @@
package xt_common
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/openziti/fabric/controller/xt"
"math"
)
controller/xt_ha/impl.go
+1 -1
View File
@@ -17,7 +17,7 @@
package xt_ha
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/openziti/fabric/controller/xt"
"sync/atomic"
)
controller/xt_random/impl.go
+1 -1
View File
@@ -17,7 +17,7 @@
package xt_random
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/openziti/fabric/controller/xt"
"math/rand"
)
controller/xt_smartrouting/impl.go
+2 -2
View File
@@ -17,8 +17,8 @@
package xt_smartrouting
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/controller/xt_common"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_common"
"math"
"time"
)
controller/xt_weighted/impl.go
+2 -2
View File
@@ -17,8 +17,8 @@
package xt_weighted
import (
"github.com/netfoundry/ziti-fabric/controller/xt"
"github.com/netfoundry/ziti-fabric/controller/xt_common"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_common"
"math"
"math/rand"
"time"
ctrl_msg/messages.go
+1 -1
View File
@@ -17,7 +17,7 @@
package ctrl_msg
import (
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
const (
docs/json_api_gateway.md
+3 -3
View File
@@ -2,7 +2,7 @@
Launch the `ziti-fabric-gw` like this:
$ bin/ziti-fabric-gw run src/github.com/netfoundry/ziti-fabric/fabric/etc/gw.yml
$ bin/ziti-fabric-gw run src/github.com/openziti/fabric/fabric/etc/gw.yml
Client access like this:
@@ -49,8 +49,8 @@ Client access like this:
To use `ziti-fabric-gw` with a plain HTTP listener (without TLS), comment out the `certPath` and `keyPath` lines in `gw.yml`:
# Comment out the following lines to disable the TLS listener
#certPath: src/github.com/netfoundry/ziti-fabric/fabric/etc/ca/intermediate/certs/mgmt-gw.cert.pem
#keyPath: src/github.com/netfoundry/ziti-fabric/fabric/etc/ca/intermediate/private/mgmt-gw.key.pem
#certPath: src/github.com/openziti/fabric/fabric/etc/ca/intermediate/certs/mgmt-gw.cert.pem
#keyPath: src/github.com/openziti/fabric/fabric/etc/ca/intermediate/private/mgmt-gw.key.pem
And then the listener can be accessed with plain HTTP:
docs/local_development.md
+14 -14
View File
@@ -4,13 +4,13 @@ If you're going to be working on the Ziti fabric, or just want to track the late
First, install the golang environment for your platform. Visit http://golang.org to download your installer.
As of this update, we're currently using version `1.13` of golang.
As of this update, we're currently using version `1.14` of golang.
Make sure that `go` is in your path:
```
$ go version
go version go1.13.4 linux/amd64
go version go1.14.3 linux/amd64
```
Consider using a separate directory to contain the `GOPATH` for your `ziti-fabric` development (instead of just using `~/go`). I like to put mine in `~/local/ziti-fabric`, but you can root it wherever you'd like. This will contain the dependent package sources, and built binaries.
@@ -18,8 +18,8 @@ Consider using a separate directory to contain the `GOPATH` for your `ziti-fabri
Essentially:
```
mkdir -p ~/local/ziti-fabric
export GOPATH=~/local/ziti-fabric
mkdir -p ~/local/ziti
export GOPATH=~/local/ziti
```
Include `GOPATH/bin` in your shell's `PATH`:
@@ -33,21 +33,21 @@ When you've got your `GOPATH` ready, you'll want to clone the repositories. I li
```
mkdir ~/repos
cd ~/repos
git clone https://github.com/netfoundry/ziti-cmd.git
git clone https://github.com/netfoundry/ziti-fabric.git
git clone https://github.com/openziti/ziti.git
git clone https://github.com/openziti/fabric.git
```
We're going to need to update the `go.mod` file in the root of `ziti-cmd`, using the `replace` directive to point the `ziti-cmd` build at our local `ziti-fabric` development tree.
```
cd ~/repos/ziti-cmd
cd ~/repos/ziti
vi go.mod
```
The top of the file should look like this:
```
module github.com/netfoundry/ziti-cmd
module github.com/openziti/ziti
go 1.13
@@ -57,11 +57,11 @@ require (
We're going to add a `replace` line, like this:
```
module github.com/netfoundry/ziti-cmd
module github.com/openziti/ziti
go 1.13
replace github.com/netfoundry/ziti-fabric => ../ziti-fabric
replace github.com/openziti/fabric => ../fabric
require (
```
@@ -71,13 +71,13 @@ With that change made, you can alter the contents of your local clone of `ziti-f
Build the tree:
```
$ cd ~/repos/ziti-cmd
$ cd ~/repos/ziti
$ go install ./...
```
The binaries will be placed in `$GOPATH/bin`.
The development configuration files live in `ziti-fabric/etc`, and contain relative paths, which expect the executables to be started from the root of `ziti-fabric` (ensure that `~/local/ziti-fabric/bin` (`$GOPATH/bin`) is in your shell's `PATH`).
The development configuration files live in `fabric/etc`, and contain relative paths, which expect the executables to be started from the root of `ziti-fabric` (ensure that `~/local/ziti-fabric/bin` (`$GOPATH/bin`) is in your shell's `PATH`).
```
$ cd ~repos/ziti-cmd
@@ -91,7 +91,7 @@ You'll want to open a number of terminal windows. All commands are executed rela
### Launch The Controller
```
$ cd ~repos/ziti-cmd
$ cd ~repos/ziti
$ ziti-controller run etc/ctrl.yml
```
@@ -175,7 +175,7 @@ $ ziti-fabric-test loop2 listener
Launch a `loop2` dialer (begin generating load):
```
$ ziti-fabric-test loop2 dialer src/github.com/netfoundry/ziti-fabric/fabric/etc/loop2/10-ambient.loop2.yml
$ ziti-fabric-test loop2 dialer src/github.com/openziti/fabric/fabric/etc/loop2/10-ambient.loop2.yml
```
Take a look at the various `loop2` scenario configurations in `etc/loop2` for examples illustrating different workloads.
pb/ctrl_pb/decoder.go
+3 -3
View File
@@ -20,9 +20,9 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/ctrl_msg"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/metrics/metrics_pb"
"github.com/openziti/fabric/ctrl_msg"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/metrics/metrics_pb"
"strconv"
"strings"
)
pb/ctrl_pb/impl.go
+1 -1
View File
@@ -16,7 +16,7 @@
package ctrl_pb
import "github.com/netfoundry/ziti-fabric/controller/xt"
import "github.com/openziti/fabric/controller/xt"
func (request *InspectRequest) GetContentType() int32 {
return int32(ContentType_InspectRequestType)
pb/mgmt_pb/decoder.go
+1 -1
View File
@@ -20,7 +20,7 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/foundation/channel2"
)
type Decoder struct{}
router/accepter.go
+2 -2
View File
@@ -1,8 +1,8 @@
package router
import (
forwarder2 "github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xlink"
forwarder2 "github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xlink"
"github.com/sirupsen/logrus"
)
router/config.go
+7 -7
View File
@@ -20,13 +20,13 @@ import (
"bytes"
"fmt"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/config"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/transport"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/config"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/transport"
"github.com/spf13/pflag"
"gopkg.in/yaml.v2"
"io/ioutil"
router/forwarder/forwarder.go
+7 -7
View File
@@ -19,13 +19,13 @@ package forwarder
import (
"errors"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/netfoundry/ziti-foundation/util/info"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/metrics"
"github.com/openziti/foundation/util/info"
"time"
)
router/forwarder/tables.go
+3 -3
View File
@@ -18,9 +18,9 @@ package forwarder
import (
"fmt"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/util/info"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/util/info"
"github.com/orcaman/concurrent-map"
"reflect"
)
router/handler_ctrl/bind.go
+7 -7
View File
@@ -17,13 +17,13 @@
package handler_ctrl
import (
"github.com/netfoundry/ziti-fabric/controller/xctrl"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/controller/xctrl"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type bindHandler struct {
router/handler_ctrl/dial.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_ctrl
import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
"github.com/sirupsen/logrus"
)
router/handler_ctrl/inspect.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/netfoundry/ziti-foundation/util/debugz"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
"github.com/openziti/foundation/util/debugz"
"strings"
)
router/handler_ctrl/route.go
+6 -6
View File
@@ -20,12 +20,12 @@ import (
"fmt"
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/handler_xgress"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/handler_xgress"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type routeHandler struct {
router/handler_ctrl/start_xgress.go
+4 -4
View File
@@ -18,10 +18,10 @@ package handler_ctrl
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type startXgressHandler struct {
router/handler_ctrl/toggle_pipe_traces.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
trace_pb "github.com/netfoundry/ziti-foundation/trace/pb"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
trace_pb "github.com/openziti/foundation/trace/pb"
)
func newTraceHandler(appId *identity.TokenId, controller trace.Controller) *traceHandler {
router/handler_ctrl/unroute.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type unrouteHandler struct {
router/handler_ctrl/validate_terminators.go
+3 -3
View File
@@ -19,9 +19,9 @@ package handler_ctrl
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/channel2"
)
type validateTerminatorsHandler struct {
router/handler_link/accepter.go
+8 -8
View File
@@ -1,14 +1,14 @@
package handler_link
import (
"github.com/netfoundry/ziti-fabric/router/forwarder"
metrics2 "github.com/netfoundry/ziti-fabric/router/metrics"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-fabric/router/xlink_transport"
"github.com/netfoundry/ziti-fabric/trace"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/metrics"
"github.com/openziti/fabric/router/forwarder"
metrics2 "github.com/openziti/fabric/router/metrics"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/fabric/router/xlink_transport"
"github.com/openziti/fabric/trace"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/metrics"
)
func NewChannelAccepter(c xgress.CtrlChannel, f *forwarder.Forwarder, fo *forwarder.Options, mr metrics.Registry) xlink_transport.ChannelAccepter {
router/handler_link/ack.go
+4 -4
View File
@@ -18,10 +18,10 @@ package handler_link
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/foundation/channel2"
)
type ackHandler struct {
router/handler_link/close.go
+5 -5
View File
@@ -19,11 +19,11 @@ package handler_link
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/foundation/channel2"
)
type closeHandler struct {
router/handler_link/error.go
+4 -4
View File
@@ -19,10 +19,10 @@ package handler_link
import (
"github.com/golang/protobuf/proto"
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/pb/ctrl_pb"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/openziti/fabric/pb/ctrl_pb"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/foundation/channel2"
)
type errorHandler struct {
router/handler_link/payload.go
+5 -5
View File
@@ -18,11 +18,11 @@ package handler_link
import (
"github.com/michaelquigley/pfxlog"
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-fabric/router/xlink"
"github.com/netfoundry/ziti-foundation/channel2"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/fabric/router/xlink"
"github.com/openziti/foundation/channel2"
"github.com/openziti/foundation/identity/identity"
)
type payloadHandler struct {
router/handler_xgress/bind.go
+4 -4
View File
@@ -17,10 +17,10 @@
package handler_xgress
import (
"github.com/netfoundry/ziti-fabric/router/forwarder"
"github.com/netfoundry/ziti-fabric/router/metrics"
"github.com/netfoundry/ziti-fabric/router/xgress"
"github.com/netfoundry/ziti-foundation/identity/identity"
"github.com/openziti/fabric/router/forwarder"
"github.com/openziti/fabric/router/metrics"
"github.com/openziti/fabric/router/xgress"
"github.com/openziti/foundation/identity/identity"
)
type bindHandler struct {

Some files were not shown because too many files have changed in this diff Show More