gsadmin/ziti
1
0
Fork 0
mirror of https://github.com/openziti/ziti.git synced 2026-09-11 21:38:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add names to service and router. Add more store tests. Fixes GH-101

Browse Source
This commit is contained in:
Paul Lorenz
2020-06-18 14:36:58 -04:00
parent 68fd06d4e6
commit ffbb4e4cc3
17 changed files with 613 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files
controller/db/base_store.go
+4
View File
@@ -20,6 +20,10 @@ import (
"github.com/openziti/foundation/storage/boltz"
)
const (
FieldName = "name"
)
type store interface {
boltz.CrudStore
}
controller/db/migration.go
+22 -1
View File
@@ -9,7 +9,7 @@ import (
"time"
)
const CurrentDbVersion = 2
const CurrentDbVersion = 3
func (stores *stores) migrate(step *boltz.MigrationStep) int {
if step.CurrentVersion > CurrentDbVersion {
@@ -25,6 +25,11 @@ func (stores *stores) migrate(step *boltz.MigrationStep) int {
stores.extractTerminators(step)
}
if step.CurrentVersion < 3 {
stores.setNames(step, stores.service)
stores.setNames(step, stores.router)
}
if step.CurrentVersion <= CurrentDbVersion {
return CurrentDbVersion
}
@@ -56,6 +61,22 @@ func (stores *stores) initCreatedAtUpdatedAt(step *boltz.MigrationStep, now time
}
}
func (stores *stores) setNames(step *boltz.MigrationStep, store boltz.CrudStore) {
ids, _, err := store.QueryIds(step.Ctx.Tx(), "true")
step.SetError(err)
for _, id := range ids {
entityBucket := store.GetEntityBucket(step.Ctx.Tx(), []byte(id))
if entityBucket == nil {
step.SetError(errors.Errorf("could not get entity bucket for %v with id %v", store.GetSingularEntityType(), id))
return
}
if name := entityBucket.GetString(FieldName); name == nil || len(*name) == 0 {
entityBucket.SetString(FieldName, string(id), nil)
step.SetError(entityBucket.GetError())
}
}
}
const (
FieldServiceEgress = "egress"
FieldServiceBinding = "binding"
controller/db/router_store.go
+22
View File
@@ -32,16 +32,19 @@ const (
type Router struct {
boltz.BaseExtEntity
Name string
Fingerprint *string
}
func (entity *Router) LoadValues(_ boltz.CrudStore, bucket *boltz.TypedBucket) {
entity.LoadBaseValues(bucket)
entity.Name = bucket.GetStringOrError(FieldName)
entity.Fingerprint = bucket.GetString(FieldRouterFingerprint)
}
func (entity *Router) SetValues(ctx *boltz.PersistContext) {
entity.SetBaseValues(ctx)
ctx.SetString(FieldName, entity.Name)
ctx.SetStringP(FieldRouterFingerprint, entity.Fingerprint)
}
@@ -51,7 +54,9 @@ func (entity *Router) GetEntityType() string {
type RouterStore interface {
boltz.CrudStore
GetNameIndex() boltz.ReadIndex
LoadOneById(tx *bbolt.Tx, id string) (*Router, error)
LoadOneByName(tx *bbolt.Tx, id string) (*Router, error)
}
func newRouterStore(stores *stores) *routerStoreImpl {
@@ -71,11 +76,16 @@ func newRouterStore(stores *stores) *routerStoreImpl {
type routerStoreImpl struct {
baseStore
indexName boltz.ReadIndex
terminatorsSymbol boltz.EntitySetSymbol
}
func (store *routerStoreImpl) initializeLocal() {
store.AddExtEntitySymbols()
symbolName := store.AddSymbol(FieldName, ast.NodeTypeString)
store.indexName = store.AddUniqueIndex(symbolName)
store.AddSymbol(FieldRouterFingerprint, ast.NodeTypeString)
store.terminatorsSymbol = store.AddFkSetSymbol(EntityTypeTerminators, store.stores.terminator)
}
@@ -83,6 +93,10 @@ func (store *routerStoreImpl) initializeLocal() {
func (store *routerStoreImpl) initializeLinked() {
}
func (store *routerStoreImpl) GetNameIndex() boltz.ReadIndex {
return store.indexName
}
func (store *routerStoreImpl) NewStoreEntity() boltz.Entity {
return &Router{}
}
@@ -95,6 +109,14 @@ func (store *routerStoreImpl) LoadOneById(tx *bbolt.Tx, id string) (*Router, err
return entity, nil
}
func (store *routerStoreImpl) LoadOneByName(tx *bbolt.Tx, name string) (*Router, error) {
id := store.indexName.Read(tx, []byte(name))
if id != nil {
return store.LoadOneById(tx, string(id))
}
return nil, nil
}
func (store *routerStoreImpl) DeleteById(ctx boltz.MutateContext, id string) error {
terminatorIds := store.GetRelatedEntitiesIdList(ctx.Tx(), id, EntityTypeTerminators)
for _, terminatorId := range terminatorIds {
controller/db/router_store_test.go
+177
View File
@@ -0,0 +1,177 @@
/*
Copyright NetFoundry, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package db
import (
"fmt"
"github.com/google/uuid"
"testing"
"time"
"github.com/google/go-cmp/cmp"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
)
func Test_RouterStore(t *testing.T) {
ctx := NewTestContext(t)
defer ctx.Cleanup()
ctx.Init()
t.Run("test create invalid api routers", ctx.testCreateInvalidRouters)
t.Run("test create router", ctx.testCreateRouters)
t.Run("test load/query routers", ctx.testLoadQueryRouters)
t.Run("test update routers", ctx.testUpdateRouters)
t.Run("test delete routers", ctx.testDeleteRouters)
}
func (ctx *TestContext) testCreateInvalidRouters(t *testing.T) {
ctx.Impl.NextTest(t)
defer ctx.cleanupAll()
router := &Router{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(router)
err := ctx.Create(router)
ctx.EqualError(err, fmt.Sprintf("an entity of type router already exists with id %v", router.Id))
router.Id = uuid.New().String()
err = ctx.Create(router)
ctx.EqualError(err, fmt.Sprintf("duplicate value '%v' in unique index on routers store", router.Name))
}
func (ctx *TestContext) testCreateRouters(t *testing.T) {
ctx.Impl.NextTest(t)
defer ctx.cleanupAll()
router := &Router{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(router)
ctx.ValidateBaseline(router)
}
type routerTestEntities struct {
router1 *Router
router2 *Router
terminator *Terminator
service *Service
}
func (ctx *TestContext) createRouterTestEntities() *routerTestEntities {
router1 := ctx.requireNewRouter()
router2 := ctx.requireNewRouter()
service := ctx.requireNewService()
terminator := &Terminator{
BaseExtEntity: boltz.BaseExtEntity{
Id: uuid.New().String(),
},
Service: service.Id,
Router: router1.Id,
Binding: "transport",
Address: "tcp:localhost:22",
}
ctx.RequireCreate(terminator)
return &routerTestEntities{
router1: router1,
router2: router2,
service: service,
terminator: terminator,
}
}
func (ctx *TestContext) testLoadQueryRouters(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createRouterTestEntities()
err := ctx.GetDb().View(func(tx *bbolt.Tx) error {
router, err := ctx.stores.Router.LoadOneById(tx, entities.router1.Id)
ctx.NoError(err)
ctx.NotNil(router)
ctx.EqualValues(entities.router1.Id, router.Id)
router, err = ctx.stores.Router.LoadOneByName(tx, entities.router1.Name)
ctx.NoError(err)
ctx.NotNil(router)
ctx.EqualValues(entities.router1.Id, router.Id)
query := fmt.Sprintf(`anyOf(terminators) = "%v"`, entities.terminator.Id)
ids, _, err := ctx.stores.Router.QueryIds(tx, query)
ctx.NoError(err)
ctx.EqualValues(1, len(ids))
ctx.Equal(entities.router1.Id, ids[0])
return nil
})
ctx.NoError(err)
}
func (ctx *TestContext) testUpdateRouters(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createRouterTestEntities()
earlier := time.Now()
time.Sleep(time.Millisecond * 50)
err := ctx.GetDb().Update(func(tx *bbolt.Tx) error {
original, err := ctx.stores.Router.LoadOneById(tx, entities.router1.Id)
ctx.NoError(err)
ctx.NotNil(original)
router, err := ctx.stores.Router.LoadOneById(tx, entities.router1.Id)
ctx.NoError(err)
ctx.NotNil(router)
tags := ctx.CreateTags()
now := time.Now()
router.Name = uuid.New().String()
router.UpdatedAt = earlier
router.CreatedAt = now
router.Tags = tags
err = ctx.stores.Router.Update(boltz.NewMutateContext(tx), router, nil)
ctx.NoError(err)
loaded, err := ctx.stores.Router.LoadOneById(tx, entities.router1.Id)
ctx.NoError(err)
ctx.NotNil(loaded)
ctx.EqualValues(original.CreatedAt, loaded.CreatedAt)
ctx.True(loaded.UpdatedAt.Equal(now) || loaded.UpdatedAt.After(now))
router.CreatedAt = loaded.CreatedAt
router.UpdatedAt = loaded.UpdatedAt
ctx.True(cmp.Equal(router, loaded), cmp.Diff(router, loaded))
return nil
})
ctx.NoError(err)
}
func (ctx *TestContext) testDeleteRouters(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createRouterTestEntities()
ctx.RequireDelete(entities.router1)
ctx.RequireDelete(entities.router2)
}
controller/db/service_store.go
+22
View File
@@ -31,16 +31,19 @@ const (
type Service struct {
boltz.BaseExtEntity
Name string
TerminatorStrategy string
}
func (entity *Service) LoadValues(_ boltz.CrudStore, bucket *boltz.TypedBucket) {
entity.LoadBaseValues(bucket)
entity.Name = bucket.GetStringOrError(FieldName)
entity.TerminatorStrategy = bucket.GetStringWithDefault(FieldServiceTerminatorStrategy, "")
}
func (entity *Service) SetValues(ctx *boltz.PersistContext) {
entity.SetBaseValues(ctx)
ctx.SetString(FieldName, entity.Name)
if entity.TerminatorStrategy == "" {
entity.TerminatorStrategy = xt_smartrouting.Name
}
@@ -69,7 +72,9 @@ func (entity *Service) GetEntityType() string {
type ServiceStore interface {
store
GetNameIndex() boltz.ReadIndex
LoadOneById(tx *bbolt.Tx, id string) (*Service, error)
LoadOneByName(tx *bbolt.Tx, name string) (*Service, error)
}
func newServiceStore(stores *stores) *serviceStoreImpl {
@@ -89,11 +94,16 @@ func newServiceStore(stores *stores) *serviceStoreImpl {
type serviceStoreImpl struct {
baseStore
indexName boltz.ReadIndex
terminatorsSymbol boltz.EntitySetSymbol
}
func (store *serviceStoreImpl) initializeLocal() {
store.AddExtEntitySymbols()
symbolName := store.AddSymbol(FieldName, ast.NodeTypeString)
store.indexName = store.AddUniqueIndex(symbolName)
store.AddSymbol(FieldServiceTerminatorStrategy, ast.NodeTypeString)
store.terminatorsSymbol = store.AddFkSetSymbol(EntityTypeTerminators, store.stores.terminator)
}
@@ -101,6 +111,10 @@ func (store *serviceStoreImpl) initializeLocal() {
func (store *serviceStoreImpl) initializeLinked() {
}
func (store *serviceStoreImpl) GetNameIndex() boltz.ReadIndex {
return store.indexName
}
func (store *serviceStoreImpl) NewStoreEntity() boltz.Entity {
return &Service{}
}
@@ -113,6 +127,14 @@ func (store *serviceStoreImpl) LoadOneById(tx *bbolt.Tx, id string) (*Service, e
return entity, nil
}
func (store *serviceStoreImpl) LoadOneByName(tx *bbolt.Tx, name string) (*Service, error) {
id := store.indexName.Read(tx, []byte(name))
if id != nil {
return store.LoadOneById(tx, string(id))
}
return nil, nil
}
func (store *serviceStoreImpl) DeleteById(ctx boltz.MutateContext, id string) error {
terminatorIds := store.GetRelatedEntitiesIdList(ctx.Tx(), id, EntityTypeTerminators)
for _, terminatorId := range terminatorIds {
controller/db/service_store_test.go
+183
View File
@@ -0,0 +1,183 @@
/*
Copyright NetFoundry, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
https://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package db
import (
"fmt"
"github.com/google/uuid"
"testing"
"time"
"github.com/google/go-cmp/cmp"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
)
func Test_ServiceStore(t *testing.T) {
ctx := NewTestContext(t)
defer ctx.Cleanup()
ctx.Init()
t.Run("test create invalid api services", ctx.testCreateInvalidServices)
t.Run("test create service", ctx.testCreateServices)
t.Run("test load/query services", ctx.testLoadQueryServices)
t.Run("test update services", ctx.testUpdateServices)
t.Run("test delete services", ctx.testDeleteServices)
}
func (ctx *TestContext) testCreateInvalidServices(t *testing.T) {
ctx.Impl.NextTest(t)
defer ctx.cleanupAll()
service := &Service{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(service)
err := ctx.Create(service)
ctx.EqualError(err, fmt.Sprintf("an entity of type service already exists with id %v", service.Id))
service.Id = uuid.New().String()
err = ctx.Create(service)
ctx.EqualError(err, fmt.Sprintf("duplicate value '%v' in unique index on services store", service.Name))
service.Id = uuid.New().String()
service.Name = uuid.New().String()
service.TerminatorStrategy = uuid.New().String()
err = ctx.Create(service)
ctx.EqualError(err, fmt.Sprintf("terminatorStrategy with name %v not found", service.TerminatorStrategy))
}
func (ctx *TestContext) testCreateServices(t *testing.T) {
ctx.Impl.NextTest(t)
defer ctx.cleanupAll()
service := &Service{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(service)
ctx.ValidateBaseline(service)
}
type serviceTestEntities struct {
service1 *Service
service2 *Service
terminator *Terminator
router *Router
}
func (ctx *TestContext) createServiceTestEntities() *serviceTestEntities {
service1 := ctx.requireNewService()
service2 := ctx.requireNewService()
router := ctx.requireNewRouter()
terminator := &Terminator{
BaseExtEntity: boltz.BaseExtEntity{
Id: uuid.New().String(),
},
Service: service1.Id,
Router: router.Id,
Binding: "transport",
Address: "tcp:localhost:22",
}
ctx.RequireCreate(terminator)
return &serviceTestEntities{
service1: service1,
service2: service2,
router: router,
terminator: terminator,
}
}
func (ctx *TestContext) testLoadQueryServices(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createServiceTestEntities()
err := ctx.GetDb().View(func(tx *bbolt.Tx) error {
service, err := ctx.stores.Service.LoadOneById(tx, entities.service1.Id)
ctx.NoError(err)
ctx.NotNil(service)
ctx.EqualValues(entities.service1.Id, service.Id)
service, err = ctx.stores.Service.LoadOneByName(tx, entities.service1.Name)
ctx.NoError(err)
ctx.NotNil(service)
ctx.EqualValues(entities.service1.Id, service.Id)
query := fmt.Sprintf(`anyOf(terminators) = "%v"`, entities.terminator.Id)
ids, _, err := ctx.stores.Service.QueryIds(tx, query)
ctx.NoError(err)
ctx.EqualValues(1, len(ids))
ctx.Equal(entities.service1.Id, ids[0])
return nil
})
ctx.NoError(err)
}
func (ctx *TestContext) testUpdateServices(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createServiceTestEntities()
earlier := time.Now()
time.Sleep(time.Millisecond * 50)
err := ctx.GetDb().Update(func(tx *bbolt.Tx) error {
original, err := ctx.stores.Service.LoadOneById(tx, entities.service1.Id)
ctx.NoError(err)
ctx.NotNil(original)
service, err := ctx.stores.Service.LoadOneById(tx, entities.service1.Id)
ctx.NoError(err)
ctx.NotNil(service)
tags := ctx.CreateTags()
now := time.Now()
service.Name = uuid.New().String()
service.UpdatedAt = earlier
service.CreatedAt = now
service.Tags = tags
err = ctx.stores.Service.Update(boltz.NewMutateContext(tx), service, nil)
ctx.NoError(err)
loaded, err := ctx.stores.Service.LoadOneById(tx, entities.service1.Id)
ctx.NoError(err)
ctx.NotNil(loaded)
ctx.EqualValues(original.CreatedAt, loaded.CreatedAt)
ctx.True(loaded.UpdatedAt.Equal(now) || loaded.UpdatedAt.After(now))
service.CreatedAt = loaded.CreatedAt
service.UpdatedAt = loaded.UpdatedAt
ctx.True(cmp.Equal(service, loaded), cmp.Diff(service, loaded))
return nil
})
ctx.NoError(err)
}
func (ctx *TestContext) testDeleteServices(t *testing.T) {
ctx.Impl.NextTest(t)
ctx.cleanupAll()
entities := ctx.createServiceTestEntities()
ctx.RequireDelete(entities.service1)
ctx.RequireDelete(entities.service2)
}
controller/db/testing.go
+6
View File
@@ -3,12 +3,16 @@ package db
import (
"github.com/google/uuid"
"github.com/michaelquigley/pfxlog"
"github.com/openziti/fabric/controller/xt"
"github.com/openziti/fabric/controller/xt_smartrouting"
"github.com/openziti/foundation/storage/boltz"
"go.etcd.io/bbolt"
"testing"
)
func NewTestContext(t *testing.T) *TestContext {
xt.GlobalRegistry().RegisterFactory(xt_smartrouting.NewFactory())
context := &TestContext{
BaseTestContext: *boltz.NewTestContext(t),
}
@@ -45,6 +49,7 @@ func (ctx *TestContext) Init() {
func (ctx *TestContext) requireNewService() *Service {
entity := &Service{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(entity)
return entity
@@ -53,6 +58,7 @@ func (ctx *TestContext) requireNewService() *Service {
func (ctx *TestContext) requireNewRouter() *Router {
entity := &Router{
BaseExtEntity: boltz.BaseExtEntity{Id: uuid.New().String()},
Name: uuid.New().String(),
}
ctx.RequireCreate(entity)
return entity
controller/handler_mgmt/create_router.go
+1 -1
View File
@@ -42,7 +42,7 @@ func (h *createRouterHandler) HandleReceive(msg *channel2.Message, ch channel2.C
create := &mgmt_pb.CreateRouterRequest{}
if err := proto.Unmarshal(msg.Body, create); err == nil {
r := network.NewRouter(create.Router.Id, create.Router.Fingerprint)
r := network.NewRouter(create.Router.Id, create.Router.Name, create.Router.Fingerprint)
if err := h.network.CreateRouter(r); err == nil {
log.Infof("created router [r/%s] with fingerprint [%s]", r.Id, create.Router.Fingerprint)
handler_common.SendSuccess(msg, ch, "")
controller/handler_mgmt/create_service.go
+4
View File
@@ -41,8 +41,12 @@ func (h *createServiceHandler) HandleReceive(msg *channel2.Message, ch channel2.
cs := &mgmt_pb.CreateServiceRequest{}
err := proto.Unmarshal(msg.Body, cs)
if err == nil {
if cs.Service.Name == "" {
cs.Service.Name = cs.Service.Id
}
service := &network.Service{
BaseEntity: models.BaseEntity{Id: cs.Service.Id},
Name: cs.Service.Name,
TerminatorStrategy: cs.Service.TerminatorStrategy,
}
for _, terminator := range cs.Service.Terminators {
controller/handler_mgmt/get_service.go
+1
View File
@@ -72,6 +72,7 @@ func toApiService(s *network.Service) *mgmt_pb.Service {
return &mgmt_pb.Service{
Id: s.Id,
Name: s.Name,
TerminatorStrategy: s.TerminatorStrategy,
Terminators: terminators,
}
controller/handler_mgmt/get_terminator.go
+3 -2
View File
@@ -56,8 +56,9 @@ func (h *getTerminatorHandler) HandleReceive(msg *channel2.Message, ch channel2.
if err == nil {
responseMsg := channel2.NewMessage(int32(mgmt_pb.ContentType_GetTerminatorResponseType), body)
responseMsg.ReplyTo(msg)
ch.Send(responseMsg)
if err = ch.Send(responseMsg); err != nil {
pfxlog.ContextLogger(ch.Label()).Errorf("unexpected error (%s)", err)
}
} else {
pfxlog.ContextLogger(ch.Label()).Errorf("unexpected error (%s)", err)
}
controller/handler_mgmt/list_routers.go
+1
View File
@@ -58,6 +58,7 @@ func (h *listRoutersHandler) HandleReceive(msg *channel2.Message, ch channel2.Ch
responseR := &mgmt_pb.Router{
Id: router.Id,
Name: router.Name,
Fingerprint: stringz.OrEmpty(router.Fingerprint),
}
controller/network/link_controller_test.go
+2 -2
View File
@@ -25,8 +25,8 @@ import (
func TestLifecycle(t *testing.T) {
linkController := newLinkController()
r0 := NewRouter("r0", "")
r1 := NewRouter("r1", "")
r0 := NewRouter("r0", "", "")
r1 := NewRouter("r1", "", "")
l0 := &Link{
Id: &identity.TokenId{Token: "l0"},
Src: r0,
controller/network/router.go
+8 -1
View File
@@ -30,6 +30,7 @@ import (
type Router struct {
models.BaseEntity
Name string
Fingerprint *string
AdvertisedListener string
Control channel2.Channel
@@ -42,6 +43,7 @@ func (entity *Router) fillFrom(_ Controller, _ *bbolt.Tx, boltEntity boltz.Entit
if !ok {
return errors.Errorf("unexpected type %v when filling model router", reflect.TypeOf(boltEntity))
}
entity.Name = boltRouter.Name
entity.Fingerprint = boltRouter.Fingerprint
entity.FillCommon(boltRouter)
return nil
@@ -50,13 +52,18 @@ func (entity *Router) fillFrom(_ Controller, _ *bbolt.Tx, boltEntity boltz.Entit
func (entity *Router) toBolt() *db.Router {
return &db.Router{
BaseExtEntity: *boltz.NewExtEntity(entity.Id, entity.Tags),
Name: entity.Name,
Fingerprint: entity.Fingerprint,
}
}
func NewRouter(id, fingerprint string) *Router {
func NewRouter(id, name, fingerprint string) *Router {
if name == "" {
name = id
}
return &Router{
BaseEntity: models.BaseEntity{Id: id},
Name: name,
Fingerprint: &fingerprint,
}
}
controller/network/service.go
+3
View File
@@ -29,6 +29,7 @@ import (
type Service struct {
models.BaseEntity
Name string
TerminatorStrategy string
Terminators []*Terminator
}
@@ -38,6 +39,7 @@ func (entity *Service) fillFrom(ctrl Controller, tx *bbolt.Tx, boltEntity boltz.
if !ok {
return errors.Errorf("unexpected type %v when filling model service", reflect.TypeOf(boltEntity))
}
entity.Name = boltService.Name
entity.TerminatorStrategy = boltService.TerminatorStrategy
entity.FillCommon(boltService)
@@ -54,6 +56,7 @@ func (entity *Service) fillFrom(ctrl Controller, tx *bbolt.Tx, boltEntity boltz.
func (entity *Service) toBolt() *db.Service {
return &db.Service{
BaseExtEntity: *boltz.NewExtEntity(entity.Id, entity.Tags),
Name: entity.Name,
TerminatorStrategy: entity.TerminatorStrategy,
}
}
pb/mgmt_pb/mgmt.pb.go
+147 -130
View File
@@ -274,8 +274,9 @@ func (TraceFilterType) EnumDescriptor() ([]byte, []int) {
type Service struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
TerminatorStrategy string `protobuf:"bytes,2,opt,name=terminatorStrategy,proto3" json:"terminatorStrategy,omitempty"`
Terminators []*Terminator `protobuf:"bytes,3,rep,name=terminators,proto3" json:"terminators,omitempty"`
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
TerminatorStrategy string `protobuf:"bytes,3,opt,name=terminatorStrategy,proto3" json:"terminatorStrategy,omitempty"`
Terminators []*Terminator `protobuf:"bytes,4,rep,name=terminators,proto3" json:"terminators,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -313,6 +314,13 @@ func (m *Service) GetId() string {
return ""
}
func (m *Service) GetName() string {
if m != nil {
return m.Name
}
return ""
}
func (m *Service) GetTerminatorStrategy() string {
if m != nil {
return m.TerminatorStrategy
@@ -956,9 +964,10 @@ func (m *SetTerminatorCostRequest) GetUpdateMask() int32 {
type Router struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"`
Fingerprint string `protobuf:"bytes,2,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
ListenerAddress string `protobuf:"bytes,3,opt,name=listenerAddress,proto3" json:"listenerAddress,omitempty"`
Connected bool `protobuf:"varint,4,opt,name=connected,proto3" json:"connected,omitempty"`
Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"`
Fingerprint string `protobuf:"bytes,3,opt,name=fingerprint,proto3" json:"fingerprint,omitempty"`
ListenerAddress string `protobuf:"bytes,4,opt,name=listenerAddress,proto3" json:"listenerAddress,omitempty"`
Connected bool `protobuf:"varint,5,opt,name=connected,proto3" json:"connected,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@@ -996,6 +1005,13 @@ func (m *Router) GetId() string {
return ""
}
func (m *Router) GetName() string {
if m != nil {
return m.Name
}
return ""
}
func (m *Router) GetFingerprint() string {
if m != nil {
return m.Fingerprint
@@ -2323,129 +2339,130 @@ func init() {
}
var fileDescriptor_24cf82780fd24e73 = []byte{
// 1982 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x73, 0x1c, 0x49,
0x11, 0xa6, 0x67, 0x46, 0x9a, 0x51, 0xea, 0x35, 0x2e, 0xc9, 0xd6, 0xec, 0xec, 0xc3, 0xde, 0x06,
0x02, 0x23, 0xc3, 0x6c, 0x60, 0xf3, 0xf0, 0x2e, 0x21, 0xd8, 0x5d, 0x8d, 0xb4, 0xe1, 0x40, 0xee,
0xf0, 0xb6, 0xe4, 0x0d, 0x82, 0x0b, 0xd1, 0xea, 0x2e, 0x8d, 0x3a, 0x3c, 0xd3, 0x3d, 0x74, 0xf7,
0x78, 0x11, 0x27, 0x82, 0x7f, 0xc0, 0x12, 0x40, 0xf0, 0x3a, 0xf1, 0xba, 0x01, 0x07, 0x0e, 0x0b,
0xcb, 0x63, 0x59, 0x9e, 0x67, 0x0e, 0x04, 0x37, 0xfe, 0x0a, 0x59, 0x59, 0xd5, 0xd5, 0xd5, 0x3d,
0x2d, 0xcb, 0xf6, 0xad, 0x2b, 0xbf, 0xcc, 0xac, 0xac, 0xcc, 0xaa, 0x7c, 0x34, 0xc0, 0x64, 0x34,
0xc9, 0x06, 0xd3, 0x24, 0xce, 0x62, 0xd6, 0x16, 0xdf, 0x5f, 0x9d, 0x1e, 0xf7, 0xaf, 0x8e, 0xe2,
0x78, 0x34, 0xe6, 0x2f, 0x11, 0xf9, 0x78, 0x76, 0xf2, 0x52, 0x16, 0x4e, 0x78, 0x9a, 0x79, 0x93,
0xa9, 0xe4, 0xb4, 0xbf, 0x69, 0x41, 0xfb, 0x90, 0x27, 0x0f, 0x43, 0x9f, 0xb3, 0x35, 0x68, 0x84,
0x41, 0xcf, 0xba, 0x66, 0x5d, 0x5f, 0x72, 0xf1, 0x8b, 0x0d, 0x80, 0x65, 0x3c, 0x99, 0x84, 0x91,
0x97, 0xc5, 0xc9, 0x61, 0x96, 0x78, 0x19, 0x1f, 0x9d, 0xf5, 0x1a, 0x84, 0xd7, 0x20, 0xec, 0x33,
0xb0, 0x5c, 0x50, 0xd3, 0x5e, 0xf3, 0x5a, 0xf3, 0xfa, 0xf2, 0xcd, 0x8d, 0x81, 0xb2, 0x65, 0x70,
0xa4, 0x31, 0xd7, 0xe4, 0xb3, 0xdf, 0x6f, 0x00, 0x14, 0xd8, 0x9c, 0x15, 0xcf, 0xc1, 0x52, 0x2a,
0x0d, 0xbc, 0x13, 0xa8, 0xcd, 0x0b, 0x02, 0xeb, 0x43, 0x27, 0x89, 0x67, 0xa8, 0x0e, 0xc1, 0x26,
0x81, 0x7a, 0xcd, 0x7a, 0xd0, 0x3e, 0x0e, 0xa3, 0x20, 0x8c, 0x46, 0xbd, 0x16, 0x41, 0xf9, 0x52,
0x20, 0x5e, 0x10, 0x24, 0x3c, 0x4d, 0x7b, 0x0b, 0x12, 0x51, 0x4b, 0x76, 0x1b, 0x96, 0xfc, 0x84,
0xe3, 0x79, 0x82, 0xd7, 0xb2, 0xde, 0x22, 0x62, 0xcb, 0x37, 0xfb, 0x03, 0xe9, 0xc4, 0x41, 0xee,
0xc4, 0xc1, 0x51, 0xee, 0x44, 0xb7, 0x60, 0x66, 0x3b, 0xd0, 0x99, 0x72, 0x9e, 0x0c, 0xbd, 0xcc,
0xeb, 0xb5, 0xe9, 0xe8, 0x2f, 0xd6, 0x1c, 0x7d, 0x70, 0x4f, 0xf1, 0xec, 0x45, 0x59, 0x72, 0xe6,
0x6a, 0x91, 0xfe, 0xe7, 0x61, 0xb5, 0x04, 0xb1, 0x2e, 0x34, 0x1f, 0xf0, 0x33, 0x72, 0xc4, 0xaa,
0x2b, 0x3e, 0xd9, 0x26, 0x2c, 0x3c, 0xf4, 0xc6, 0x33, 0x4e, 0x5e, 0x58, 0x71, 0xe5, 0xe2, 0x95,
0xc6, 0x6d, 0xcb, 0xbe, 0x01, 0x1b, 0x07, 0x61, 0x9a, 0xa9, 0x40, 0xa6, 0x2e, 0xff, 0xda, 0x0c,
0x0d, 0x14, 0x02, 0xf8, 0x91, 0x9c, 0x29, 0x6f, 0xca, 0x85, 0x3d, 0x84, 0xcd, 0x32, 0x73, 0x3a,
0x8d, 0xa3, 0x94, 0xb3, 0x4f, 0x40, 0x47, 0xf9, 0x35, 0x45, 0x01, 0x71, 0x80, 0xae, 0x3e, 0x80,
0x62, 0x76, 0x35, 0x87, 0xfd, 0x3a, 0x6c, 0xee, 0xd2, 0xd9, 0x73, 0x48, 0xed, 0xb9, 0x0d, 0x6d,
0xc5, 0x43, 0xbb, 0xd6, 0x29, 0xc9, 0x19, 0xec, 0x4f, 0xc3, 0xa6, 0xcb, 0x27, 0xf1, 0xc3, 0xaa,
0x8e, 0x52, 0xc8, 0xad, 0x4a, 0xc8, 0xed, 0x4f, 0xc1, 0xa5, 0x37, 0x78, 0xf6, 0x44, 0x22, 0xaf,
0x02, 0x33, 0x45, 0xd4, 0x81, 0x9f, 0xc4, 0xd4, 0x01, 0x5c, 0x11, 0x4e, 0x2b, 0x02, 0x79, 0x81,
0x93, 0xef, 0xc1, 0xd6, 0x1c, 0xbf, 0xda, 0xb6, 0xf2, 0x4c, 0xac, 0xc7, 0x7c, 0x26, 0x0e, 0x6c,
0x49, 0x87, 0x1b, 0x0c, 0xca, 0x84, 0x5b, 0x00, 0x05, 0xa7, 0x3a, 0x4b, 0xad, 0x42, 0x83, 0xcd,
0xde, 0x81, 0x2d, 0xe9, 0xfc, 0x79, 0x7d, 0x36, 0xac, 0x14, 0x8c, 0xda, 0x9f, 0x25, 0x9a, 0xfd,
0x0a, 0x6c, 0xa2, 0x4b, 0x9f, 0x4e, 0xf6, 0x00, 0x2e, 0x57, 0x64, 0x95, 0x6b, 0x9e, 0xea, 0x20,
0xff, 0xb3, 0xa0, 0x77, 0x68, 0xaa, 0xdb, 0x8d, 0xd3, 0xec, 0x09, 0xcc, 0xc1, 0x97, 0x0b, 0xd3,
0x84, 0xfb, 0x3c, 0xe0, 0x91, 0x2f, 0x1f, 0xd7, 0xda, 0xcd, 0xe7, 0x6b, 0x76, 0xbd, 0xa7, 0x99,
0x5c, 0x43, 0x80, 0xbd, 0x00, 0x80, 0xc9, 0x20, 0x0b, 0x7d, 0xb1, 0x2f, 0x25, 0xa1, 0x55, 0xd7,
0xa0, 0xb0, 0x6b, 0xb0, 0x1c, 0x9c, 0x45, 0xde, 0x44, 0x31, 0xb4, 0x88, 0xc1, 0x24, 0x09, 0x0d,
0xb3, 0x69, 0x80, 0xa1, 0xbd, 0xeb, 0xa5, 0x0f, 0x28, 0x23, 0x2d, 0xb8, 0x06, 0xc5, 0xfe, 0x96,
0x05, 0x8b, 0x2e, 0x65, 0xb5, 0xb9, 0xec, 0x88, 0xca, 0x4f, 0x30, 0xa3, 0xf1, 0x64, 0x9a, 0x84,
0x51, 0xa6, 0xf2, 0xa3, 0x49, 0x62, 0xd7, 0x61, 0x7d, 0x8c, 0x37, 0x91, 0x47, 0x3c, 0x79, 0x4d,
0xe5, 0x3c, 0x99, 0x28, 0xab, 0x64, 0xf1, 0x86, 0xfc, 0x38, 0x8a, 0xb8, 0x8f, 0x09, 0x8d, 0xcc,
0xec, 0xb8, 0x05, 0xc1, 0xde, 0x06, 0x26, 0x6e, 0xb4, 0xb4, 0xe3, 0x82, 0xdb, 0xff, 0xaa, 0xcc,
0x47, 0x9a, 0x57, 0x85, 0xf7, 0xe3, 0xd0, 0x96, 0xc9, 0x39, 0xbf, 0xf5, 0xeb, 0xda, 0xcb, 0x92,
0xd5, 0xcd, 0x71, 0xfb, 0x0b, 0xb0, 0x21, 0x6f, 0xbb, 0x02, 0xd4, 0x76, 0x1f, 0x83, 0x45, 0xc9,
0xa1, 0x2e, 0xc7, 0x9c, 0x02, 0x05, 0x63, 0x92, 0xd8, 0x90, 0xb7, 0xbb, 0x2c, 0x6f, 0x96, 0x0b,
0xab, 0x5c, 0x2e, 0xec, 0x77, 0x2d, 0x68, 0x1d, 0x84, 0xd1, 0x83, 0x39, 0x1f, 0x63, 0x26, 0x4e,
0x13, 0x5f, 0xf9, 0x56, 0x7c, 0x0a, 0x4a, 0xa0, 0x62, 0x8d, 0x94, 0x40, 0xfa, 0x41, 0x84, 0x9c,
0xab, 0x4a, 0x23, 0x17, 0x8c, 0x41, 0x2b, 0x88, 0xdf, 0x8e, 0x28, 0xa4, 0x1d, 0x97, 0xbe, 0x05,
0xcd, 0x17, 0xf7, 0x60, 0x91, 0xc2, 0x4c, 0xdf, 0x74, 0x85, 0x12, 0xff, 0x00, 0x45, 0x22, 0xff,
0x0c, 0xab, 0x87, 0x75, 0xbd, 0xe9, 0x1a, 0x14, 0x81, 0xe3, 0x26, 0x39, 0xde, 0x91, 0x78, 0x41,
0xb1, 0x19, 0x74, 0x85, 0xbf, 0x85, 0xf5, 0x79, 0x64, 0xec, 0xdb, 0x70, 0xc9, 0xa0, 0xa9, 0x08,
0x7c, 0x18, 0x16, 0xc6, 0x82, 0xa0, 0xfc, 0xbf, 0xaa, 0xdd, 0x27, 0xd8, 0x5c, 0x89, 0x89, 0x6c,
0x89, 0xef, 0x49, 0x50, 0xcc, 0x97, 0x74, 0x05, 0x16, 0x05, 0xac, 0x1d, 0xa7, 0x56, 0xfa, 0x3c,
0x8d, 0xe2, 0x3c, 0x86, 0x86, 0x21, 0x1e, 0xf9, 0x31, 0x34, 0x90, 0x97, 0x1a, 0x85, 0x97, 0xec,
0x5b, 0xd0, 0xde, 0x0d, 0x13, 0x7f, 0x16, 0x66, 0x02, 0x9e, 0x7a, 0xd9, 0x29, 0x99, 0xbc, 0xe4,
0xd2, 0xb7, 0x70, 0xb7, 0x3c, 0x47, 0x83, 0x88, 0xca, 0xf0, 0x9f, 0x52, 0x33, 0x93, 0xa6, 0x61,
0x1c, 0xcd, 0x05, 0x11, 0x23, 0xef, 0x8f, 0x43, 0x1e, 0x65, 0xba, 0x8b, 0xd0, 0xeb, 0x72, 0xf1,
0x68, 0x56, 0x5b, 0x8c, 0x6a, 0x0a, 0x69, 0xd5, 0xa4, 0x10, 0x2c, 0x25, 0xbe, 0x34, 0x97, 0x62,
0x6d, 0x96, 0x12, 0x75, 0x0c, 0x37, 0x67, 0xb0, 0x2f, 0xe7, 0xc5, 0x9a, 0x0c, 0xd5, 0xf1, 0xd2,
0x65, 0x39, 0x27, 0x9b, 0x65, 0x59, 0xd2, 0x6a, 0xca, 0x32, 0x01, 0xae, 0xe6, 0xb0, 0xf7, 0x8b,
0x92, 0x2a, 0x21, 0xb3, 0x3e, 0x12, 0xc5, 0xac, 0x8f, 0x8a, 0x20, 0xee, 0x73, 0x14, 0xbf, 0xad,
0x02, 0x20, 0x3e, 0xed, 0xdf, 0x5a, 0xb0, 0x89, 0x8d, 0x1d, 0xf7, 0x26, 0x77, 0x79, 0x96, 0x84,
0xbe, 0x7e, 0xf0, 0x6f, 0x40, 0x67, 0xe2, 0x65, 0xfe, 0x69, 0xf1, 0x88, 0x6f, 0x14, 0xe6, 0xd4,
0x08, 0x0c, 0xe4, 0xf2, 0xae, 0x94, 0x71, 0xb5, 0x70, 0xff, 0x10, 0x56, 0x4b, 0x90, 0x30, 0x11,
0x53, 0x22, 0x96, 0xe7, 0x11, 0xff, 0x7a, 0x6e, 0xa2, 0x26, 0xb0, 0x8f, 0xc0, 0x6a, 0x1a, 0xcf,
0x12, 0x8c, 0xc8, 0x50, 0x72, 0xc8, 0x20, 0x96, 0x89, 0xf6, 0x3b, 0x6d, 0xbc, 0x79, 0xa6, 0x15,
0x7b, 0x0f, 0x31, 0xc4, 0x22, 0xf8, 0x8a, 0x4f, 0x3f, 0xfb, 0x7c, 0x2d, 0x3a, 0x3e, 0xdd, 0x14,
0x93, 0xd2, 0x0b, 0x3a, 0x3e, 0xcd, 0xcc, 0x5e, 0x86, 0x56, 0xe6, 0x8d, 0xf2, 0x46, 0xf7, 0xa3,
0xf5, 0x6e, 0x20, 0x03, 0x06, 0x47, 0xc8, 0x27, 0x3b, 0x3e, 0x12, 0x61, 0x5f, 0x02, 0xc0, 0xdc,
0xac, 0x58, 0xf0, 0x46, 0x3d, 0xc2, 0x8f, 0x52, 0xc1, 0x1d, 0xcd, 0x2d, 0xd5, 0x18, 0xe2, 0xec,
0x4d, 0x58, 0x39, 0x19, 0xc7, 0x9e, 0x56, 0xb7, 0x40, 0xea, 0x3e, 0xf9, 0x28, 0x75, 0xfb, 0x06,
0xbf, 0x54, 0x58, 0x52, 0xc1, 0x8e, 0x60, 0x1d, 0x37, 0xc0, 0x27, 0xe0, 0x8d, 0x73, 0xad, 0x8b,
0xa4, 0x75, 0xfb, 0x02, 0x23, 0x0d, 0x11, 0xb7, 0xaa, 0xa2, 0xff, 0x39, 0x58, 0xd2, 0x8e, 0x30,
0xfb, 0xdb, 0xa5, 0x9a, 0xfe, 0x76, 0xc9, 0xe8, 0x6f, 0xfb, 0x3b, 0xb0, 0x5e, 0x71, 0xc0, 0x45,
0xe2, 0x4d, 0x53, 0xfc, 0x8b, 0x70, 0x69, 0xee, 0xc0, 0x17, 0x29, 0xb0, 0x4c, 0x05, 0xef, 0x35,
0x60, 0xad, 0x7c, 0x38, 0x91, 0x95, 0xc4, 0xe5, 0x54, 0xf2, 0xf4, 0xcd, 0xf6, 0xa1, 0x9b, 0x1f,
0xf9, 0x30, 0xf3, 0x92, 0xec, 0xfe, 0xd1, 0xee, 0x63, 0xdc, 0xa8, 0x39, 0x19, 0xf6, 0x3a, 0xac,
0xe5, 0xb4, 0xbd, 0x28, 0x10, 0x5a, 0x9a, 0x17, 0x6a, 0xa9, 0x48, 0x30, 0x07, 0x16, 0xc9, 0xfe,
0xfc, 0x76, 0x7d, 0xf6, 0xf1, 0x03, 0x37, 0x78, 0x8b, 0x04, 0xe5, 0xbd, 0x50, 0x5a, 0xfa, 0x2f,
0xc3, 0xb2, 0x41, 0xbe, 0xc8, 0x7b, 0x2d, 0x73, 0x3a, 0xd9, 0x82, 0xcb, 0x72, 0xcf, 0x6a, 0xca,
0xfb, 0xaf, 0x05, 0x1b, 0x65, 0x44, 0x3e, 0xd7, 0x1d, 0x58, 0xe2, 0xe2, 0xe3, 0xe8, 0x6c, 0x2a,
0x1d, 0xbc, 0x76, 0xf3, 0x6a, 0xc5, 0x7c, 0x25, 0xb0, 0x97, 0xb3, 0xb9, 0x85, 0x44, 0x39, 0xd7,
0x35, 0xaa, 0xb9, 0xce, 0x2c, 0x04, 0xcd, 0x47, 0x15, 0x82, 0x56, 0xb5, 0x10, 0x3c, 0x49, 0x92,
0xff, 0x06, 0xf4, 0x8f, 0xe2, 0x11, 0xc6, 0x4a, 0x19, 0x7a, 0x94, 0x78, 0xc6, 0x60, 0x86, 0x95,
0x90, 0x47, 0xde, 0xf1, 0x58, 0x9e, 0xae, 0xe3, 0xaa, 0x95, 0x28, 0x35, 0x69, 0x3e, 0xa4, 0x14,
0x39, 0xae, 0x44, 0x13, 0x1d, 0x9f, 0xb4, 0x57, 0xb2, 0xc8, 0x23, 0x98, 0x24, 0xfb, 0x07, 0xda,
0xad, 0xe5, 0x5d, 0x31, 0x85, 0xca, 0x7d, 0x82, 0xfd, 0x70, 0x9c, 0xf7, 0x50, 0x1d, 0xb7, 0x4c,
0xc4, 0x7c, 0x08, 0x27, 0xf4, 0x45, 0xde, 0x97, 0xdd, 0x70, 0xaf, 0xe8, 0x86, 0x85, 0xc6, 0x7d,
0x8d, 0xbb, 0x06, 0xaf, 0xb0, 0x1e, 0xdb, 0xc5, 0x4c, 0x85, 0x41, 0xe6, 0xc5, 0x05, 0xb7, 0x44,
0xb3, 0xdf, 0x12, 0x0f, 0x29, 0x9d, 0x62, 0x4b, 0x69, 0xb4, 0x64, 0xde, 0x74, 0x6a, 0x66, 0x7d,
0xbd, 0x16, 0xbd, 0x6b, 0x22, 0xd9, 0x78, 0x20, 0x6f, 0x9f, 0x2a, 0xf8, 0x55, 0xb2, 0xfd, 0x6f,
0x4b, 0xa4, 0x08, 0xa5, 0x58, 0x55, 0x4e, 0x9c, 0xf2, 0xd3, 0x99, 0xef, 0x8b, 0x8e, 0x57, 0x9e,
0x34, 0x5f, 0x92, 0xff, 0x93, 0x44, 0x4c, 0x5f, 0x52, 0x9d, 0x5a, 0xe1, 0xc5, 0xcb, 0x1f, 0x4d,
0x35, 0xa7, 0x57, 0x74, 0xe7, 0x6b, 0xda, 0x5d, 0xbf, 0x11, 0x07, 0x56, 0x4c, 0xba, 0x78, 0x12,
0x78, 0x14, 0x5d, 0x73, 0xe4, 0x42, 0x67, 0x8e, 0x86, 0x91, 0x39, 0xf4, 0xe3, 0x69, 0x1a, 0xa9,
0x6f, 0xfb, 0x83, 0x0e, 0x2c, 0xef, 0x16, 0xde, 0x63, 0x1d, 0x68, 0x7d, 0x85, 0x27, 0x71, 0xf7,
0x43, 0x78, 0x51, 0xb7, 0x6a, 0x06, 0x7e, 0xc1, 0xd4, 0xfd, 0xb6, 0xc3, 0x9e, 0x87, 0x5e, 0xdd,
0x84, 0x4f, 0xf0, 0x3b, 0x04, 0xd7, 0x8d, 0xee, 0x04, 0x7f, 0x87, 0xe0, 0xba, 0xa9, 0x9c, 0xe0,
0xef, 0x3a, 0x18, 0xaf, 0xcb, 0x73, 0xe3, 0x37, 0x61, 0xdf, 0x73, 0xd8, 0xb3, 0x70, 0x65, 0x7e,
0xce, 0x26, 0xf0, 0xfb, 0x0e, 0x5e, 0xdc, 0x67, 0xcf, 0x19, 0x60, 0x89, 0xe3, 0x03, 0xe2, 0x38,
0x67, 0x24, 0x25, 0x8e, 0xbf, 0x3a, 0xec, 0x2a, 0xf4, 0xeb, 0xc7, 0x70, 0x62, 0xf8, 0x1b, 0xa9,
0x38, 0x67, 0xee, 0x26, 0x8e, 0xbf, 0xd3, 0xf1, 0xea, 0x06, 0x57, 0x82, 0xff, 0xe1, 0x60, 0xab,
0xfd, 0x4c, 0xed, 0x6c, 0x4a, 0xf8, 0x3f, 0x1d, 0xf6, 0x22, 0x3c, 0x77, 0xde, 0xb0, 0x49, 0x2c,
0xff, 0x22, 0x2f, 0xcc, 0x4f, 0x4a, 0x04, 0xfe, 0xd0, 0xc9, 0x23, 0x57, 0x19, 0x8d, 0x08, 0xfd,
0x11, 0xa1, 0x35, 0x63, 0x0f, 0xa1, 0x3f, 0x26, 0xb4, 0x66, 0xa8, 0x21, 0xf4, 0x27, 0x0e, 0x7b,
0x46, 0x36, 0x90, 0xe6, 0x10, 0x40, 0xd0, 0xcf, 0x28, 0x66, 0x73, 0xb3, 0x00, 0x61, 0x3f, 0x27,
0x6b, 0xe7, 0xbb, 0x7d, 0x02, 0x7f, 0x61, 0x82, 0x46, 0x23, 0x4f, 0xe0, 0x2f, 0x9d, 0xe2, 0x12,
0x96, 0xb2, 0x3a, 0xa1, 0xbf, 0x32, 0x2e, 0x61, 0xb9, 0x9f, 0x25, 0xf8, 0xd7, 0xa5, 0x5b, 0x66,
0x36, 0xaa, 0x04, 0xff, 0x86, 0xe0, 0xba, 0x6e, 0x92, 0xe0, 0x77, 0xa5, 0x5d, 0x73, 0x65, 0x8c,
0xc0, 0xdf, 0x51, 0x08, 0x6b, 0xeb, 0x0d, 0xe1, 0xbf, 0x27, 0xbb, 0x6b, 0xaa, 0x0e, 0xa1, 0xef,
0xd1, 0x0d, 0x92, 0x99, 0xfb, 0x5e, 0x38, 0xe5, 0xa5, 0x04, 0x4a, 0x1c, 0x7f, 0x70, 0x70, 0x88,
0x7a, 0xe1, 0xfc, 0xdc, 0x4e, 0x4c, 0x7f, 0x34, 0x36, 0x99, 0x47, 0xff, 0x44, 0x01, 0x31, 0xd1,
0xc2, 0x80, 0x3f, 0x3b, 0x6c, 0x0b, 0x58, 0x39, 0x45, 0x12, 0xf0, 0xbe, 0x83, 0xf9, 0x6c, 0xa3,
0x92, 0x86, 0x08, 0xf9, 0x8b, 0x54, 0x17, 0x79, 0xd3, 0xf4, 0x34, 0xce, 0x86, 0xc7, 0xa6, 0xd4,
0x7f, 0x9c, 0xed, 0x1d, 0xd8, 0xac, 0xfb, 0x85, 0xc1, 0x96, 0xa1, 0x3d, 0xe4, 0x27, 0xde, 0x6c,
0x9c, 0x61, 0x3e, 0x59, 0x81, 0x8e, 0x10, 0x0b, 0x13, 0x1e, 0x74, 0x2d, 0x06, 0xb0, 0xb8, 0xef,
0x85, 0x58, 0x12, 0xba, 0x8d, 0xed, 0x37, 0x4d, 0xf1, 0xdd, 0x53, 0x2f, 0x1a, 0xd1, 0x3f, 0x09,
0x91, 0x8b, 0x9c, 0x38, 0xe2, 0x28, 0xbb, 0x06, 0x70, 0xa8, 0xff, 0x76, 0xa0, 0x34, 0xae, 0x8b,
0x6d, 0xba, 0x0d, 0xb6, 0x0e, 0xcb, 0xc3, 0xe2, 0x67, 0x47, 0xb7, 0xb5, 0x7d, 0x9a, 0x07, 0xaf,
0x5a, 0xc4, 0x31, 0x35, 0xae, 0x29, 0x9a, 0x7c, 0x05, 0x01, 0xaa, 0x2f, 0x68, 0x43, 0x3e, 0xe6,
0x19, 0x19, 0x58, 0xd0, 0x70, 0xa7, 0x14, 0xa5, 0x71, 0x1b, 0xa4, 0xa9, 0x2a, 0x7c, 0x9f, 0xfe,
0x9c, 0x04, 0xdd, 0xe6, 0xf6, 0x0d, 0x58, 0xaf, 0x14, 0x2c, 0x71, 0xec, 0xbd, 0x2f, 0xef, 0x1e,
0xdc, 0x1f, 0xee, 0xa1, 0x6e, 0x5c, 0xdc, 0x71, 0xe4, 0xc2, 0x3a, 0x5e, 0xa4, 0xae, 0xea, 0xd6,
0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xb4, 0x22, 0x38, 0x59, 0x49, 0x17, 0x00, 0x00,
// 1985 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x58, 0x4b, 0x73, 0x24, 0x47,
0x11, 0xa6, 0x67, 0x46, 0x33, 0xa3, 0xd4, 0x6b, 0xb6, 0xa4, 0x5d, 0x8d, 0xc7, 0x8f, 0x5d, 0x37,
0x10, 0x2c, 0x5a, 0x18, 0x07, 0xbb, 0x3c, 0xd6, 0x26, 0x04, 0xb6, 0x35, 0x92, 0x63, 0x03, 0x6d,
0xc7, 0xba, 0xa5, 0x75, 0x10, 0x5c, 0x88, 0x56, 0x4f, 0x69, 0xd4, 0xb1, 0x33, 0xdd, 0x43, 0x77,
0xcf, 0x1a, 0xf1, 0x2f, 0x30, 0x60, 0x82, 0xd7, 0x89, 0xd7, 0x0d, 0x38, 0x70, 0x30, 0x98, 0x87,
0x31, 0xcf, 0x33, 0x07, 0x82, 0x1b, 0x7f, 0x85, 0xac, 0xac, 0xea, 0xea, 0xea, 0x9e, 0xd6, 0x4a,
0xda, 0x5b, 0x57, 0x7e, 0x99, 0x59, 0x59, 0x99, 0x55, 0xf9, 0x68, 0x80, 0xc9, 0x68, 0x92, 0xf6,
0xa7, 0x71, 0x94, 0x46, 0xac, 0x25, 0xbe, 0xbf, 0x3e, 0x3d, 0xea, 0x5d, 0x1f, 0x45, 0xd1, 0x68,
0xcc, 0x5f, 0x22, 0xf2, 0xd1, 0xec, 0xf8, 0xa5, 0x34, 0x98, 0xf0, 0x24, 0xf5, 0x26, 0x53, 0xc9,
0x69, 0x7f, 0xd7, 0x82, 0xd6, 0x01, 0x8f, 0x1f, 0x07, 0x3e, 0x67, 0xab, 0x50, 0x0b, 0x86, 0x5d,
0xeb, 0x86, 0x75, 0x73, 0xd1, 0xc5, 0x2f, 0xc6, 0xa0, 0x11, 0x7a, 0x13, 0xde, 0xad, 0x11, 0x85,
0xbe, 0x59, 0x1f, 0x58, 0xca, 0xe3, 0x49, 0x10, 0x7a, 0x69, 0x14, 0x1f, 0xa4, 0xb1, 0x97, 0xf2,
0xd1, 0x69, 0xb7, 0x4e, 0x1c, 0x15, 0x08, 0xfb, 0x1c, 0x2c, 0xe5, 0xd4, 0xa4, 0xdb, 0xb8, 0x51,
0xbf, 0xb9, 0x74, 0x7b, 0xbd, 0xaf, 0xec, 0xeb, 0x1f, 0x6a, 0xcc, 0x35, 0xf9, 0xec, 0x0f, 0x6a,
0x00, 0x39, 0x36, 0x67, 0xd9, 0x73, 0xb0, 0x98, 0x48, 0xa3, 0xef, 0x0d, 0x95, 0x79, 0x39, 0x81,
0xf5, 0xa0, 0x1d, 0x47, 0x33, 0x54, 0x87, 0xa0, 0xb4, 0x4c, 0xaf, 0x59, 0x17, 0x5a, 0x47, 0x41,
0x38, 0x0c, 0xc2, 0x11, 0xda, 0x22, 0xa0, 0x6c, 0x29, 0x10, 0x6f, 0x38, 0x8c, 0x79, 0x92, 0x74,
0x17, 0x24, 0xa2, 0x96, 0xec, 0x2e, 0x2c, 0xfa, 0x31, 0xc7, 0xf3, 0x0c, 0x5f, 0x4b, 0xbb, 0x4d,
0xc4, 0x96, 0x6e, 0xf7, 0xfa, 0xd2, 0xb1, 0xfd, 0xcc, 0xb1, 0xfd, 0xc3, 0xcc, 0xb1, 0x6e, 0xce,
0xcc, 0xb6, 0xa1, 0x3d, 0xe5, 0x3c, 0x1e, 0x78, 0xa9, 0xd7, 0x6d, 0xd1, 0xd1, 0x5f, 0xac, 0x38,
0x7a, 0xff, 0x81, 0xe2, 0xd9, 0x0d, 0xd3, 0xf8, 0xd4, 0xd5, 0x22, 0xbd, 0x2f, 0xc2, 0x4a, 0x01,
0x62, 0x1d, 0xa8, 0x3f, 0xe2, 0xa7, 0xe4, 0x88, 0x15, 0x57, 0x7c, 0xb2, 0x0d, 0x58, 0x78, 0xec,
0x8d, 0x67, 0x32, 0x48, 0xcb, 0xae, 0x5c, 0xbc, 0x52, 0xbb, 0x6b, 0xd9, 0xb7, 0x60, 0x7d, 0x3f,
0x48, 0x52, 0x15, 0xdc, 0xc4, 0xe5, 0xdf, 0x98, 0xa1, 0x81, 0x42, 0x00, 0x3f, 0xe2, 0x53, 0xe5,
0x4d, 0xb9, 0xb0, 0x07, 0xb0, 0x51, 0x64, 0x4e, 0xa6, 0x51, 0x98, 0x70, 0xf6, 0x29, 0x68, 0x2b,
0xbf, 0x26, 0x28, 0x20, 0x0e, 0xd0, 0xd1, 0x07, 0x50, 0xcc, 0xae, 0xe6, 0xb0, 0x5f, 0x87, 0x8d,
0x1d, 0x3a, 0x7b, 0x06, 0xa9, 0x3d, 0xb7, 0xa0, 0xa5, 0x78, 0x68, 0xd7, 0x2a, 0x25, 0x19, 0x83,
0xfd, 0x59, 0xd8, 0x70, 0xf9, 0x24, 0x7a, 0x5c, 0xd6, 0x51, 0x08, 0xb9, 0x55, 0x0a, 0xb9, 0xfd,
0x19, 0xb8, 0xf2, 0x06, 0x4f, 0x2f, 0x25, 0xf2, 0x2a, 0x30, 0x53, 0x44, 0x1d, 0xf8, 0x32, 0xa6,
0xf6, 0xe1, 0x9a, 0x70, 0x5a, 0x1e, 0xc8, 0x73, 0x9c, 0xfc, 0x00, 0x36, 0xe7, 0xf8, 0xd5, 0xb6,
0xa5, 0x67, 0x62, 0x5d, 0xf0, 0x99, 0x38, 0xb0, 0x29, 0x1d, 0x6e, 0x30, 0x28, 0x13, 0xee, 0x00,
0xe4, 0x9c, 0xea, 0x2c, 0x95, 0x0a, 0x0d, 0x36, 0x7b, 0x1b, 0x36, 0xa5, 0xf3, 0xe7, 0xf5, 0xd9,
0xb0, 0x9c, 0x33, 0x6a, 0x7f, 0x16, 0x68, 0xf6, 0x2b, 0xb0, 0x81, 0x2e, 0x7d, 0x3a, 0xd9, 0x7d,
0xb8, 0x5a, 0x92, 0x55, 0xae, 0x79, 0xaa, 0x83, 0xfc, 0xcf, 0x82, 0xee, 0x81, 0xa9, 0x6e, 0x27,
0x4a, 0xd2, 0x4b, 0x98, 0x83, 0x2f, 0x17, 0xa6, 0x31, 0xf7, 0xf9, 0x90, 0x87, 0xbe, 0x7c, 0x5c,
0xab, 0xb7, 0x9f, 0xaf, 0xd8, 0xf5, 0x81, 0x66, 0x72, 0x0d, 0x01, 0xf6, 0x02, 0x00, 0x26, 0x83,
0x34, 0xf0, 0xc5, 0xbe, 0x94, 0x84, 0x56, 0x5c, 0x83, 0xc2, 0x6e, 0xc0, 0xd2, 0xf0, 0x14, 0x13,
0xaa, 0x62, 0x68, 0x10, 0x83, 0x49, 0x12, 0x1a, 0x66, 0xd3, 0x21, 0x86, 0xf6, 0xbe, 0x97, 0x3c,
0xa2, 0x8c, 0xb4, 0xe0, 0x1a, 0x14, 0xfb, 0x5d, 0x0b, 0x9a, 0x2e, 0x65, 0xb5, 0x0b, 0xe5, 0x6d,
0xdc, 0xf0, 0x18, 0xb3, 0x1c, 0x8f, 0xa7, 0x71, 0x10, 0xa6, 0x2a, 0x2d, 0x9a, 0x24, 0x76, 0x13,
0xd6, 0xc6, 0x78, 0x3b, 0x79, 0xc8, 0xe3, 0xd7, 0x54, 0x1e, 0x94, 0x19, 0xb2, 0x4c, 0x16, 0xef,
0xca, 0x8f, 0xc2, 0x90, 0xfb, 0x98, 0xe4, 0xc8, 0xb2, 0xb6, 0x9b, 0x13, 0xec, 0x2d, 0x60, 0xe2,
0x96, 0x4b, 0xdb, 0xce, 0x79, 0x11, 0xaf, 0xca, 0x1c, 0xa5, 0x79, 0x55, 0xc8, 0x3f, 0x09, 0x2d,
0x99, 0xb0, 0xb3, 0x97, 0xb0, 0xa6, 0x3d, 0x2f, 0x59, 0xdd, 0x0c, 0xb7, 0xbf, 0x04, 0xeb, 0xf2,
0x05, 0x28, 0x40, 0x6d, 0xf7, 0x09, 0x68, 0x4a, 0x0e, 0x75, 0x61, 0xe6, 0x14, 0x28, 0x18, 0x13,
0xc7, 0xba, 0xbc, 0xf1, 0x45, 0x79, 0xb3, 0x84, 0x58, 0xc5, 0x12, 0x62, 0xbf, 0x67, 0x41, 0x63,
0x3f, 0x08, 0x1f, 0xcd, 0xf9, 0x1d, 0xb3, 0x73, 0x12, 0xfb, 0xca, 0xed, 0xe2, 0x53, 0x50, 0x86,
0x49, 0xe6, 0x6d, 0xf1, 0x29, 0xfc, 0x20, 0xae, 0x01, 0x57, 0xbe, 0x95, 0x0b, 0x11, 0xb1, 0x61,
0xf4, 0x76, 0xa8, 0x9c, 0x49, 0xdf, 0x82, 0xe6, 0x8b, 0xbb, 0xd1, 0xa4, 0xd0, 0xd3, 0x37, 0x5d,
0xab, 0xd8, 0xdf, 0x47, 0x91, 0xd0, 0x3f, 0xc5, 0x8a, 0x62, 0xdd, 0xac, 0xbb, 0x06, 0x45, 0xe0,
0xb8, 0x49, 0x86, 0xb7, 0x25, 0x9e, 0x53, 0x6c, 0x06, 0x1d, 0xe1, 0x6f, 0x61, 0x7d, 0x16, 0x19,
0xfb, 0x2e, 0x5c, 0x31, 0x68, 0x2a, 0x02, 0x1f, 0x85, 0x85, 0xb1, 0x20, 0x28, 0xff, 0xaf, 0x68,
0xf7, 0x09, 0x36, 0x57, 0x62, 0x22, 0x83, 0xe2, 0x1b, 0x13, 0x14, 0xf3, 0x75, 0x5d, 0x83, 0xa6,
0x80, 0xb5, 0xe3, 0xd4, 0x4a, 0x9f, 0xa7, 0x96, 0x9f, 0xc7, 0xd0, 0x30, 0xc0, 0x23, 0x5f, 0x40,
0x03, 0x79, 0xa9, 0x96, 0x7b, 0xc9, 0xbe, 0x03, 0xad, 0x9d, 0x20, 0xf6, 0x67, 0x41, 0x2a, 0xe0,
0xa9, 0x97, 0x9e, 0x90, 0xc9, 0x78, 0xed, 0xc5, 0xb7, 0x70, 0xb7, 0x3c, 0x47, 0x8d, 0x88, 0xca,
0xf0, 0x9f, 0x52, 0xd3, 0x93, 0x24, 0x41, 0x14, 0xce, 0x05, 0x11, 0x23, 0xef, 0x8f, 0x03, 0x1e,
0xa6, 0xba, 0xb3, 0xd0, 0xeb, 0x62, 0x41, 0xa9, 0x97, 0xdb, 0x8e, 0x72, 0x5a, 0x69, 0x54, 0xa4,
0x15, 0x2c, 0x2f, 0xbe, 0x34, 0x97, 0x62, 0x6d, 0x96, 0x17, 0x75, 0x0c, 0x37, 0x63, 0xb0, 0xaf,
0x66, 0x05, 0x9c, 0x0c, 0xd5, 0xf1, 0xd2, 0xa5, 0x3a, 0x23, 0x9b, 0xa5, 0x5a, 0xd2, 0x2a, 0x4a,
0x35, 0x01, 0xae, 0xe6, 0xb0, 0xf7, 0xf2, 0x32, 0x2b, 0x21, 0xb3, 0x66, 0x12, 0xc5, 0xac, 0x99,
0x8a, 0x20, 0xee, 0x73, 0x18, 0xbd, 0xad, 0x02, 0x20, 0x3e, 0xed, 0xdf, 0x5a, 0xb0, 0x81, 0xcd,
0x1e, 0xf7, 0x26, 0xf7, 0x79, 0x1a, 0x07, 0xbe, 0x7e, 0xf0, 0x6f, 0x40, 0x7b, 0xe2, 0xa5, 0xfe,
0x49, 0xfe, 0x88, 0x6f, 0xe5, 0xe6, 0x54, 0x08, 0xf4, 0xe5, 0xf2, 0xbe, 0x94, 0x71, 0xb5, 0x70,
0xef, 0x00, 0x56, 0x0a, 0x90, 0x30, 0x51, 0xa4, 0x34, 0x97, 0x8f, 0xf8, 0x37, 0x33, 0x13, 0x35,
0x81, 0x7d, 0x0c, 0x56, 0x92, 0x68, 0x16, 0x63, 0x44, 0x06, 0x92, 0x43, 0x06, 0xb1, 0x48, 0xb4,
0xdf, 0x69, 0xe1, 0xcd, 0x33, 0xad, 0xd8, 0x7d, 0x8c, 0x21, 0x16, 0xc1, 0x57, 0x7c, 0xfa, 0xd9,
0x67, 0x6b, 0xd1, 0x05, 0xea, 0xe6, 0x99, 0x94, 0x9e, 0xd3, 0x05, 0x6a, 0x66, 0xf6, 0x32, 0x34,
0x52, 0x6f, 0x94, 0xe0, 0x8d, 0x11, 0x6e, 0xf8, 0x78, 0xb5, 0x1b, 0xc8, 0x80, 0xfe, 0x21, 0xf2,
0xc9, 0x2e, 0x90, 0x44, 0xd8, 0x57, 0x00, 0x30, 0x37, 0x2b, 0x16, 0xd5, 0x3d, 0xdf, 0x7a, 0x92,
0x82, 0x7b, 0x9a, 0x5b, 0xaa, 0x31, 0xc4, 0xd9, 0x9b, 0xb0, 0x7c, 0x3c, 0x8e, 0x3c, 0xad, 0x6e,
0x81, 0xd4, 0x7d, 0xfa, 0x49, 0xea, 0xf6, 0x0c, 0x7e, 0xa9, 0xb0, 0xa0, 0x82, 0x1d, 0xc2, 0x1a,
0x6e, 0x80, 0x4f, 0xc0, 0x1b, 0x67, 0x5a, 0x9b, 0xa4, 0x75, 0xeb, 0x1c, 0x23, 0x0d, 0x11, 0xb7,
0xac, 0xa2, 0xf7, 0x05, 0x58, 0xd4, 0x8e, 0x30, 0x7b, 0xde, 0xc5, 0x8a, 0x9e, 0x77, 0xd1, 0xe8,
0x79, 0x7b, 0xdb, 0xb0, 0x56, 0x72, 0xc0, 0x79, 0xe2, 0x75, 0x53, 0xfc, 0xcb, 0x70, 0x65, 0xee,
0xc0, 0xe7, 0x29, 0xb0, 0x4c, 0x05, 0xef, 0xd7, 0x60, 0xb5, 0x78, 0x38, 0x5d, 0x8c, 0x2d, 0xa3,
0x18, 0xef, 0x41, 0x27, 0x3b, 0xf2, 0x41, 0xea, 0xc5, 0xe9, 0xc3, 0xc3, 0x9d, 0x0b, 0xdc, 0xa8,
0x39, 0x19, 0xf6, 0x3a, 0xac, 0x66, 0xb4, 0xdd, 0x70, 0x28, 0xb4, 0xd4, 0xcf, 0xd5, 0x52, 0x92,
0x60, 0x0e, 0x34, 0xc9, 0xfe, 0xec, 0x76, 0x7d, 0xfe, 0xe2, 0x81, 0xeb, 0xbf, 0x45, 0x82, 0xf2,
0x5e, 0x28, 0x2d, 0xbd, 0x97, 0x61, 0xc9, 0x20, 0x9f, 0xe7, 0xbd, 0x86, 0x39, 0xb1, 0x6c, 0xc2,
0x55, 0xb9, 0x67, 0x39, 0xe5, 0xfd, 0xd7, 0x82, 0xf5, 0x22, 0x22, 0x9f, 0xeb, 0x36, 0x2c, 0x72,
0xf1, 0x71, 0x78, 0x3a, 0x95, 0x0e, 0x5e, 0xbd, 0x7d, 0xbd, 0x64, 0xbe, 0x12, 0xd8, 0xcd, 0xd8,
0xdc, 0x5c, 0xa2, 0x98, 0xeb, 0x6a, 0xe5, 0x5c, 0x67, 0x16, 0x82, 0xfa, 0x93, 0x0a, 0x41, 0xa3,
0x5c, 0x08, 0x2e, 0x93, 0xe4, 0xbf, 0x05, 0xbd, 0xc3, 0x68, 0x84, 0xb1, 0x52, 0x86, 0x1e, 0xc6,
0x9e, 0x31, 0xac, 0x61, 0x25, 0xe4, 0xa1, 0x77, 0x34, 0x96, 0xa7, 0x6b, 0xbb, 0x6a, 0x25, 0x4a,
0x4d, 0x92, 0x0d, 0x2e, 0x79, 0x8e, 0x2b, 0xd0, 0x44, 0xc7, 0x27, 0xed, 0x95, 0x2c, 0xaa, 0xe3,
0x33, 0x48, 0xf6, 0x0f, 0xb4, 0x5b, 0x8b, 0xbb, 0x62, 0x0a, 0x95, 0xfb, 0x0c, 0xf7, 0x82, 0x71,
0xd6, 0x43, 0xb5, 0xdd, 0x22, 0x11, 0xf3, 0x21, 0x1c, 0xd3, 0x17, 0x79, 0x5f, 0x76, 0xc8, 0xdd,
0xbc, 0x43, 0x16, 0x1a, 0xf7, 0x34, 0xee, 0x1a, 0xbc, 0xc2, 0x7a, 0x6c, 0x17, 0x53, 0x15, 0x06,
0x99, 0x17, 0x17, 0xdc, 0x02, 0xcd, 0x7e, 0x4b, 0x3c, 0xa4, 0x64, 0x8a, 0x2d, 0xa5, 0xd1, 0x92,
0x79, 0xd3, 0xa9, 0x99, 0xf5, 0xf5, 0x5a, 0xf4, 0xae, 0xb1, 0x64, 0xe3, 0x43, 0x79, 0xfb, 0x54,
0xc1, 0x2f, 0x93, 0xed, 0x7f, 0x5b, 0x22, 0x45, 0x28, 0xc5, 0xaa, 0x72, 0xe2, 0xe4, 0x9f, 0xcc,
0x7c, 0x5f, 0x74, 0xbc, 0xf2, 0xa4, 0xd9, 0x92, 0xfc, 0x1f, 0xc7, 0x62, 0x22, 0x93, 0xea, 0xd4,
0x0a, 0x2f, 0x5e, 0xf6, 0x68, 0xca, 0x39, 0xbd, 0xa4, 0x3b, 0x5b, 0xd3, 0xee, 0xfa, 0x8d, 0x38,
0xb0, 0x6c, 0xd2, 0xc5, 0x93, 0xc0, 0xa3, 0xe8, 0x9a, 0x23, 0x17, 0x95, 0x6d, 0xbc, 0x7e, 0x3c,
0x75, 0x23, 0xf5, 0x6d, 0x7d, 0xd8, 0x86, 0xa5, 0x9d, 0xdc, 0x7b, 0xac, 0x0d, 0x8d, 0xaf, 0xf1,
0x38, 0xea, 0x7c, 0x04, 0x2f, 0xea, 0x66, 0xc5, 0x4f, 0x00, 0xc1, 0xd4, 0xf9, 0xb6, 0xc3, 0x9e,
0x87, 0x6e, 0xd5, 0xd4, 0x4f, 0xf0, 0x3b, 0x04, 0x57, 0x8d, 0xf3, 0x04, 0x7f, 0x87, 0xe0, 0xaa,
0x49, 0x9d, 0xe0, 0xef, 0x39, 0x18, 0xaf, 0xab, 0x73, 0x23, 0x39, 0x61, 0xef, 0x3a, 0xec, 0x59,
0xb8, 0x36, 0x3f, 0x7b, 0x13, 0xf8, 0x7d, 0x07, 0x2f, 0xee, 0xb3, 0x67, 0x0c, 0xb5, 0xc4, 0xf1,
0x21, 0x71, 0x9c, 0x31, 0xa6, 0x12, 0xc7, 0x5f, 0x1d, 0x76, 0x1d, 0x7a, 0xd5, 0xa3, 0x39, 0x31,
0xfc, 0x8d, 0x54, 0x9c, 0x31, 0x8b, 0x13, 0xc7, 0xdf, 0xe9, 0x78, 0x55, 0xc3, 0x2c, 0xc1, 0xff,
0x70, 0xb0, 0xd5, 0x7e, 0xa6, 0x72, 0x5e, 0x25, 0xfc, 0x9f, 0x0e, 0x7b, 0x11, 0x9e, 0x3b, 0x6b,
0x00, 0x25, 0x96, 0x7f, 0x91, 0x17, 0xe6, 0x27, 0x25, 0x02, 0x7f, 0xe8, 0x64, 0x91, 0x2b, 0x8d,
0x46, 0x84, 0xfe, 0x88, 0xd0, 0x8a, 0xb1, 0x87, 0xd0, 0x1f, 0x13, 0x5a, 0x31, 0xd4, 0x10, 0xfa,
0x13, 0x87, 0x3d, 0x23, 0x1b, 0x48, 0x73, 0x08, 0x20, 0xe8, 0x67, 0x14, 0xb3, 0xb9, 0x59, 0x80,
0xb0, 0x9f, 0x93, 0xb5, 0xf3, 0xdd, 0x3e, 0x81, 0xbf, 0x30, 0x41, 0xa3, 0x91, 0x27, 0xf0, 0x97,
0x4e, 0x7e, 0x09, 0x0b, 0x59, 0x9d, 0xd0, 0x5f, 0x19, 0x97, 0xb0, 0xd8, 0xcf, 0x12, 0xfc, 0xeb,
0xc2, 0x2d, 0x33, 0x1b, 0x55, 0x82, 0x7f, 0x43, 0x70, 0x55, 0x37, 0x49, 0xf0, 0x7b, 0xd2, 0xae,
0xb9, 0x32, 0x46, 0xe0, 0xef, 0x28, 0x84, 0x95, 0xf5, 0x86, 0xf0, 0xdf, 0x93, 0xdd, 0x15, 0x55,
0x87, 0xd0, 0xf7, 0xe9, 0x06, 0xc9, 0xcc, 0xfd, 0x20, 0x98, 0xf2, 0x42, 0x02, 0x25, 0x8e, 0x3f,
0x38, 0x38, 0x44, 0xbd, 0x70, 0x76, 0x6e, 0x27, 0xa6, 0x3f, 0x1a, 0x9b, 0xcc, 0xa3, 0x7f, 0xa2,
0x80, 0x98, 0x68, 0x6e, 0xc0, 0x9f, 0x1d, 0xb6, 0x09, 0xac, 0x98, 0x22, 0x09, 0xf8, 0xc0, 0xc1,
0x7c, 0xb6, 0x5e, 0x4a, 0x43, 0x84, 0xfc, 0x45, 0xaa, 0x0b, 0xbd, 0x69, 0x72, 0x12, 0xa5, 0x83,
0x23, 0x53, 0xea, 0x3f, 0xce, 0xd6, 0x36, 0x6c, 0x54, 0xfd, 0xd6, 0x60, 0x4b, 0xd0, 0x1a, 0xf0,
0x63, 0x6f, 0x36, 0x4e, 0x31, 0x9f, 0x2c, 0x43, 0x5b, 0x88, 0x05, 0x31, 0x1f, 0x76, 0x2c, 0x06,
0xd0, 0xdc, 0xf3, 0x02, 0x2c, 0x09, 0x9d, 0xda, 0xd6, 0x9b, 0xa6, 0xf8, 0xce, 0x89, 0x17, 0x8e,
0xe8, 0x3f, 0x85, 0xc8, 0x45, 0x4e, 0x14, 0x72, 0x94, 0x5d, 0x05, 0x38, 0xd0, 0x7f, 0x40, 0x50,
0x1a, 0xd7, 0xf9, 0x36, 0x9d, 0x1a, 0x5b, 0x83, 0xa5, 0x41, 0xfe, 0x03, 0xa4, 0xd3, 0xd8, 0x3a,
0xc9, 0x82, 0x57, 0x2e, 0xe2, 0x98, 0x1a, 0x57, 0x15, 0x4d, 0xbe, 0x82, 0x21, 0xaa, 0xcf, 0x69,
0x03, 0x3e, 0xe6, 0x29, 0x19, 0x98, 0xd3, 0x70, 0xa7, 0x04, 0xa5, 0x71, 0x1b, 0xa4, 0xa9, 0x2a,
0xfc, 0x90, 0xfe, 0xa6, 0x0c, 0x3b, 0xf5, 0xad, 0x5b, 0xb0, 0x56, 0x2a, 0x58, 0xe2, 0xd8, 0xbb,
0x5f, 0xdd, 0xd9, 0x7f, 0x38, 0xd8, 0x45, 0xdd, 0xb8, 0xb8, 0xe7, 0xc8, 0x85, 0x75, 0xd4, 0xa4,
0xae, 0xea, 0xce, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xbe, 0x41, 0x46, 0x71, 0x17, 0x00,
0x00,
}
pb/mgmt_pb/mgmt.proto
+7 -5
View File
@@ -80,8 +80,9 @@ enum TerminatorChangeMask {
message Service {
string id = 1;
string terminatorStrategy = 2;
repeated Terminator terminators = 3;
string name = 2;
string terminatorStrategy = 3;
repeated Terminator terminators = 4;
}
message Terminator {
@@ -157,9 +158,10 @@ message SetTerminatorCostRequest {
message Router {
string id = 1;
string fingerprint = 2;
string listenerAddress = 3;
bool connected = 4;
string name = 2;
string fingerprint = 3;
string listenerAddress = 4;
bool connected = 5;
}
message ListRoutersRequest {