From 8fea1a0c75580dafcee658e1bfc4300331c227d4 Mon Sep 17 00:00:00 2001 From: John-Lin Date: Thu, 28 Jun 2018 11:32:06 +0800 Subject: [PATCH] create bridge with type --- messages/messages.pb.go | 942 +++++++++------------------------- messages/messages.proto | 1 + openvswitch/ovs.go | 15 +- server/openvswitch_handler.go | 2 +- 4 files changed, 251 insertions(+), 709 deletions(-) diff --git a/messages/messages.pb.go b/messages/messages.pb.go index dfc0ba5..eac1d06 100644 --- a/messages/messages.pb.go +++ b/messages/messages.pb.go @@ -1,6 +1,37 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // source: messages/messages.proto +/* +Package messages is a generated protocol buffer package. + +It is generated from these files: + messages/messages.proto + +It has these top-level messages: + EchoRequest + EchoResponse + PingRequest + PingResponse + OVSResponse + CreateBridgeRequest + DeleteBridgeRequest + AddPortRequest + DeletePortRequest + AddFlowRequest + DeleteFlowRequest + DumpFlowsRequest + DumpFlowsResponse + DumpPortsRequest + DumpPortsResponse + DumpPortRequest + DumpPortResponse + FindNetworkNamespacePathRequest + FindNetworkNamespacePathResponse + ConnectBridgeRequest + ConnectBridgeResponse + ConfigureIfaceRequest + ConfigureIfaceResponse +*/ package messages import proto "github.com/golang/protobuf/proto" @@ -24,35 +55,13 @@ var _ = math.Inf const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package type EchoRequest struct { - Word string `protobuf:"bytes,1,opt,name=word,proto3" json:"word,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Word string `protobuf:"bytes,1,opt,name=word" json:"word,omitempty"` } -func (m *EchoRequest) Reset() { *m = EchoRequest{} } -func (m *EchoRequest) String() string { return proto.CompactTextString(m) } -func (*EchoRequest) ProtoMessage() {} -func (*EchoRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{0} -} -func (m *EchoRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EchoRequest.Unmarshal(m, b) -} -func (m *EchoRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EchoRequest.Marshal(b, m, deterministic) -} -func (dst *EchoRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_EchoRequest.Merge(dst, src) -} -func (m *EchoRequest) XXX_Size() int { - return xxx_messageInfo_EchoRequest.Size(m) -} -func (m *EchoRequest) XXX_DiscardUnknown() { - xxx_messageInfo_EchoRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_EchoRequest proto.InternalMessageInfo +func (m *EchoRequest) Reset() { *m = EchoRequest{} } +func (m *EchoRequest) String() string { return proto.CompactTextString(m) } +func (*EchoRequest) ProtoMessage() {} +func (*EchoRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *EchoRequest) GetWord() string { if m != nil { @@ -62,35 +71,13 @@ func (m *EchoRequest) GetWord() string { } type EchoResponse struct { - Word string `protobuf:"bytes,1,opt,name=word,proto3" json:"word,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Word string `protobuf:"bytes,1,opt,name=word" json:"word,omitempty"` } -func (m *EchoResponse) Reset() { *m = EchoResponse{} } -func (m *EchoResponse) String() string { return proto.CompactTextString(m) } -func (*EchoResponse) ProtoMessage() {} -func (*EchoResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{1} -} -func (m *EchoResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_EchoResponse.Unmarshal(m, b) -} -func (m *EchoResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_EchoResponse.Marshal(b, m, deterministic) -} -func (dst *EchoResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_EchoResponse.Merge(dst, src) -} -func (m *EchoResponse) XXX_Size() int { - return xxx_messageInfo_EchoResponse.Size(m) -} -func (m *EchoResponse) XXX_DiscardUnknown() { - xxx_messageInfo_EchoResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_EchoResponse proto.InternalMessageInfo +func (m *EchoResponse) Reset() { *m = EchoResponse{} } +func (m *EchoResponse) String() string { return proto.CompactTextString(m) } +func (*EchoResponse) ProtoMessage() {} +func (*EchoResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } func (m *EchoResponse) GetWord() string { if m != nil { @@ -100,35 +87,13 @@ func (m *EchoResponse) GetWord() string { } type PingRequest struct { - Ping string `protobuf:"bytes,1,opt,name=ping,proto3" json:"ping,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *PingRequest) Reset() { *m = PingRequest{} } -func (m *PingRequest) String() string { return proto.CompactTextString(m) } -func (*PingRequest) ProtoMessage() {} -func (*PingRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{2} -} -func (m *PingRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PingRequest.Unmarshal(m, b) -} -func (m *PingRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PingRequest.Marshal(b, m, deterministic) -} -func (dst *PingRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingRequest.Merge(dst, src) -} -func (m *PingRequest) XXX_Size() int { - return xxx_messageInfo_PingRequest.Size(m) -} -func (m *PingRequest) XXX_DiscardUnknown() { - xxx_messageInfo_PingRequest.DiscardUnknown(m) + Ping string `protobuf:"bytes,1,opt,name=ping" json:"ping,omitempty"` } -var xxx_messageInfo_PingRequest proto.InternalMessageInfo +func (m *PingRequest) Reset() { *m = PingRequest{} } +func (m *PingRequest) String() string { return proto.CompactTextString(m) } +func (*PingRequest) ProtoMessage() {} +func (*PingRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } func (m *PingRequest) GetPing() string { if m != nil { @@ -138,35 +103,13 @@ func (m *PingRequest) GetPing() string { } type PingResponse struct { - Pong string `protobuf:"bytes,1,opt,name=pong,proto3" json:"pong,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Pong string `protobuf:"bytes,1,opt,name=pong" json:"pong,omitempty"` } -func (m *PingResponse) Reset() { *m = PingResponse{} } -func (m *PingResponse) String() string { return proto.CompactTextString(m) } -func (*PingResponse) ProtoMessage() {} -func (*PingResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{3} -} -func (m *PingResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_PingResponse.Unmarshal(m, b) -} -func (m *PingResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_PingResponse.Marshal(b, m, deterministic) -} -func (dst *PingResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_PingResponse.Merge(dst, src) -} -func (m *PingResponse) XXX_Size() int { - return xxx_messageInfo_PingResponse.Size(m) -} -func (m *PingResponse) XXX_DiscardUnknown() { - xxx_messageInfo_PingResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_PingResponse proto.InternalMessageInfo +func (m *PingResponse) Reset() { *m = PingResponse{} } +func (m *PingResponse) String() string { return proto.CompactTextString(m) } +func (*PingResponse) ProtoMessage() {} +func (*PingResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } func (m *PingResponse) GetPong() string { if m != nil { @@ -176,37 +119,15 @@ func (m *PingResponse) GetPong() string { } type OVSResponse struct { - Type string `protobuf:"bytes,1,opt,name=type,proto3" json:"type,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *OVSResponse) Reset() { *m = OVSResponse{} } -func (m *OVSResponse) String() string { return proto.CompactTextString(m) } -func (*OVSResponse) ProtoMessage() {} -func (*OVSResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{4} -} -func (m *OVSResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_OVSResponse.Unmarshal(m, b) -} -func (m *OVSResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_OVSResponse.Marshal(b, m, deterministic) -} -func (dst *OVSResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_OVSResponse.Merge(dst, src) -} -func (m *OVSResponse) XXX_Size() int { - return xxx_messageInfo_OVSResponse.Size(m) -} -func (m *OVSResponse) XXX_DiscardUnknown() { - xxx_messageInfo_OVSResponse.DiscardUnknown(m) + Type string `protobuf:"bytes,1,opt,name=type" json:"type,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"` } -var xxx_messageInfo_OVSResponse proto.InternalMessageInfo +func (m *OVSResponse) Reset() { *m = OVSResponse{} } +func (m *OVSResponse) String() string { return proto.CompactTextString(m) } +func (*OVSResponse) ProtoMessage() {} +func (*OVSResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } func (m *OVSResponse) GetType() string { if m != nil { @@ -230,35 +151,14 @@ func (m *OVSResponse) GetReason() string { } type CreateBridgeRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *CreateBridgeRequest) Reset() { *m = CreateBridgeRequest{} } -func (m *CreateBridgeRequest) String() string { return proto.CompactTextString(m) } -func (*CreateBridgeRequest) ProtoMessage() {} -func (*CreateBridgeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{5} -} -func (m *CreateBridgeRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_CreateBridgeRequest.Unmarshal(m, b) -} -func (m *CreateBridgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_CreateBridgeRequest.Marshal(b, m, deterministic) -} -func (dst *CreateBridgeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_CreateBridgeRequest.Merge(dst, src) -} -func (m *CreateBridgeRequest) XXX_Size() int { - return xxx_messageInfo_CreateBridgeRequest.Size(m) -} -func (m *CreateBridgeRequest) XXX_DiscardUnknown() { - xxx_messageInfo_CreateBridgeRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + DatapathType string `protobuf:"bytes,2,opt,name=datapathType" json:"datapathType,omitempty"` } -var xxx_messageInfo_CreateBridgeRequest proto.InternalMessageInfo +func (m *CreateBridgeRequest) Reset() { *m = CreateBridgeRequest{} } +func (m *CreateBridgeRequest) String() string { return proto.CompactTextString(m) } +func (*CreateBridgeRequest) ProtoMessage() {} +func (*CreateBridgeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } func (m *CreateBridgeRequest) GetBridgeName() string { if m != nil { @@ -267,36 +167,21 @@ func (m *CreateBridgeRequest) GetBridgeName() string { return "" } -type DeleteBridgeRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` +func (m *CreateBridgeRequest) GetDatapathType() string { + if m != nil { + return m.DatapathType + } + return "" } -func (m *DeleteBridgeRequest) Reset() { *m = DeleteBridgeRequest{} } -func (m *DeleteBridgeRequest) String() string { return proto.CompactTextString(m) } -func (*DeleteBridgeRequest) ProtoMessage() {} -func (*DeleteBridgeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{6} -} -func (m *DeleteBridgeRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteBridgeRequest.Unmarshal(m, b) -} -func (m *DeleteBridgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteBridgeRequest.Marshal(b, m, deterministic) -} -func (dst *DeleteBridgeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteBridgeRequest.Merge(dst, src) -} -func (m *DeleteBridgeRequest) XXX_Size() int { - return xxx_messageInfo_DeleteBridgeRequest.Size(m) -} -func (m *DeleteBridgeRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteBridgeRequest.DiscardUnknown(m) +type DeleteBridgeRequest struct { + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` } -var xxx_messageInfo_DeleteBridgeRequest proto.InternalMessageInfo +func (m *DeleteBridgeRequest) Reset() { *m = DeleteBridgeRequest{} } +func (m *DeleteBridgeRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteBridgeRequest) ProtoMessage() {} +func (*DeleteBridgeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } func (m *DeleteBridgeRequest) GetBridgeName() string { if m != nil { @@ -306,36 +191,14 @@ func (m *DeleteBridgeRequest) GetBridgeName() string { } type AddPortRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - IfaceName string `protobuf:"bytes,2,opt,name=ifaceName,proto3" json:"ifaceName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + IfaceName string `protobuf:"bytes,2,opt,name=ifaceName" json:"ifaceName,omitempty"` } -func (m *AddPortRequest) Reset() { *m = AddPortRequest{} } -func (m *AddPortRequest) String() string { return proto.CompactTextString(m) } -func (*AddPortRequest) ProtoMessage() {} -func (*AddPortRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{7} -} -func (m *AddPortRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddPortRequest.Unmarshal(m, b) -} -func (m *AddPortRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddPortRequest.Marshal(b, m, deterministic) -} -func (dst *AddPortRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddPortRequest.Merge(dst, src) -} -func (m *AddPortRequest) XXX_Size() int { - return xxx_messageInfo_AddPortRequest.Size(m) -} -func (m *AddPortRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AddPortRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_AddPortRequest proto.InternalMessageInfo +func (m *AddPortRequest) Reset() { *m = AddPortRequest{} } +func (m *AddPortRequest) String() string { return proto.CompactTextString(m) } +func (*AddPortRequest) ProtoMessage() {} +func (*AddPortRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func (m *AddPortRequest) GetBridgeName() string { if m != nil { @@ -352,36 +215,14 @@ func (m *AddPortRequest) GetIfaceName() string { } type DeletePortRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - IfaceName string `protobuf:"bytes,2,opt,name=ifaceName,proto3" json:"ifaceName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + IfaceName string `protobuf:"bytes,2,opt,name=ifaceName" json:"ifaceName,omitempty"` } -func (m *DeletePortRequest) Reset() { *m = DeletePortRequest{} } -func (m *DeletePortRequest) String() string { return proto.CompactTextString(m) } -func (*DeletePortRequest) ProtoMessage() {} -func (*DeletePortRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{8} -} -func (m *DeletePortRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeletePortRequest.Unmarshal(m, b) -} -func (m *DeletePortRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeletePortRequest.Marshal(b, m, deterministic) -} -func (dst *DeletePortRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeletePortRequest.Merge(dst, src) -} -func (m *DeletePortRequest) XXX_Size() int { - return xxx_messageInfo_DeletePortRequest.Size(m) -} -func (m *DeletePortRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DeletePortRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_DeletePortRequest proto.InternalMessageInfo +func (m *DeletePortRequest) Reset() { *m = DeletePortRequest{} } +func (m *DeletePortRequest) String() string { return proto.CompactTextString(m) } +func (*DeletePortRequest) ProtoMessage() {} +func (*DeletePortRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} } func (m *DeletePortRequest) GetBridgeName() string { if m != nil { @@ -398,36 +239,14 @@ func (m *DeletePortRequest) GetIfaceName() string { } type AddFlowRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - FlowString string `protobuf:"bytes,2,opt,name=flowString,proto3" json:"flowString,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *AddFlowRequest) Reset() { *m = AddFlowRequest{} } -func (m *AddFlowRequest) String() string { return proto.CompactTextString(m) } -func (*AddFlowRequest) ProtoMessage() {} -func (*AddFlowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{9} -} -func (m *AddFlowRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_AddFlowRequest.Unmarshal(m, b) -} -func (m *AddFlowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_AddFlowRequest.Marshal(b, m, deterministic) -} -func (dst *AddFlowRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_AddFlowRequest.Merge(dst, src) -} -func (m *AddFlowRequest) XXX_Size() int { - return xxx_messageInfo_AddFlowRequest.Size(m) -} -func (m *AddFlowRequest) XXX_DiscardUnknown() { - xxx_messageInfo_AddFlowRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + FlowString string `protobuf:"bytes,2,opt,name=flowString" json:"flowString,omitempty"` } -var xxx_messageInfo_AddFlowRequest proto.InternalMessageInfo +func (m *AddFlowRequest) Reset() { *m = AddFlowRequest{} } +func (m *AddFlowRequest) String() string { return proto.CompactTextString(m) } +func (*AddFlowRequest) ProtoMessage() {} +func (*AddFlowRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} } func (m *AddFlowRequest) GetBridgeName() string { if m != nil { @@ -444,36 +263,14 @@ func (m *AddFlowRequest) GetFlowString() string { } type DeleteFlowRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - FlowString string `protobuf:"bytes,2,opt,name=flowString,proto3" json:"flowString,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DeleteFlowRequest) Reset() { *m = DeleteFlowRequest{} } -func (m *DeleteFlowRequest) String() string { return proto.CompactTextString(m) } -func (*DeleteFlowRequest) ProtoMessage() {} -func (*DeleteFlowRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{10} -} -func (m *DeleteFlowRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DeleteFlowRequest.Unmarshal(m, b) -} -func (m *DeleteFlowRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DeleteFlowRequest.Marshal(b, m, deterministic) -} -func (dst *DeleteFlowRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DeleteFlowRequest.Merge(dst, src) -} -func (m *DeleteFlowRequest) XXX_Size() int { - return xxx_messageInfo_DeleteFlowRequest.Size(m) -} -func (m *DeleteFlowRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DeleteFlowRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + FlowString string `protobuf:"bytes,2,opt,name=flowString" json:"flowString,omitempty"` } -var xxx_messageInfo_DeleteFlowRequest proto.InternalMessageInfo +func (m *DeleteFlowRequest) Reset() { *m = DeleteFlowRequest{} } +func (m *DeleteFlowRequest) String() string { return proto.CompactTextString(m) } +func (*DeleteFlowRequest) ProtoMessage() {} +func (*DeleteFlowRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} } func (m *DeleteFlowRequest) GetBridgeName() string { if m != nil { @@ -490,35 +287,13 @@ func (m *DeleteFlowRequest) GetFlowString() string { } type DumpFlowsRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DumpFlowsRequest) Reset() { *m = DumpFlowsRequest{} } -func (m *DumpFlowsRequest) String() string { return proto.CompactTextString(m) } -func (*DumpFlowsRequest) ProtoMessage() {} -func (*DumpFlowsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{11} -} -func (m *DumpFlowsRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpFlowsRequest.Unmarshal(m, b) -} -func (m *DumpFlowsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpFlowsRequest.Marshal(b, m, deterministic) -} -func (dst *DumpFlowsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpFlowsRequest.Merge(dst, src) -} -func (m *DumpFlowsRequest) XXX_Size() int { - return xxx_messageInfo_DumpFlowsRequest.Size(m) -} -func (m *DumpFlowsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DumpFlowsRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` } -var xxx_messageInfo_DumpFlowsRequest proto.InternalMessageInfo +func (m *DumpFlowsRequest) Reset() { *m = DumpFlowsRequest{} } +func (m *DumpFlowsRequest) String() string { return proto.CompactTextString(m) } +func (*DumpFlowsRequest) ProtoMessage() {} +func (*DumpFlowsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} } func (m *DumpFlowsRequest) GetBridgeName() string { if m != nil { @@ -528,37 +303,15 @@ func (m *DumpFlowsRequest) GetBridgeName() string { } type DumpFlowsResponse struct { - Flows [][]byte `protobuf:"bytes,1,rep,name=flows,proto3" json:"flows,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Flows [][]byte `protobuf:"bytes,1,rep,name=flows,proto3" json:"flows,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"` } -func (m *DumpFlowsResponse) Reset() { *m = DumpFlowsResponse{} } -func (m *DumpFlowsResponse) String() string { return proto.CompactTextString(m) } -func (*DumpFlowsResponse) ProtoMessage() {} -func (*DumpFlowsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{12} -} -func (m *DumpFlowsResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpFlowsResponse.Unmarshal(m, b) -} -func (m *DumpFlowsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpFlowsResponse.Marshal(b, m, deterministic) -} -func (dst *DumpFlowsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpFlowsResponse.Merge(dst, src) -} -func (m *DumpFlowsResponse) XXX_Size() int { - return xxx_messageInfo_DumpFlowsResponse.Size(m) -} -func (m *DumpFlowsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DumpFlowsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DumpFlowsResponse proto.InternalMessageInfo +func (m *DumpFlowsResponse) Reset() { *m = DumpFlowsResponse{} } +func (m *DumpFlowsResponse) String() string { return proto.CompactTextString(m) } +func (*DumpFlowsResponse) ProtoMessage() {} +func (*DumpFlowsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} } func (m *DumpFlowsResponse) GetFlows() [][]byte { if m != nil { @@ -582,35 +335,13 @@ func (m *DumpFlowsResponse) GetReason() string { } type DumpPortsRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DumpPortsRequest) Reset() { *m = DumpPortsRequest{} } -func (m *DumpPortsRequest) String() string { return proto.CompactTextString(m) } -func (*DumpPortsRequest) ProtoMessage() {} -func (*DumpPortsRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{13} -} -func (m *DumpPortsRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpPortsRequest.Unmarshal(m, b) -} -func (m *DumpPortsRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpPortsRequest.Marshal(b, m, deterministic) -} -func (dst *DumpPortsRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpPortsRequest.Merge(dst, src) -} -func (m *DumpPortsRequest) XXX_Size() int { - return xxx_messageInfo_DumpPortsRequest.Size(m) -} -func (m *DumpPortsRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DumpPortsRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` } -var xxx_messageInfo_DumpPortsRequest proto.InternalMessageInfo +func (m *DumpPortsRequest) Reset() { *m = DumpPortsRequest{} } +func (m *DumpPortsRequest) String() string { return proto.CompactTextString(m) } +func (*DumpPortsRequest) ProtoMessage() {} +func (*DumpPortsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} } func (m *DumpPortsRequest) GetBridgeName() string { if m != nil { @@ -620,37 +351,15 @@ func (m *DumpPortsRequest) GetBridgeName() string { } type DumpPortsResponse struct { - Ports [][]byte `protobuf:"bytes,1,rep,name=ports,proto3" json:"ports,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Ports [][]byte `protobuf:"bytes,1,rep,name=ports,proto3" json:"ports,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"` } -func (m *DumpPortsResponse) Reset() { *m = DumpPortsResponse{} } -func (m *DumpPortsResponse) String() string { return proto.CompactTextString(m) } -func (*DumpPortsResponse) ProtoMessage() {} -func (*DumpPortsResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{14} -} -func (m *DumpPortsResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpPortsResponse.Unmarshal(m, b) -} -func (m *DumpPortsResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpPortsResponse.Marshal(b, m, deterministic) -} -func (dst *DumpPortsResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpPortsResponse.Merge(dst, src) -} -func (m *DumpPortsResponse) XXX_Size() int { - return xxx_messageInfo_DumpPortsResponse.Size(m) -} -func (m *DumpPortsResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DumpPortsResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_DumpPortsResponse proto.InternalMessageInfo +func (m *DumpPortsResponse) Reset() { *m = DumpPortsResponse{} } +func (m *DumpPortsResponse) String() string { return proto.CompactTextString(m) } +func (*DumpPortsResponse) ProtoMessage() {} +func (*DumpPortsResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} } func (m *DumpPortsResponse) GetPorts() [][]byte { if m != nil { @@ -674,36 +383,14 @@ func (m *DumpPortsResponse) GetReason() string { } type DumpPortRequest struct { - BridgeName string `protobuf:"bytes,1,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - PortName string `protobuf:"bytes,2,opt,name=portName,proto3" json:"portName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DumpPortRequest) Reset() { *m = DumpPortRequest{} } -func (m *DumpPortRequest) String() string { return proto.CompactTextString(m) } -func (*DumpPortRequest) ProtoMessage() {} -func (*DumpPortRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{15} -} -func (m *DumpPortRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpPortRequest.Unmarshal(m, b) -} -func (m *DumpPortRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpPortRequest.Marshal(b, m, deterministic) -} -func (dst *DumpPortRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpPortRequest.Merge(dst, src) -} -func (m *DumpPortRequest) XXX_Size() int { - return xxx_messageInfo_DumpPortRequest.Size(m) -} -func (m *DumpPortRequest) XXX_DiscardUnknown() { - xxx_messageInfo_DumpPortRequest.DiscardUnknown(m) + BridgeName string `protobuf:"bytes,1,opt,name=bridgeName" json:"bridgeName,omitempty"` + PortName string `protobuf:"bytes,2,opt,name=portName" json:"portName,omitempty"` } -var xxx_messageInfo_DumpPortRequest proto.InternalMessageInfo +func (m *DumpPortRequest) Reset() { *m = DumpPortRequest{} } +func (m *DumpPortRequest) String() string { return proto.CompactTextString(m) } +func (*DumpPortRequest) ProtoMessage() {} +func (*DumpPortRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} } func (m *DumpPortRequest) GetBridgeName() string { if m != nil { @@ -720,37 +407,15 @@ func (m *DumpPortRequest) GetPortName() string { } type DumpPortResponse struct { - Port []byte `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *DumpPortResponse) Reset() { *m = DumpPortResponse{} } -func (m *DumpPortResponse) String() string { return proto.CompactTextString(m) } -func (*DumpPortResponse) ProtoMessage() {} -func (*DumpPortResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{16} -} -func (m *DumpPortResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_DumpPortResponse.Unmarshal(m, b) -} -func (m *DumpPortResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_DumpPortResponse.Marshal(b, m, deterministic) -} -func (dst *DumpPortResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_DumpPortResponse.Merge(dst, src) -} -func (m *DumpPortResponse) XXX_Size() int { - return xxx_messageInfo_DumpPortResponse.Size(m) -} -func (m *DumpPortResponse) XXX_DiscardUnknown() { - xxx_messageInfo_DumpPortResponse.DiscardUnknown(m) + Port []byte `protobuf:"bytes,1,opt,name=port,proto3" json:"port,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"` } -var xxx_messageInfo_DumpPortResponse proto.InternalMessageInfo +func (m *DumpPortResponse) Reset() { *m = DumpPortResponse{} } +func (m *DumpPortResponse) String() string { return proto.CompactTextString(m) } +func (*DumpPortResponse) ProtoMessage() {} +func (*DumpPortResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} } func (m *DumpPortResponse) GetPort() []byte { if m != nil { @@ -774,37 +439,17 @@ func (m *DumpPortResponse) GetReason() string { } type FindNetworkNamespacePathRequest struct { - PodName string `protobuf:"bytes,1,opt,name=podName,proto3" json:"podName,omitempty"` - Namespace string `protobuf:"bytes,2,opt,name=namespace,proto3" json:"namespace,omitempty"` - PodUUID string `protobuf:"bytes,3,opt,name=podUUID,proto3" json:"podUUID,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + PodName string `protobuf:"bytes,1,opt,name=podName" json:"podName,omitempty"` + Namespace string `protobuf:"bytes,2,opt,name=namespace" json:"namespace,omitempty"` + PodUUID string `protobuf:"bytes,3,opt,name=podUUID" json:"podUUID,omitempty"` } func (m *FindNetworkNamespacePathRequest) Reset() { *m = FindNetworkNamespacePathRequest{} } func (m *FindNetworkNamespacePathRequest) String() string { return proto.CompactTextString(m) } func (*FindNetworkNamespacePathRequest) ProtoMessage() {} func (*FindNetworkNamespacePathRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{17} -} -func (m *FindNetworkNamespacePathRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FindNetworkNamespacePathRequest.Unmarshal(m, b) + return fileDescriptor0, []int{17} } -func (m *FindNetworkNamespacePathRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FindNetworkNamespacePathRequest.Marshal(b, m, deterministic) -} -func (dst *FindNetworkNamespacePathRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_FindNetworkNamespacePathRequest.Merge(dst, src) -} -func (m *FindNetworkNamespacePathRequest) XXX_Size() int { - return xxx_messageInfo_FindNetworkNamespacePathRequest.Size(m) -} -func (m *FindNetworkNamespacePathRequest) XXX_DiscardUnknown() { - xxx_messageInfo_FindNetworkNamespacePathRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_FindNetworkNamespacePathRequest proto.InternalMessageInfo func (m *FindNetworkNamespacePathRequest) GetPodName() string { if m != nil { @@ -828,37 +473,17 @@ func (m *FindNetworkNamespacePathRequest) GetPodUUID() string { } type FindNetworkNamespacePathResponse struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - Success bool `protobuf:"varint,2,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,3,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"` + Success bool `protobuf:"varint,2,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,3,opt,name=reason" json:"reason,omitempty"` } func (m *FindNetworkNamespacePathResponse) Reset() { *m = FindNetworkNamespacePathResponse{} } func (m *FindNetworkNamespacePathResponse) String() string { return proto.CompactTextString(m) } func (*FindNetworkNamespacePathResponse) ProtoMessage() {} func (*FindNetworkNamespacePathResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{18} -} -func (m *FindNetworkNamespacePathResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_FindNetworkNamespacePathResponse.Unmarshal(m, b) + return fileDescriptor0, []int{18} } -func (m *FindNetworkNamespacePathResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_FindNetworkNamespacePathResponse.Marshal(b, m, deterministic) -} -func (dst *FindNetworkNamespacePathResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_FindNetworkNamespacePathResponse.Merge(dst, src) -} -func (m *FindNetworkNamespacePathResponse) XXX_Size() int { - return xxx_messageInfo_FindNetworkNamespacePathResponse.Size(m) -} -func (m *FindNetworkNamespacePathResponse) XXX_DiscardUnknown() { - xxx_messageInfo_FindNetworkNamespacePathResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_FindNetworkNamespacePathResponse proto.InternalMessageInfo func (m *FindNetworkNamespacePathResponse) GetPath() string { if m != nil { @@ -882,38 +507,16 @@ func (m *FindNetworkNamespacePathResponse) GetReason() string { } type ConnectBridgeRequest struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - PodUUID string `protobuf:"bytes,2,opt,name=podUUID,proto3" json:"podUUID,omitempty"` - ContainerVethName string `protobuf:"bytes,3,opt,name=containerVethName,proto3" json:"containerVethName,omitempty"` - BridgeName string `protobuf:"bytes,4,opt,name=bridgeName,proto3" json:"bridgeName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"` + PodUUID string `protobuf:"bytes,2,opt,name=podUUID" json:"podUUID,omitempty"` + ContainerVethName string `protobuf:"bytes,3,opt,name=containerVethName" json:"containerVethName,omitempty"` + BridgeName string `protobuf:"bytes,4,opt,name=bridgeName" json:"bridgeName,omitempty"` } -func (m *ConnectBridgeRequest) Reset() { *m = ConnectBridgeRequest{} } -func (m *ConnectBridgeRequest) String() string { return proto.CompactTextString(m) } -func (*ConnectBridgeRequest) ProtoMessage() {} -func (*ConnectBridgeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{19} -} -func (m *ConnectBridgeRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ConnectBridgeRequest.Unmarshal(m, b) -} -func (m *ConnectBridgeRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ConnectBridgeRequest.Marshal(b, m, deterministic) -} -func (dst *ConnectBridgeRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConnectBridgeRequest.Merge(dst, src) -} -func (m *ConnectBridgeRequest) XXX_Size() int { - return xxx_messageInfo_ConnectBridgeRequest.Size(m) -} -func (m *ConnectBridgeRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ConnectBridgeRequest.DiscardUnknown(m) -} - -var xxx_messageInfo_ConnectBridgeRequest proto.InternalMessageInfo +func (m *ConnectBridgeRequest) Reset() { *m = ConnectBridgeRequest{} } +func (m *ConnectBridgeRequest) String() string { return proto.CompactTextString(m) } +func (*ConnectBridgeRequest) ProtoMessage() {} +func (*ConnectBridgeRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} } func (m *ConnectBridgeRequest) GetPath() string { if m != nil { @@ -944,36 +547,14 @@ func (m *ConnectBridgeRequest) GetBridgeName() string { } type ConnectBridgeResponse struct { - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,2,opt,name=reason" json:"reason,omitempty"` } -func (m *ConnectBridgeResponse) Reset() { *m = ConnectBridgeResponse{} } -func (m *ConnectBridgeResponse) String() string { return proto.CompactTextString(m) } -func (*ConnectBridgeResponse) ProtoMessage() {} -func (*ConnectBridgeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{20} -} -func (m *ConnectBridgeResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ConnectBridgeResponse.Unmarshal(m, b) -} -func (m *ConnectBridgeResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ConnectBridgeResponse.Marshal(b, m, deterministic) -} -func (dst *ConnectBridgeResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConnectBridgeResponse.Merge(dst, src) -} -func (m *ConnectBridgeResponse) XXX_Size() int { - return xxx_messageInfo_ConnectBridgeResponse.Size(m) -} -func (m *ConnectBridgeResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ConnectBridgeResponse.DiscardUnknown(m) -} - -var xxx_messageInfo_ConnectBridgeResponse proto.InternalMessageInfo +func (m *ConnectBridgeResponse) Reset() { *m = ConnectBridgeResponse{} } +func (m *ConnectBridgeResponse) String() string { return proto.CompactTextString(m) } +func (*ConnectBridgeResponse) ProtoMessage() {} +func (*ConnectBridgeResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} } func (m *ConnectBridgeResponse) GetSuccess() bool { if m != nil { @@ -990,37 +571,15 @@ func (m *ConnectBridgeResponse) GetReason() string { } type ConfigureIfaceRequest struct { - Path string `protobuf:"bytes,1,opt,name=path,proto3" json:"path,omitempty"` - IP string `protobuf:"bytes,2,opt,name=IP,proto3" json:"IP,omitempty"` - ContainerVethName string `protobuf:"bytes,3,opt,name=containerVethName,proto3" json:"containerVethName,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ConfigureIfaceRequest) Reset() { *m = ConfigureIfaceRequest{} } -func (m *ConfigureIfaceRequest) String() string { return proto.CompactTextString(m) } -func (*ConfigureIfaceRequest) ProtoMessage() {} -func (*ConfigureIfaceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{21} -} -func (m *ConfigureIfaceRequest) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ConfigureIfaceRequest.Unmarshal(m, b) -} -func (m *ConfigureIfaceRequest) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ConfigureIfaceRequest.Marshal(b, m, deterministic) -} -func (dst *ConfigureIfaceRequest) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConfigureIfaceRequest.Merge(dst, src) -} -func (m *ConfigureIfaceRequest) XXX_Size() int { - return xxx_messageInfo_ConfigureIfaceRequest.Size(m) -} -func (m *ConfigureIfaceRequest) XXX_DiscardUnknown() { - xxx_messageInfo_ConfigureIfaceRequest.DiscardUnknown(m) + Path string `protobuf:"bytes,1,opt,name=path" json:"path,omitempty"` + IP string `protobuf:"bytes,2,opt,name=IP" json:"IP,omitempty"` + ContainerVethName string `protobuf:"bytes,3,opt,name=containerVethName" json:"containerVethName,omitempty"` } -var xxx_messageInfo_ConfigureIfaceRequest proto.InternalMessageInfo +func (m *ConfigureIfaceRequest) Reset() { *m = ConfigureIfaceRequest{} } +func (m *ConfigureIfaceRequest) String() string { return proto.CompactTextString(m) } +func (*ConfigureIfaceRequest) ProtoMessage() {} +func (*ConfigureIfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} } func (m *ConfigureIfaceRequest) GetPath() string { if m != nil { @@ -1044,36 +603,14 @@ func (m *ConfigureIfaceRequest) GetContainerVethName() string { } type ConfigureIfaceResponse struct { - Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` - Reason string `protobuf:"bytes,2,opt,name=reason,proto3" json:"reason,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` -} - -func (m *ConfigureIfaceResponse) Reset() { *m = ConfigureIfaceResponse{} } -func (m *ConfigureIfaceResponse) String() string { return proto.CompactTextString(m) } -func (*ConfigureIfaceResponse) ProtoMessage() {} -func (*ConfigureIfaceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_messages_c4e8e264392a71de, []int{22} -} -func (m *ConfigureIfaceResponse) XXX_Unmarshal(b []byte) error { - return xxx_messageInfo_ConfigureIfaceResponse.Unmarshal(m, b) -} -func (m *ConfigureIfaceResponse) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { - return xxx_messageInfo_ConfigureIfaceResponse.Marshal(b, m, deterministic) -} -func (dst *ConfigureIfaceResponse) XXX_Merge(src proto.Message) { - xxx_messageInfo_ConfigureIfaceResponse.Merge(dst, src) -} -func (m *ConfigureIfaceResponse) XXX_Size() int { - return xxx_messageInfo_ConfigureIfaceResponse.Size(m) -} -func (m *ConfigureIfaceResponse) XXX_DiscardUnknown() { - xxx_messageInfo_ConfigureIfaceResponse.DiscardUnknown(m) + Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"` + Reason string `protobuf:"bytes,2,opt,name=reason" json:"reason,omitempty"` } -var xxx_messageInfo_ConfigureIfaceResponse proto.InternalMessageInfo +func (m *ConfigureIfaceResponse) Reset() { *m = ConfigureIfaceResponse{} } +func (m *ConfigureIfaceResponse) String() string { return proto.CompactTextString(m) } +func (*ConfigureIfaceResponse) ProtoMessage() {} +func (*ConfigureIfaceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} } func (m *ConfigureIfaceResponse) GetSuccess() bool { if m != nil { @@ -1123,9 +660,8 @@ var _ grpc.ClientConn // is compatible with the grpc package it is being compiled against. const _ = grpc.SupportPackageIsVersion4 -// NetworkControlClient is the client API for NetworkControl service. -// -// For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. +// Client API for NetworkControl service + type NetworkControlClient interface { Echo(ctx context.Context, in *EchoRequest, opts ...grpc.CallOption) (*EchoResponse, error) Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingResponse, error) @@ -1153,7 +689,7 @@ func NewNetworkControlClient(cc *grpc.ClientConn) NetworkControlClient { func (c *networkControlClient) Echo(ctx context.Context, in *EchoRequest, opts ...grpc.CallOption) (*EchoResponse, error) { out := new(EchoResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/Echo", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/Echo", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1162,7 +698,7 @@ func (c *networkControlClient) Echo(ctx context.Context, in *EchoRequest, opts . func (c *networkControlClient) Ping(ctx context.Context, in *PingRequest, opts ...grpc.CallOption) (*PingResponse, error) { out := new(PingResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/Ping", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/Ping", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1171,7 +707,7 @@ func (c *networkControlClient) Ping(ctx context.Context, in *PingRequest, opts . func (c *networkControlClient) CreateBridge(ctx context.Context, in *CreateBridgeRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/CreateBridge", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/CreateBridge", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1180,7 +716,7 @@ func (c *networkControlClient) CreateBridge(ctx context.Context, in *CreateBridg func (c *networkControlClient) DeleteBridge(ctx context.Context, in *DeleteBridgeRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DeleteBridge", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DeleteBridge", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1189,7 +725,7 @@ func (c *networkControlClient) DeleteBridge(ctx context.Context, in *DeleteBridg func (c *networkControlClient) AddPort(ctx context.Context, in *AddPortRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/AddPort", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/AddPort", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1198,7 +734,7 @@ func (c *networkControlClient) AddPort(ctx context.Context, in *AddPortRequest, func (c *networkControlClient) DeletePort(ctx context.Context, in *DeletePortRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DeletePort", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DeletePort", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1207,7 +743,7 @@ func (c *networkControlClient) DeletePort(ctx context.Context, in *DeletePortReq func (c *networkControlClient) AddFlow(ctx context.Context, in *AddFlowRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/AddFlow", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/AddFlow", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1216,7 +752,7 @@ func (c *networkControlClient) AddFlow(ctx context.Context, in *AddFlowRequest, func (c *networkControlClient) DeleteFlow(ctx context.Context, in *DeleteFlowRequest, opts ...grpc.CallOption) (*OVSResponse, error) { out := new(OVSResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DeleteFlow", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DeleteFlow", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1225,7 +761,7 @@ func (c *networkControlClient) DeleteFlow(ctx context.Context, in *DeleteFlowReq func (c *networkControlClient) DumpFlows(ctx context.Context, in *DumpFlowsRequest, opts ...grpc.CallOption) (*DumpFlowsResponse, error) { out := new(DumpFlowsResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DumpFlows", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DumpFlows", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1234,7 +770,7 @@ func (c *networkControlClient) DumpFlows(ctx context.Context, in *DumpFlowsReque func (c *networkControlClient) DumpPorts(ctx context.Context, in *DumpPortsRequest, opts ...grpc.CallOption) (*DumpPortsResponse, error) { out := new(DumpPortsResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DumpPorts", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DumpPorts", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1243,7 +779,7 @@ func (c *networkControlClient) DumpPorts(ctx context.Context, in *DumpPortsReque func (c *networkControlClient) DumpPort(ctx context.Context, in *DumpPortRequest, opts ...grpc.CallOption) (*DumpPortResponse, error) { out := new(DumpPortResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/DumpPort", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/DumpPort", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1252,7 +788,7 @@ func (c *networkControlClient) DumpPort(ctx context.Context, in *DumpPortRequest func (c *networkControlClient) FindNetworkNamespacePath(ctx context.Context, in *FindNetworkNamespacePathRequest, opts ...grpc.CallOption) (*FindNetworkNamespacePathResponse, error) { out := new(FindNetworkNamespacePathResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/FindNetworkNamespacePath", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/FindNetworkNamespacePath", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1261,7 +797,7 @@ func (c *networkControlClient) FindNetworkNamespacePath(ctx context.Context, in func (c *networkControlClient) ConnectBridge(ctx context.Context, in *ConnectBridgeRequest, opts ...grpc.CallOption) (*ConnectBridgeResponse, error) { out := new(ConnectBridgeResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/ConnectBridge", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/ConnectBridge", in, out, c.cc, opts...) if err != nil { return nil, err } @@ -1270,14 +806,15 @@ func (c *networkControlClient) ConnectBridge(ctx context.Context, in *ConnectBri func (c *networkControlClient) ConfigureIface(ctx context.Context, in *ConfigureIfaceRequest, opts ...grpc.CallOption) (*ConfigureIfaceResponse, error) { out := new(ConfigureIfaceResponse) - err := c.cc.Invoke(ctx, "/messages.NetworkControl/ConfigureIface", in, out, opts...) + err := grpc.Invoke(ctx, "/messages.NetworkControl/ConfigureIface", in, out, c.cc, opts...) if err != nil { return nil, err } return out, nil } -// NetworkControlServer is the server API for NetworkControl service. +// Server API for NetworkControl service + type NetworkControlServer interface { Echo(context.Context, *EchoRequest) (*EchoResponse, error) Ping(context.Context, *PingRequest) (*PingResponse, error) @@ -1616,55 +1153,56 @@ var _NetworkControl_serviceDesc = grpc.ServiceDesc{ Metadata: "messages/messages.proto", } -func init() { proto.RegisterFile("messages/messages.proto", fileDescriptor_messages_c4e8e264392a71de) } - -var fileDescriptor_messages_c4e8e264392a71de = []byte{ - // 738 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0x41, 0x6f, 0xd3, 0x4c, - 0x10, 0x6d, 0xd2, 0x7e, 0x6d, 0x3a, 0xcd, 0x17, 0xe8, 0xd2, 0x16, 0xe3, 0x42, 0x9b, 0xee, 0xa9, - 0x20, 0x54, 0xa4, 0x22, 0xc4, 0x85, 0x0b, 0x4d, 0x89, 0x14, 0x24, 0x4a, 0x48, 0xd4, 0x0a, 0x89, - 0x93, 0xeb, 0x6c, 0x13, 0x8b, 0xd4, 0x6b, 0xbc, 0x1b, 0x45, 0xfc, 0x06, 0x6e, 0xfc, 0x62, 0xb4, - 0x6b, 0xaf, 0x3d, 0x76, 0x6c, 0x70, 0xa3, 0xde, 0x76, 0x66, 0x67, 0xde, 0xbc, 0xf1, 0x4e, 0xe6, - 0x05, 0x1e, 0xdf, 0x32, 0x21, 0x9c, 0x31, 0x13, 0xaf, 0xcc, 0xe1, 0x24, 0x08, 0xb9, 0xe4, 0xa4, - 0x61, 0x6c, 0x7a, 0x04, 0x5b, 0x1f, 0xdc, 0x09, 0x1f, 0xb0, 0x1f, 0x33, 0x26, 0x24, 0x21, 0xb0, - 0x36, 0xe7, 0xe1, 0xc8, 0xaa, 0xb5, 0x6b, 0xc7, 0x9b, 0x03, 0x7d, 0xa6, 0x14, 0x9a, 0x51, 0x88, - 0x08, 0xb8, 0x2f, 0x58, 0x61, 0xcc, 0x11, 0x6c, 0xf5, 0x3d, 0x7f, 0x8c, 0x60, 0x02, 0xcf, 0x1f, - 0x9b, 0x10, 0x75, 0x56, 0x30, 0x51, 0x48, 0x0a, 0x13, 0x70, 0x14, 0xc3, 0xfd, 0x31, 0x1d, 0xc2, - 0xd6, 0xe7, 0xab, 0x21, 0x0e, 0x91, 0x3f, 0x03, 0x66, 0x42, 0xd4, 0x99, 0x58, 0xb0, 0x21, 0x66, - 0xae, 0xcb, 0x84, 0xb0, 0xea, 0xed, 0xda, 0x71, 0x63, 0x60, 0x4c, 0xb2, 0x07, 0xeb, 0x21, 0x73, - 0x04, 0xf7, 0xad, 0x55, 0x1d, 0x1f, 0x5b, 0xf4, 0x0d, 0x3c, 0xea, 0x84, 0xcc, 0x91, 0xec, 0x2c, - 0xf4, 0x46, 0x63, 0x66, 0x38, 0x1e, 0x00, 0x5c, 0x6b, 0xc7, 0x85, 0x73, 0x6b, 0x4a, 0x20, 0x8f, - 0x4a, 0x3b, 0x67, 0x53, 0x76, 0xd7, 0xb4, 0x0b, 0x68, 0xbd, 0x1f, 0x8d, 0xfa, 0x3c, 0x94, 0x15, - 0x33, 0xc8, 0x53, 0xd8, 0xf4, 0x6e, 0x1c, 0x37, 0xba, 0xae, 0xeb, 0xeb, 0xd4, 0x41, 0xbf, 0xc0, - 0x76, 0x44, 0xe3, 0xfe, 0x20, 0xfb, 0x9a, 0x62, 0x77, 0xca, 0xe7, 0x55, 0xf1, 0x0e, 0x00, 0x6e, - 0xa6, 0x7c, 0x3e, 0x94, 0xa1, 0x7a, 0xd5, 0x08, 0x10, 0x79, 0xe8, 0xd0, 0x90, 0xbc, 0x4f, 0xd0, - 0x53, 0x78, 0x78, 0x3e, 0xbb, 0x0d, 0x14, 0xa4, 0xa8, 0xfa, 0xf5, 0xbf, 0xc1, 0x36, 0xca, 0x89, - 0xc7, 0x68, 0x07, 0xfe, 0x53, 0xb0, 0xc2, 0xaa, 0xb5, 0x57, 0x8f, 0x9b, 0x83, 0xc8, 0x58, 0x62, - 0x90, 0x62, 0x42, 0xea, 0x21, 0xee, 0x4a, 0x28, 0xce, 0x49, 0x09, 0x05, 0xca, 0x61, 0x08, 0x69, - 0x63, 0x09, 0x42, 0x9f, 0xe0, 0x81, 0x01, 0xaf, 0xfa, 0xd1, 0x6d, 0x68, 0xa8, 0x6a, 0x68, 0x30, - 0x12, 0x9b, 0x7e, 0x4d, 0xfb, 0xcb, 0xfe, 0x4a, 0x43, 0xa9, 0x91, 0x9a, 0x03, 0x7d, 0x5e, 0x82, - 0xa8, 0x80, 0xc3, 0xae, 0xe7, 0x8f, 0x2e, 0x98, 0x9c, 0xf3, 0xf0, 0xbb, 0x2a, 0x26, 0x02, 0xc7, - 0x65, 0x7d, 0x47, 0x4e, 0x0c, 0x71, 0x0b, 0x36, 0x02, 0x3e, 0x42, 0xac, 0x8d, 0xa9, 0x86, 0xd9, - 0x37, 0x19, 0x66, 0x98, 0x13, 0x47, 0x9c, 0x77, 0x79, 0xd9, 0x3b, 0x8f, 0x6b, 0x1a, 0x93, 0x4e, - 0xa0, 0x5d, 0x5e, 0x14, 0xb5, 0xe7, 0xc8, 0x49, 0xb2, 0x84, 0x1c, 0x39, 0x59, 0xa2, 0xbd, 0xdf, - 0x35, 0xd8, 0xe9, 0x70, 0xdf, 0x67, 0xae, 0xcc, 0x2e, 0x8b, 0x12, 0x78, 0x43, 0xb8, 0x9e, 0x21, - 0x4c, 0x5e, 0xc2, 0xb6, 0xcb, 0x7d, 0xe9, 0x78, 0x3e, 0x0b, 0xaf, 0x98, 0x9c, 0xe8, 0x8f, 0x11, - 0x55, 0x5a, 0xbc, 0xc8, 0xbd, 0xf4, 0xda, 0xc2, 0xe4, 0xf5, 0x60, 0x37, 0xc7, 0x29, 0xee, 0x19, - 0xf5, 0x57, 0x2b, 0xeb, 0xaf, 0x9e, 0xe9, 0xcf, 0xd3, 0x50, 0x37, 0xde, 0x78, 0x16, 0xb2, 0x9e, - 0x5a, 0x23, 0x7f, 0xeb, 0xaf, 0x05, 0xf5, 0x5e, 0x3f, 0x06, 0xa8, 0xf7, 0xfa, 0x77, 0xeb, 0x8a, - 0x7e, 0x84, 0xbd, 0x7c, 0xa9, 0x65, 0x69, 0x9f, 0xfe, 0x6a, 0x40, 0x2b, 0x7e, 0xfd, 0x0e, 0xf7, - 0x65, 0xc8, 0xa7, 0xe4, 0x2d, 0xac, 0x29, 0x2d, 0x23, 0xbb, 0x27, 0x89, 0x22, 0x22, 0xf9, 0xb3, - 0xf7, 0xf2, 0xee, 0xa8, 0x36, 0x5d, 0x51, 0x89, 0x4a, 0xbd, 0x70, 0x22, 0x12, 0x3c, 0x9c, 0x88, - 0x45, 0x8e, 0xae, 0x90, 0x2e, 0x34, 0xb1, 0xfa, 0x90, 0x67, 0x69, 0x64, 0x81, 0x2a, 0xd9, 0x08, - 0x1f, 0x29, 0x61, 0x84, 0x83, 0xe5, 0x08, 0xe3, 0x14, 0xc8, 0x54, 0x39, 0xce, 0x3b, 0xd8, 0x88, - 0xf5, 0x89, 0x58, 0x69, 0x4c, 0x56, 0xb2, 0xca, 0xb3, 0xcf, 0x00, 0x52, 0x35, 0x22, 0xfb, 0x79, - 0x0e, 0x95, 0x30, 0x22, 0x06, 0x6a, 0x45, 0xe7, 0x18, 0x20, 0xf1, 0xa8, 0xc0, 0x40, 0x03, 0x2c, - 0x30, 0xa8, 0x84, 0xd1, 0x85, 0xcd, 0x44, 0x25, 0x88, 0x8d, 0x20, 0x72, 0x72, 0x63, 0xef, 0x17, - 0xde, 0xe5, 0x71, 0xf4, 0x72, 0xcf, 0xe3, 0x60, 0x95, 0xc8, 0xe3, 0x64, 0xd4, 0x80, 0xae, 0x90, - 0x0e, 0x34, 0x8c, 0x9b, 0x3c, 0x59, 0x0c, 0x35, 0x28, 0x76, 0xd1, 0x55, 0x02, 0x22, 0xc0, 0x2a, - 0x5b, 0x77, 0xe4, 0x79, 0x9a, 0xf9, 0x8f, 0x3d, 0x6c, 0xbf, 0xa8, 0x12, 0x9a, 0x14, 0x1d, 0xc0, - 0xff, 0x99, 0x25, 0x43, 0x0e, 0xd0, 0x78, 0x17, 0x6c, 0x44, 0xfb, 0xb0, 0xf4, 0x3e, 0xc1, 0xbc, - 0x84, 0x56, 0x76, 0x05, 0x90, 0x6c, 0xd2, 0xe2, 0x1e, 0xb2, 0xdb, 0xe5, 0x01, 0x06, 0xf6, 0x7a, - 0x5d, 0xff, 0xf5, 0x7d, 0xfd, 0x27, 0x00, 0x00, 0xff, 0xff, 0x80, 0x4b, 0x9e, 0x08, 0x15, 0x0b, +func init() { proto.RegisterFile("messages/messages.proto", fileDescriptor0) } + +var fileDescriptor0 = []byte{ + // 754 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x56, 0xdf, 0x6f, 0xd3, 0x30, + 0x10, 0x5e, 0xbb, 0xb1, 0x75, 0xb7, 0x52, 0x98, 0xf7, 0x83, 0x90, 0xc1, 0xd6, 0xf9, 0x69, 0x20, + 0x34, 0xa4, 0x21, 0xc4, 0x0b, 0x2f, 0xac, 0xa3, 0x52, 0x91, 0x18, 0xa5, 0x65, 0x13, 0x88, 0x27, + 0x2f, 0xf1, 0x9a, 0x88, 0x2e, 0x0e, 0xb1, 0xab, 0x8a, 0xbf, 0x81, 0x37, 0xfe, 0x62, 0x64, 0x27, + 0x4e, 0x9c, 0xb4, 0x81, 0xac, 0xda, 0x9b, 0xef, 0x7c, 0xf7, 0xdd, 0x77, 0xf1, 0xf5, 0xbe, 0xc2, + 0xa3, 0x1b, 0xca, 0x39, 0x19, 0x51, 0xfe, 0x52, 0x1f, 0x8e, 0xc3, 0x88, 0x09, 0x86, 0x1a, 0xda, + 0xc6, 0x87, 0xb0, 0xf1, 0xde, 0xf1, 0xd8, 0x80, 0xfe, 0x9c, 0x50, 0x2e, 0x10, 0x82, 0x95, 0x29, + 0x8b, 0x5c, 0xab, 0xd6, 0xae, 0x1d, 0xad, 0x0f, 0xd4, 0x19, 0x63, 0x68, 0xc6, 0x21, 0x3c, 0x64, + 0x01, 0xa7, 0x73, 0x63, 0x0e, 0x61, 0xa3, 0xef, 0x07, 0x23, 0x03, 0x26, 0xf4, 0x83, 0x91, 0x0e, + 0x91, 0x67, 0x09, 0x13, 0x87, 0x64, 0x30, 0x21, 0x33, 0x62, 0x58, 0x30, 0xc2, 0x43, 0xd8, 0xf8, + 0x74, 0x39, 0x34, 0x43, 0xc4, 0xaf, 0x90, 0xea, 0x10, 0x79, 0x46, 0x16, 0xac, 0xf1, 0x89, 0xe3, + 0x50, 0xce, 0xad, 0x7a, 0xbb, 0x76, 0xd4, 0x18, 0x68, 0x13, 0xed, 0xc2, 0x6a, 0x44, 0x09, 0x67, + 0x81, 0xb5, 0xac, 0xe2, 0x13, 0x0b, 0x7f, 0x83, 0xad, 0x4e, 0x44, 0x89, 0xa0, 0xa7, 0x91, 0xef, + 0x8e, 0xa8, 0xe6, 0xb8, 0x0f, 0x70, 0xa5, 0x1c, 0xe7, 0xe4, 0x46, 0x97, 0x30, 0x3c, 0x08, 0x43, + 0xd3, 0x25, 0x82, 0x84, 0x44, 0x78, 0x5f, 0x24, 0x89, 0xba, 0x8a, 0xc8, 0xf9, 0xf0, 0x6b, 0xd8, + 0x3a, 0xa3, 0x63, 0x7a, 0x4b, 0x68, 0x7c, 0x0e, 0xad, 0x77, 0xae, 0xdb, 0x67, 0x91, 0xa8, 0x4a, + 0xe6, 0x09, 0xac, 0xfb, 0xd7, 0xc4, 0x89, 0xaf, 0x63, 0x26, 0x99, 0x03, 0x7f, 0x86, 0xcd, 0x98, + 0xc6, 0xdd, 0x41, 0xf6, 0x15, 0xc5, 0xee, 0x98, 0x4d, 0xab, 0xe2, 0xed, 0x03, 0x5c, 0x8f, 0xd9, + 0x74, 0x28, 0x22, 0xf9, 0xf2, 0x31, 0xa0, 0xe1, 0xc1, 0x43, 0x4d, 0xf2, 0x2e, 0x41, 0x4f, 0xe0, + 0xe1, 0xd9, 0xe4, 0x26, 0x94, 0x90, 0xbc, 0xea, 0xd7, 0xff, 0x0e, 0x9b, 0x46, 0x4e, 0x32, 0x6a, + 0xdb, 0x70, 0x4f, 0xc2, 0x72, 0xab, 0xd6, 0x5e, 0x3e, 0x6a, 0x0e, 0x62, 0x63, 0x81, 0x61, 0x4b, + 0x08, 0xc9, 0x87, 0xb8, 0x2d, 0xa1, 0x24, 0x27, 0x23, 0x14, 0x4a, 0x87, 0x26, 0xa4, 0x8c, 0x05, + 0x08, 0x7d, 0x84, 0x07, 0x1a, 0xbc, 0xea, 0x47, 0xb7, 0xa1, 0x21, 0xab, 0x19, 0x83, 0x91, 0xda, + 0xf8, 0x6b, 0xd6, 0x5f, 0xfe, 0x97, 0x1c, 0x09, 0x85, 0xd4, 0x1c, 0xa8, 0xf3, 0x02, 0x44, 0x39, + 0x1c, 0x74, 0xfd, 0xc0, 0x3d, 0xa7, 0x62, 0xca, 0xa2, 0x1f, 0xb2, 0x18, 0x0f, 0x89, 0x43, 0xfb, + 0x44, 0x78, 0x9a, 0xb8, 0x05, 0x6b, 0x21, 0x73, 0x0d, 0xd6, 0xda, 0x94, 0xc3, 0x1c, 0xe8, 0x0c, + 0x3d, 0xcc, 0xa9, 0x23, 0xc9, 0xbb, 0xb8, 0xe8, 0x9d, 0x25, 0x35, 0xb5, 0x89, 0x3d, 0x68, 0x97, + 0x17, 0x35, 0xda, 0x23, 0xc2, 0x4b, 0x17, 0x15, 0x11, 0xde, 0x02, 0xed, 0xfd, 0xa9, 0xc1, 0x76, + 0x87, 0x05, 0x01, 0x75, 0x44, 0x7e, 0x59, 0x94, 0xc0, 0x6b, 0xc2, 0xf5, 0x1c, 0x61, 0xf4, 0x02, + 0x36, 0x1d, 0x16, 0x08, 0xe2, 0x07, 0x34, 0xba, 0xa4, 0xc2, 0x53, 0x1f, 0x23, 0xae, 0x34, 0x7b, + 0x51, 0x78, 0xe9, 0x95, 0x99, 0xc9, 0xeb, 0xc1, 0x4e, 0x81, 0x53, 0xd2, 0xb3, 0xd1, 0x5f, 0xad, + 0xac, 0xbf, 0x7a, 0xae, 0x3f, 0x5f, 0x41, 0x5d, 0xfb, 0xa3, 0x49, 0x44, 0x7b, 0x72, 0x8d, 0xfc, + 0xab, 0xbf, 0x16, 0xd4, 0x7b, 0xfd, 0x04, 0xa0, 0xde, 0xeb, 0xdf, 0xae, 0x2b, 0xfc, 0x01, 0x76, + 0x8b, 0xa5, 0x16, 0xa5, 0x7d, 0xf2, 0xbb, 0x01, 0xad, 0xe4, 0xf5, 0x3b, 0x2c, 0x10, 0x11, 0x1b, + 0xa3, 0x37, 0xb0, 0x22, 0xf5, 0x0e, 0xed, 0x1c, 0xa7, 0xaa, 0x69, 0x48, 0xa4, 0xbd, 0x5b, 0x74, + 0xc7, 0xb5, 0xf1, 0x92, 0x4c, 0x94, 0x0a, 0x67, 0x26, 0x1a, 0xa2, 0x68, 0x26, 0x9a, 0x42, 0x88, + 0x97, 0x50, 0x17, 0x9a, 0xa6, 0x42, 0xa1, 0xa7, 0x59, 0xe4, 0x1c, 0xe5, 0xb2, 0x0d, 0x7c, 0x43, + 0x2d, 0x63, 0x1c, 0x53, 0x8e, 0x4c, 0x9c, 0x39, 0x32, 0x55, 0x8e, 0xf3, 0x16, 0xd6, 0x12, 0x7d, + 0x42, 0x56, 0x16, 0x93, 0x97, 0xac, 0xf2, 0xec, 0x53, 0x80, 0x4c, 0x8d, 0xd0, 0x5e, 0x91, 0x43, + 0x25, 0x8c, 0x98, 0x81, 0x5c, 0xd1, 0x05, 0x06, 0x86, 0x78, 0x54, 0x60, 0xa0, 0x00, 0x66, 0x18, + 0x54, 0xc2, 0xe8, 0xc2, 0x7a, 0xaa, 0x12, 0xc8, 0x36, 0x20, 0x0a, 0x72, 0x63, 0xef, 0xcd, 0xbd, + 0x2b, 0xe2, 0xa8, 0xe5, 0x5e, 0xc4, 0x31, 0x55, 0xa2, 0x88, 0x93, 0x53, 0x03, 0xbc, 0x84, 0x3a, + 0xd0, 0xd0, 0x6e, 0xf4, 0x78, 0x36, 0x54, 0xa3, 0xd8, 0xf3, 0xae, 0x52, 0x10, 0x0e, 0x56, 0xd9, + 0xba, 0x43, 0xcf, 0xb2, 0xcc, 0xff, 0xec, 0x61, 0xfb, 0x79, 0x95, 0xd0, 0xb4, 0xe8, 0x00, 0xee, + 0xe7, 0x96, 0x0c, 0xda, 0x37, 0xc6, 0x7b, 0xce, 0x46, 0xb4, 0x0f, 0x4a, 0xef, 0x53, 0xcc, 0x0b, + 0x68, 0xe5, 0x57, 0x00, 0xca, 0x27, 0xcd, 0xee, 0x21, 0xbb, 0x5d, 0x1e, 0xa0, 0x61, 0xaf, 0x56, + 0xd5, 0xdf, 0xe3, 0x57, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xc6, 0x34, 0x73, 0xee, 0x39, 0x0b, 0x00, 0x00, } diff --git a/messages/messages.proto b/messages/messages.proto index 62a2520..38187de 100644 --- a/messages/messages.proto +++ b/messages/messages.proto @@ -44,6 +44,7 @@ message OVSResponse { message CreateBridgeRequest { string bridgeName = 1; + string datapathType = 2; } message DeleteBridgeRequest { diff --git a/openvswitch/ovs.go b/openvswitch/ovs.go index f497423..9303568 100644 --- a/openvswitch/ovs.go +++ b/openvswitch/ovs.go @@ -3,7 +3,7 @@ package openvswitch import ( "fmt" - "github.com/digitalocean/go-openvswitch/ovs" + "github.com/linkernetworks/go-openvswitch/ovs" ) // OVSManager : contains the client for control ovs-vsctl @@ -18,12 +18,15 @@ func New() *OVSManager { } } -// CreateBridge : ovs-vsctl add-br br0 -func (o *OVSManager) CreateBridge(bridgeName string) error { - if err := o.Client.VSwitch.AddBridge(bridgeName); err != nil { - return fmt.Errorf("Failed to add bridge %s: %v", bridgeName, err) +// CreateBridge +// userspace datapath +// ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev +// kernel datapath +// ovs-vsctl add-br br1 -- set bridge br1 datapath_type=system +func (o *OVSManager) CreateBridge(bridgeName, dpType string) error { + if err := o.Client.VSwitch.AddBridgeWithType(bridgeName, dpType); err != nil { + return fmt.Errorf("Failed to add bridge %s. Datapath type %s: %v", bridgeName, dpType, err) } - return nil } diff --git a/server/openvswitch_handler.go b/server/openvswitch_handler.go index 4e05444..db49ab9 100644 --- a/server/openvswitch_handler.go +++ b/server/openvswitch_handler.go @@ -22,7 +22,7 @@ func (s *server) Ping(ctx context.Context, req *pb.PingRequest) (*pb.PingRespons } func (s *server) CreateBridge(ctx context.Context, req *pb.CreateBridgeRequest) (*pb.OVSResponse, error) { - if err := s.OVS.CreateBridge(req.BridgeName); err != nil { + if err := s.OVS.CreateBridge(req.BridgeName, req.DatapathType); err != nil { return &pb.OVSResponse{ Success: false, Reason: err.Error(), }, err