Merge pull request #715 from milosgajdos83/net-debug
Add proto definitions for network introspection.
This commit is contained in:
commit
140c830af1
@ -6,9 +6,16 @@ package go_micro_network
|
|||||||
import (
|
import (
|
||||||
fmt "fmt"
|
fmt "fmt"
|
||||||
proto "github.com/golang/protobuf/proto"
|
proto "github.com/golang/protobuf/proto"
|
||||||
|
proto1 "github.com/micro/go-micro/router/proto"
|
||||||
math "math"
|
math "math"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
import (
|
||||||
|
context "context"
|
||||||
|
client "github.com/micro/go-micro/client"
|
||||||
|
server "github.com/micro/go-micro/server"
|
||||||
|
)
|
||||||
|
|
||||||
// Reference imports to suppress errors if they are not otherwise used.
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
var _ = proto.Marshal
|
var _ = proto.Marshal
|
||||||
var _ = fmt.Errorf
|
var _ = fmt.Errorf
|
||||||
@ -19,3 +26,101 @@ var _ = math.Inf
|
|||||||
// A compilation error at this line likely means your copy of the
|
// A compilation error at this line likely means your copy of the
|
||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
|
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
|
// Reference imports to suppress errors if they are not otherwise used.
|
||||||
|
var _ context.Context
|
||||||
|
var _ client.Option
|
||||||
|
var _ server.Option
|
||||||
|
|
||||||
|
// Client API for Network service
|
||||||
|
|
||||||
|
type NetworkService interface {
|
||||||
|
ListRoutes(ctx context.Context, in *proto1.Request, opts ...client.CallOption) (*proto1.ListResponse, error)
|
||||||
|
ListNodes(ctx context.Context, in *ListRequest, opts ...client.CallOption) (*ListResponse, error)
|
||||||
|
ListNeighbours(ctx context.Context, in *ListRequest, opts ...client.CallOption) (*ListResponse, error)
|
||||||
|
}
|
||||||
|
|
||||||
|
type networkService struct {
|
||||||
|
c client.Client
|
||||||
|
name string
|
||||||
|
}
|
||||||
|
|
||||||
|
func NewNetworkService(name string, c client.Client) NetworkService {
|
||||||
|
if c == nil {
|
||||||
|
c = client.NewClient()
|
||||||
|
}
|
||||||
|
if len(name) == 0 {
|
||||||
|
name = "go.micro.network"
|
||||||
|
}
|
||||||
|
return &networkService{
|
||||||
|
c: c,
|
||||||
|
name: name,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *networkService) ListRoutes(ctx context.Context, in *proto1.Request, opts ...client.CallOption) (*proto1.ListResponse, error) {
|
||||||
|
req := c.c.NewRequest(c.name, "Network.ListRoutes", in)
|
||||||
|
out := new(proto1.ListResponse)
|
||||||
|
err := c.c.Call(ctx, req, out, opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *networkService) ListNodes(ctx context.Context, in *ListRequest, opts ...client.CallOption) (*ListResponse, error) {
|
||||||
|
req := c.c.NewRequest(c.name, "Network.ListNodes", in)
|
||||||
|
out := new(ListResponse)
|
||||||
|
err := c.c.Call(ctx, req, out, opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func (c *networkService) ListNeighbours(ctx context.Context, in *ListRequest, opts ...client.CallOption) (*ListResponse, error) {
|
||||||
|
req := c.c.NewRequest(c.name, "Network.ListNeighbours", in)
|
||||||
|
out := new(ListResponse)
|
||||||
|
err := c.c.Call(ctx, req, out, opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
return out, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// Server API for Network service
|
||||||
|
|
||||||
|
type NetworkHandler interface {
|
||||||
|
ListRoutes(context.Context, *proto1.Request, *proto1.ListResponse) error
|
||||||
|
ListNodes(context.Context, *ListRequest, *ListResponse) error
|
||||||
|
ListNeighbours(context.Context, *ListRequest, *ListResponse) error
|
||||||
|
}
|
||||||
|
|
||||||
|
func RegisterNetworkHandler(s server.Server, hdlr NetworkHandler, opts ...server.HandlerOption) error {
|
||||||
|
type network interface {
|
||||||
|
ListRoutes(ctx context.Context, in *proto1.Request, out *proto1.ListResponse) error
|
||||||
|
ListNodes(ctx context.Context, in *ListRequest, out *ListResponse) error
|
||||||
|
ListNeighbours(ctx context.Context, in *ListRequest, out *ListResponse) error
|
||||||
|
}
|
||||||
|
type Network struct {
|
||||||
|
network
|
||||||
|
}
|
||||||
|
h := &networkHandler{hdlr}
|
||||||
|
return s.Handle(s.NewHandler(&Network{h}, opts...))
|
||||||
|
}
|
||||||
|
|
||||||
|
type networkHandler struct {
|
||||||
|
NetworkHandler
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *networkHandler) ListRoutes(ctx context.Context, in *proto1.Request, out *proto1.ListResponse) error {
|
||||||
|
return h.NetworkHandler.ListRoutes(ctx, in, out)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *networkHandler) ListNodes(ctx context.Context, in *ListRequest, out *ListResponse) error {
|
||||||
|
return h.NetworkHandler.ListNodes(ctx, in, out)
|
||||||
|
}
|
||||||
|
|
||||||
|
func (h *networkHandler) ListNeighbours(ctx context.Context, in *ListRequest, out *ListResponse) error {
|
||||||
|
return h.NetworkHandler.ListNeighbours(ctx, in, out)
|
||||||
|
}
|
||||||
|
@ -6,6 +6,7 @@ package go_micro_network
|
|||||||
import (
|
import (
|
||||||
fmt "fmt"
|
fmt "fmt"
|
||||||
proto "github.com/golang/protobuf/proto"
|
proto "github.com/golang/protobuf/proto"
|
||||||
|
_ "github.com/micro/go-micro/router/proto"
|
||||||
math "math"
|
math "math"
|
||||||
)
|
)
|
||||||
|
|
||||||
@ -20,6 +21,78 @@ var _ = math.Inf
|
|||||||
// proto package needs to be updated.
|
// proto package needs to be updated.
|
||||||
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
|
const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package
|
||||||
|
|
||||||
|
// Empty request
|
||||||
|
type ListRequest struct {
|
||||||
|
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||||
|
XXX_unrecognized []byte `json:"-"`
|
||||||
|
XXX_sizecache int32 `json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *ListRequest) Reset() { *m = ListRequest{} }
|
||||||
|
func (m *ListRequest) String() string { return proto.CompactTextString(m) }
|
||||||
|
func (*ListRequest) ProtoMessage() {}
|
||||||
|
func (*ListRequest) Descriptor() ([]byte, []int) {
|
||||||
|
return fileDescriptor_8571034d60397816, []int{0}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *ListRequest) XXX_Unmarshal(b []byte) error {
|
||||||
|
return xxx_messageInfo_ListRequest.Unmarshal(m, b)
|
||||||
|
}
|
||||||
|
func (m *ListRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||||
|
return xxx_messageInfo_ListRequest.Marshal(b, m, deterministic)
|
||||||
|
}
|
||||||
|
func (m *ListRequest) XXX_Merge(src proto.Message) {
|
||||||
|
xxx_messageInfo_ListRequest.Merge(m, src)
|
||||||
|
}
|
||||||
|
func (m *ListRequest) XXX_Size() int {
|
||||||
|
return xxx_messageInfo_ListRequest.Size(m)
|
||||||
|
}
|
||||||
|
func (m *ListRequest) XXX_DiscardUnknown() {
|
||||||
|
xxx_messageInfo_ListRequest.DiscardUnknown(m)
|
||||||
|
}
|
||||||
|
|
||||||
|
var xxx_messageInfo_ListRequest proto.InternalMessageInfo
|
||||||
|
|
||||||
|
// ListResponse is returned by ListNodes and ListNeighbours
|
||||||
|
type ListResponse struct {
|
||||||
|
Nodes []*Node `protobuf:"bytes,1,rep,name=nodes,proto3" json:"nodes,omitempty"`
|
||||||
|
XXX_NoUnkeyedLiteral struct{} `json:"-"`
|
||||||
|
XXX_unrecognized []byte `json:"-"`
|
||||||
|
XXX_sizecache int32 `json:"-"`
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *ListResponse) Reset() { *m = ListResponse{} }
|
||||||
|
func (m *ListResponse) String() string { return proto.CompactTextString(m) }
|
||||||
|
func (*ListResponse) ProtoMessage() {}
|
||||||
|
func (*ListResponse) Descriptor() ([]byte, []int) {
|
||||||
|
return fileDescriptor_8571034d60397816, []int{1}
|
||||||
|
}
|
||||||
|
|
||||||
|
func (m *ListResponse) XXX_Unmarshal(b []byte) error {
|
||||||
|
return xxx_messageInfo_ListResponse.Unmarshal(m, b)
|
||||||
|
}
|
||||||
|
func (m *ListResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) {
|
||||||
|
return xxx_messageInfo_ListResponse.Marshal(b, m, deterministic)
|
||||||
|
}
|
||||||
|
func (m *ListResponse) XXX_Merge(src proto.Message) {
|
||||||
|
xxx_messageInfo_ListResponse.Merge(m, src)
|
||||||
|
}
|
||||||
|
func (m *ListResponse) XXX_Size() int {
|
||||||
|
return xxx_messageInfo_ListResponse.Size(m)
|
||||||
|
}
|
||||||
|
func (m *ListResponse) XXX_DiscardUnknown() {
|
||||||
|
xxx_messageInfo_ListResponse.DiscardUnknown(m)
|
||||||
|
}
|
||||||
|
|
||||||
|
var xxx_messageInfo_ListResponse proto.InternalMessageInfo
|
||||||
|
|
||||||
|
func (m *ListResponse) GetNodes() []*Node {
|
||||||
|
if m != nil {
|
||||||
|
return m.Nodes
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
// Node is network node
|
// Node is network node
|
||||||
type Node struct {
|
type Node struct {
|
||||||
// node ide
|
// node ide
|
||||||
@ -35,7 +108,7 @@ func (m *Node) Reset() { *m = Node{} }
|
|||||||
func (m *Node) String() string { return proto.CompactTextString(m) }
|
func (m *Node) String() string { return proto.CompactTextString(m) }
|
||||||
func (*Node) ProtoMessage() {}
|
func (*Node) ProtoMessage() {}
|
||||||
func (*Node) Descriptor() ([]byte, []int) {
|
func (*Node) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_8571034d60397816, []int{0}
|
return fileDescriptor_8571034d60397816, []int{2}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Node) XXX_Unmarshal(b []byte) error {
|
func (m *Node) XXX_Unmarshal(b []byte) error {
|
||||||
@ -83,7 +156,7 @@ func (m *Connect) Reset() { *m = Connect{} }
|
|||||||
func (m *Connect) String() string { return proto.CompactTextString(m) }
|
func (m *Connect) String() string { return proto.CompactTextString(m) }
|
||||||
func (*Connect) ProtoMessage() {}
|
func (*Connect) ProtoMessage() {}
|
||||||
func (*Connect) Descriptor() ([]byte, []int) {
|
func (*Connect) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_8571034d60397816, []int{1}
|
return fileDescriptor_8571034d60397816, []int{3}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Connect) XXX_Unmarshal(b []byte) error {
|
func (m *Connect) XXX_Unmarshal(b []byte) error {
|
||||||
@ -124,7 +197,7 @@ func (m *Close) Reset() { *m = Close{} }
|
|||||||
func (m *Close) String() string { return proto.CompactTextString(m) }
|
func (m *Close) String() string { return proto.CompactTextString(m) }
|
||||||
func (*Close) ProtoMessage() {}
|
func (*Close) ProtoMessage() {}
|
||||||
func (*Close) Descriptor() ([]byte, []int) {
|
func (*Close) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_8571034d60397816, []int{2}
|
return fileDescriptor_8571034d60397816, []int{4}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Close) XXX_Unmarshal(b []byte) error {
|
func (m *Close) XXX_Unmarshal(b []byte) error {
|
||||||
@ -167,7 +240,7 @@ func (m *Neighbour) Reset() { *m = Neighbour{} }
|
|||||||
func (m *Neighbour) String() string { return proto.CompactTextString(m) }
|
func (m *Neighbour) String() string { return proto.CompactTextString(m) }
|
||||||
func (*Neighbour) ProtoMessage() {}
|
func (*Neighbour) ProtoMessage() {}
|
||||||
func (*Neighbour) Descriptor() ([]byte, []int) {
|
func (*Neighbour) Descriptor() ([]byte, []int) {
|
||||||
return fileDescriptor_8571034d60397816, []int{3}
|
return fileDescriptor_8571034d60397816, []int{5}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (m *Neighbour) XXX_Unmarshal(b []byte) error {
|
func (m *Neighbour) XXX_Unmarshal(b []byte) error {
|
||||||
@ -203,6 +276,8 @@ func (m *Neighbour) GetNeighbours() []*Node {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
|
proto.RegisterType((*ListRequest)(nil), "go.micro.network.ListRequest")
|
||||||
|
proto.RegisterType((*ListResponse)(nil), "go.micro.network.ListResponse")
|
||||||
proto.RegisterType((*Node)(nil), "go.micro.network.Node")
|
proto.RegisterType((*Node)(nil), "go.micro.network.Node")
|
||||||
proto.RegisterType((*Connect)(nil), "go.micro.network.Connect")
|
proto.RegisterType((*Connect)(nil), "go.micro.network.Connect")
|
||||||
proto.RegisterType((*Close)(nil), "go.micro.network.Close")
|
proto.RegisterType((*Close)(nil), "go.micro.network.Close")
|
||||||
@ -212,16 +287,24 @@ func init() {
|
|||||||
func init() { proto.RegisterFile("network.proto", fileDescriptor_8571034d60397816) }
|
func init() { proto.RegisterFile("network.proto", fileDescriptor_8571034d60397816) }
|
||||||
|
|
||||||
var fileDescriptor_8571034d60397816 = []byte{
|
var fileDescriptor_8571034d60397816 = []byte{
|
||||||
// 173 bytes of a gzipped FileDescriptorProto
|
// 302 bytes of a gzipped FileDescriptorProto
|
||||||
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcd, 0x4b, 0x2d, 0x29,
|
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x52, 0x5d, 0x4b, 0xc3, 0x30,
|
||||||
0xcf, 0x2f, 0xca, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x12, 0x48, 0xcf, 0xd7, 0xcb, 0xcd,
|
0x14, 0xb5, 0xfb, 0x70, 0xec, 0xce, 0x0d, 0xc9, 0x83, 0x84, 0xc2, 0x64, 0xe4, 0x69, 0x88, 0xa6,
|
||||||
0x4c, 0x2e, 0xca, 0xd7, 0x83, 0x8a, 0x2b, 0x19, 0x70, 0xb1, 0xf8, 0xe5, 0xa7, 0xa4, 0x0a, 0xf1,
|
0xb2, 0xa2, 0x4f, 0xbe, 0xed, 0xc1, 0x97, 0x51, 0xb0, 0xff, 0xc0, 0x36, 0xa1, 0x0b, 0xba, 0xdc,
|
||||||
0x71, 0x31, 0x65, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x06, 0x31, 0x65, 0xa6, 0x08, 0x49,
|
0x99, 0xa4, 0xf8, 0xc3, 0xfd, 0x03, 0xd2, 0xb4, 0x9b, 0xc5, 0x31, 0x61, 0xf8, 0x96, 0x73, 0xcf,
|
||||||
0x70, 0xb1, 0x27, 0xa6, 0xa4, 0x14, 0xa5, 0x16, 0x17, 0x4b, 0x30, 0x81, 0x05, 0x61, 0x5c, 0x25,
|
0x3d, 0xe7, 0x5e, 0xee, 0x09, 0x8c, 0xb5, 0x74, 0x9f, 0x68, 0xde, 0xf8, 0xd6, 0xa0, 0x43, 0x72,
|
||||||
0x53, 0x2e, 0x76, 0xe7, 0xfc, 0xbc, 0xbc, 0xd4, 0xe4, 0x12, 0x21, 0x2d, 0x2e, 0x96, 0xbc, 0xfc,
|
0x59, 0x20, 0xdf, 0xa8, 0xdc, 0x20, 0x6f, 0xea, 0x61, 0x5c, 0x28, 0xb7, 0x2e, 0x33, 0x9e, 0xe3,
|
||||||
0x94, 0x54, 0xb0, 0x36, 0x6e, 0x23, 0x31, 0x3d, 0x74, 0xd3, 0xf5, 0x40, 0x46, 0x07, 0x81, 0xd5,
|
0x26, 0xf2, 0x4c, 0x54, 0xe0, 0x5d, 0xfd, 0x30, 0x58, 0x3a, 0x69, 0x22, 0xaf, 0x6c, 0x40, 0x6d,
|
||||||
0x28, 0x19, 0x73, 0xb1, 0x3a, 0xe7, 0xe4, 0x17, 0xa7, 0x92, 0xa4, 0x29, 0x9f, 0x8b, 0xd3, 0x2f,
|
0xc3, 0xc6, 0x30, 0x5a, 0x29, 0xeb, 0x52, 0xf9, 0x51, 0x4a, 0xeb, 0xd8, 0x13, 0x5c, 0xd4, 0xd0,
|
||||||
0x35, 0x33, 0x3d, 0x23, 0x29, 0xbf, 0xb4, 0x88, 0x14, 0x8d, 0x42, 0x66, 0x5c, 0x5c, 0x79, 0x30,
|
0x6e, 0x51, 0x5b, 0x49, 0x6e, 0xa1, 0xaf, 0x51, 0x48, 0x4b, 0x83, 0x59, 0x77, 0x3e, 0x5a, 0x5c,
|
||||||
0x8d, 0xc5, 0x12, 0xcc, 0x0a, 0xcc, 0x78, 0x74, 0x20, 0xa9, 0x4c, 0x62, 0x03, 0x87, 0x93, 0x31,
|
0xf1, 0xdf, 0x53, 0x79, 0x82, 0x42, 0xa6, 0x75, 0x13, 0xbb, 0x87, 0x5e, 0x05, 0xc9, 0x04, 0x3a,
|
||||||
0x20, 0x00, 0x00, 0xff, 0xff, 0xb8, 0x74, 0x00, 0x71, 0x38, 0x01, 0x00, 0x00,
|
0x4a, 0xd0, 0x60, 0x16, 0xcc, 0x87, 0x69, 0x47, 0x09, 0x42, 0x61, 0xf0, 0x2a, 0x84, 0x91, 0xd6,
|
||||||
|
0xd2, 0x8e, 0x2f, 0xee, 0x20, 0x7b, 0x80, 0xc1, 0x12, 0xb5, 0x96, 0xb9, 0x23, 0x37, 0xd0, 0xab,
|
||||||
|
0x5c, 0xbc, 0xec, 0xf8, 0x24, 0xdf, 0xc3, 0x62, 0xe8, 0x2f, 0xdf, 0xd1, 0xca, 0x93, 0x44, 0x08,
|
||||||
|
0xc3, 0x44, 0xaa, 0x62, 0x9d, 0x61, 0x69, 0x4e, 0x11, 0x92, 0x47, 0x00, 0xbd, 0x13, 0x5a, 0xda,
|
||||||
|
0xfd, 0xf3, 0x12, 0xad, 0xce, 0xc5, 0x57, 0x00, 0x83, 0xa4, 0x26, 0xc9, 0x33, 0x80, 0x3f, 0x6c,
|
||||||
|
0x75, 0x7b, 0x4b, 0xe8, 0x8f, 0xba, 0x49, 0xa3, 0x09, 0x20, 0x9c, 0x1e, 0x30, 0xed, 0x3c, 0xd8,
|
||||||
|
0x19, 0x59, 0xc1, 0xb0, 0xaa, 0x54, 0xc3, 0x2c, 0x99, 0x1e, 0x6e, 0xd1, 0x4a, 0x33, 0xbc, 0x3e,
|
||||||
|
0x46, 0xef, 0xdd, 0x5e, 0x60, 0xe2, 0xdd, 0xf6, 0x4b, 0xff, 0xdb, 0x32, 0x3b, 0xf7, 0x1f, 0x2b,
|
||||||
|
0xfe, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x19, 0x6e, 0xfe, 0x91, 0xb0, 0x02, 0x00, 0x00,
|
||||||
}
|
}
|
||||||
|
@ -2,6 +2,23 @@ syntax = "proto3";
|
|||||||
|
|
||||||
package go.micro.network;
|
package go.micro.network;
|
||||||
|
|
||||||
|
import "github.com/micro/go-micro/router/proto/router.proto";
|
||||||
|
|
||||||
|
// Network service is usesd to gain visibility into networks
|
||||||
|
service Network {
|
||||||
|
rpc ListRoutes(go.micro.router.Request) returns (go.micro.router.ListResponse) {};
|
||||||
|
rpc ListNodes(ListRequest) returns (ListResponse) {};
|
||||||
|
rpc ListNeighbours(ListRequest) returns (ListResponse) {};
|
||||||
|
}
|
||||||
|
|
||||||
|
// Empty request
|
||||||
|
message ListRequest {}
|
||||||
|
|
||||||
|
// ListResponse is returned by ListNodes and ListNeighbours
|
||||||
|
message ListResponse {
|
||||||
|
repeated Node nodes = 1;
|
||||||
|
}
|
||||||
|
|
||||||
// Node is network node
|
// Node is network node
|
||||||
message Node {
|
message Node {
|
||||||
// node ide
|
// node ide
|
||||||
|
Loading…
Reference in New Issue
Block a user