diff --git a/grpc.go b/grpc.go index 49e94fe9d0..9331151ed4 100644 --- a/grpc.go +++ b/grpc.go @@ -21,6 +21,7 @@ import ( "time" gpb "github.com/gogo/protobuf/types" + "github.com/kata-containers/agent/pkg/types" pb "github.com/kata-containers/agent/protocols/grpc" "github.com/opencontainers/runc/libcontainer" "github.com/opencontainers/runc/libcontainer/configs" @@ -1212,7 +1213,7 @@ func (a *agentGRPC) CreateSandbox(ctx context.Context, req *pb.CreateSandboxRequ a.sandbox.hostname = req.Hostname a.sandbox.containers = make(map[string]*container) - a.sandbox.network.ifaces = make(map[string]*pb.Interface) + a.sandbox.network.ifaces = make(map[string]*types.Interface) a.sandbox.network.dns = req.Dns a.sandbox.running = true a.sandbox.sandboxPidNs = req.SandboxPidns @@ -1310,15 +1311,15 @@ func (a *agentGRPC) DestroySandbox(ctx context.Context, req *pb.DestroySandboxRe return emptyResp, nil } -func (a *agentGRPC) AddInterface(ctx context.Context, req *pb.AddInterfaceRequest) (*pb.Interface, error) { +func (a *agentGRPC) AddInterface(ctx context.Context, req *pb.AddInterfaceRequest) (*types.Interface, error) { return a.sandbox.addInterface(nil, req.Interface) } -func (a *agentGRPC) UpdateInterface(ctx context.Context, req *pb.UpdateInterfaceRequest) (*pb.Interface, error) { +func (a *agentGRPC) UpdateInterface(ctx context.Context, req *pb.UpdateInterfaceRequest) (*types.Interface, error) { return a.sandbox.updateInterface(nil, req.Interface) } -func (a *agentGRPC) RemoveInterface(ctx context.Context, req *pb.RemoveInterfaceRequest) (*pb.Interface, error) { +func (a *agentGRPC) RemoveInterface(ctx context.Context, req *pb.RemoveInterfaceRequest) (*types.Interface, error) { return a.sandbox.removeInterface(nil, req.Interface) } diff --git a/hack/update-generated-agent-proto.sh b/hack/update-generated-agent-proto.sh index bd89b9a766..748fc64ca7 100755 --- a/hack/update-generated-agent-proto.sh +++ b/hack/update-generated-agent-proto.sh @@ -3,8 +3,16 @@ # # SPDX-License-Identifier: Apache-2.0 # -protoc -I=$GOPATH/src -I=$GOPATH/src/github.com/gogo/protobuf/protobuf \ - --proto_path=protocols/grpc --gogofast_out=\ + +protoc \ + pkg/types/types.proto --gogofast_out=. + +protoc \ + -I=$GOPATH/src \ + -I=$GOPATH/src/github.com/gogo/protobuf/protobuf \ + --proto_path=protocols/grpc \ + --gogofast_out=\ +Mgithub.com/kata-containers/agent/pkg/types/types.proto=github.com/kata-containers/agent/pkg/types,\ Mgoogle/protobuf/any.proto=github.com/gogo/protobuf/types,\ Mgoogle/protobuf/duration.proto=github.com/gogo/protobuf/types,\ Mgoogle/protobuf/struct.proto=github.com/gogo/protobuf/types,\ diff --git a/network.go b/network.go index 4162a3bbf8..79ee2b8cd2 100644 --- a/network.go +++ b/network.go @@ -15,6 +15,7 @@ import ( "golang.org/x/sys/unix" + "github.com/kata-containers/agent/pkg/types" pb "github.com/kata-containers/agent/protocols/grpc" "github.com/sirupsen/logrus" "github.com/vishvananda/netlink" @@ -34,10 +35,10 @@ var ( // related information. type network struct { ifacesLock sync.Mutex - ifaces map[string]*pb.Interface + ifaces map[string]*types.Interface routesLock sync.Mutex - routes []pb.Route + routes []types.Route dns []string } @@ -82,7 +83,7 @@ func linkByHwAddr(netHandle *netlink.Handle, hwAddr string) (netlink.Link, error return nil, grpcStatus.Errorf(codes.NotFound, "Could not find the link corresponding to HwAddr %q", hwAddr) } -func updateLink(netHandle *netlink.Handle, link netlink.Link, iface *pb.Interface) error { +func updateLink(netHandle *netlink.Handle, link netlink.Link, iface *types.Interface) error { if netHandle == nil { return errNoHandle } @@ -134,7 +135,7 @@ func updateLink(netHandle *netlink.Handle, link netlink.Link, iface *pb.Interfac return nil } -func (s *sandbox) addInterface(netHandle *netlink.Handle, iface *pb.Interface) (resultingIfc *pb.Interface, err error) { +func (s *sandbox) addInterface(netHandle *netlink.Handle, iface *types.Interface) (resultingIfc *types.Interface, err error) { if iface == nil { return nil, errNoIF } @@ -179,7 +180,7 @@ func (s *sandbox) addInterface(netHandle *netlink.Handle, iface *pb.Interface) ( return iface, nil } -func (s *sandbox) removeInterface(netHandle *netlink.Handle, iface *pb.Interface) (resultingIfc *pb.Interface, err error) { +func (s *sandbox) removeInterface(netHandle *netlink.Handle, iface *types.Interface) (resultingIfc *types.Interface, err error) { if iface == nil { return nil, errNoIF } @@ -217,10 +218,10 @@ func (s *sandbox) removeInterface(netHandle *netlink.Handle, iface *pb.Interface return nil, nil } -// updateInterface will update an existing interface with the values provided in the pb.Interface. It will identify the +// updateInterface will update an existing interface with the values provided in the types.Interface. It will identify the // existing interface via MAC address and will return the state of the interface once the function completes as well an any // errors observed. -func (s *sandbox) updateInterface(netHandle *netlink.Handle, iface *pb.Interface) (resultingIfc *pb.Interface, err error) { +func (s *sandbox) updateInterface(netHandle *netlink.Handle, iface *types.Interface) (resultingIfc *types.Interface, err error) { if iface == nil { return nil, errNoIF } @@ -301,7 +302,7 @@ func (s *sandbox) updateInterface(netHandle *netlink.Handle, iface *pb.Interface } // getInterface will retrieve interface details from the provided link -func getInterface(netHandle *netlink.Handle, link netlink.Link) (*pb.Interface, error) { +func getInterface(netHandle *netlink.Handle, link netlink.Link) (*types.Interface, error) { if netHandle == nil { return nil, errNoHandle } @@ -310,7 +311,7 @@ func getInterface(netHandle *netlink.Handle, link netlink.Link) (*pb.Interface, return nil, errNoLink } - var ifc pb.Interface + var ifc types.Interface linkAttrs := link.Attrs() ifc.Name = linkAttrs.Name ifc.Mtu = uint64(linkAttrs.MTU) @@ -323,7 +324,7 @@ func getInterface(netHandle *netlink.Handle, link netlink.Link) (*pb.Interface, } for _, addr := range addrs { netMask, _ := addr.Mask.Size() - m := pb.IPAddress{ + m := types.IPAddress{ Address: addr.IP.String(), Mask: fmt.Sprintf("%d", netMask), } @@ -481,7 +482,7 @@ func getCurrentRoutes(netHandle *netlink.Handle) (*pb.Routes, error) { } for _, route := range finalRouteList { - var r pb.Route + var r types.Route if route.Dst != nil { r.Dest = route.Dst.String() } @@ -508,7 +509,7 @@ func getCurrentRoutes(netHandle *netlink.Handle) (*pb.Routes, error) { return &routes, nil } -func (s *sandbox) updateRoute(netHandle *netlink.Handle, route *pb.Route, add bool) (err error) { +func (s *sandbox) updateRoute(netHandle *netlink.Handle, route *types.Route, add bool) (err error) { s.network.routesLock.Lock() defer s.network.routesLock.Unlock() diff --git a/network_test.go b/network_test.go index d21d7e708e..612ea0b981 100644 --- a/network_test.go +++ b/network_test.go @@ -12,6 +12,7 @@ import ( "runtime" "testing" + "github.com/kata-containers/agent/pkg/types" pb "github.com/kata-containers/agent/protocols/grpc" "github.com/stretchr/testify/assert" "github.com/vishvananda/netlink" @@ -23,12 +24,12 @@ func TestUpdateRemoveInterface(t *testing.T) { s := sandbox{} - ifc := pb.Interface{ + ifc := types.Interface{ Name: "enoNumber", Mtu: 1500, HwAddr: "02:00:ca:fe:00:48", } - ip := pb.IPAddress{ + ip := types.IPAddress{ Family: 0, Address: "192.168.0.101", Mask: "24", @@ -68,7 +69,7 @@ func TestUpdateRemoveInterface(t *testing.T) { // Try with a different valid MTU. Make sure we can assign a new set of IP addresses ifc.Mtu = 500 ifc.IPAddresses[0].Address = "192.168.0.102" - ip2 := pb.IPAddress{ + ip2 := types.IPAddress{ Family: 0, Address: "182.168.0.103", Mask: "24", @@ -146,7 +147,7 @@ func TestUpdateRoutes(t *testing.T) { netHandle.AddrAdd(link, netlinkAddr) //Test a simple route setup: - inputRoutesSimple := []*pb.Route{ + inputRoutesSimple := []*types.Route{ {Dest: "", Gateway: "192.168.0.1", Source: "", Scope: 0, Device: "ifc-name"}, {Dest: "192.168.0.0/16", Gateway: "", Source: "192.168.0.2", Scope: 253, Device: "ifc-name"}, } @@ -161,7 +162,7 @@ func TestUpdateRoutes(t *testing.T) { "Interface created didn't match: got %+v, expecting %+v", results, testRoutes) //Test a route setup mimicking what could be provided by PTP CNI plugin: - inputRoutesPTPExample := []*pb.Route{ + inputRoutesPTPExample := []*types.Route{ {Dest: "", Gateway: "192.168.0.1", Source: "", Scope: 0, Device: "ifc-name"}, {Dest: "192.168.0.144/16", Gateway: "192.168.0.1", Source: "192.168.0.2", Scope: 0, Device: "ifc-name"}, {Dest: "192.168.0.1/32", Gateway: "", Source: "192.168.0.2", Scope: 254, Device: "ifc-name"}, @@ -174,7 +175,7 @@ func TestUpdateRoutes(t *testing.T) { "Interface created didn't match: got %+v, expecting %+v", results, testRoutes) //Test unreachable example (no scope provided for initial link route) - inputRoutesNoScope := []*pb.Route{ + inputRoutesNoScope := []*types.Route{ {Dest: "", Gateway: "192.168.0.1", Source: "", Scope: 0, Device: "ifc-name"}, {Dest: "192.168.0.0/16", Gateway: "", Source: "192.168.0.2", Scope: 0, Device: "ifc-name"}, } @@ -193,12 +194,12 @@ func TestListInterfaces(t *testing.T) { assert := assert.New(t) s := sandbox{} - ifc := pb.Interface{ + ifc := types.Interface{ Name: "enoNumber", Mtu: 1500, HwAddr: "02:00:ca:fe:00:48", } - ip := pb.IPAddress{ + ip := types.IPAddress{ Family: 0, Address: "192.168.0.101", Mask: "24", @@ -257,7 +258,7 @@ func TestListRoutes(t *testing.T) { netHandle.AddrAdd(link, netlinkAddr) //Test a simple route setup: - inputRoutesSimple := []*pb.Route{ + inputRoutesSimple := []*types.Route{ {Dest: "", Gateway: "192.168.0.1", Source: "", Scope: 0, Device: "ifc-name"}, {Dest: "192.168.0.0/16", Gateway: "", Source: "192.168.0.2", Scope: 253, Device: "ifc-name"}, } diff --git a/pkg/types/types.pb.go b/pkg/types/types.pb.go new file mode 100644 index 0000000000..a501a7879d --- /dev/null +++ b/pkg/types/types.pb.go @@ -0,0 +1,1093 @@ +// Code generated by protoc-gen-gogo. DO NOT EDIT. +// source: pkg/types/types.proto + +/* + Package types is a generated protocol buffer package. + + It is generated from these files: + pkg/types/types.proto + + It has these top-level messages: + IPAddress + Interface + Route +*/ +package types + +import proto "github.com/gogo/protobuf/proto" +import fmt "fmt" +import math "math" + +import io "io" + +// Reference imports to suppress errors if they are not otherwise used. +var _ = proto.Marshal +var _ = fmt.Errorf +var _ = math.Inf + +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package + +type IPFamily int32 + +const ( + IPFamily_v4 IPFamily = 0 + IPFamily_v6 IPFamily = 1 +) + +var IPFamily_name = map[int32]string{ + 0: "v4", + 1: "v6", +} +var IPFamily_value = map[string]int32{ + "v4": 0, + "v6": 1, +} + +func (x IPFamily) String() string { + return proto.EnumName(IPFamily_name, int32(x)) +} +func (IPFamily) EnumDescriptor() ([]byte, []int) { return fileDescriptorTypes, []int{0} } + +type IPAddress struct { + Family IPFamily `protobuf:"varint,1,opt,name=family,proto3,enum=types.IPFamily" json:"family,omitempty"` + Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` + Mask string `protobuf:"bytes,3,opt,name=mask,proto3" json:"mask,omitempty"` +} + +func (m *IPAddress) Reset() { *m = IPAddress{} } +func (m *IPAddress) String() string { return proto.CompactTextString(m) } +func (*IPAddress) ProtoMessage() {} +func (*IPAddress) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{0} } + +func (m *IPAddress) GetFamily() IPFamily { + if m != nil { + return m.Family + } + return IPFamily_v4 +} + +func (m *IPAddress) GetAddress() string { + if m != nil { + return m.Address + } + return "" +} + +func (m *IPAddress) GetMask() string { + if m != nil { + return m.Mask + } + return "" +} + +type Interface struct { + Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` + Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` + IPAddresses []*IPAddress `protobuf:"bytes,3,rep,name=IPAddresses" json:"IPAddresses,omitempty"` + Mtu uint64 `protobuf:"varint,4,opt,name=mtu,proto3" json:"mtu,omitempty"` + HwAddr string `protobuf:"bytes,5,opt,name=hwAddr,proto3" json:"hwAddr,omitempty"` + // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". + // Here, bridgeAddr is the address at which the bridge is attached on the root bus, + // while deviceAddr is the address at which the network device is attached on the bridge. + PciAddr string `protobuf:"bytes,6,opt,name=pciAddr,proto3" json:"pciAddr,omitempty"` +} + +func (m *Interface) Reset() { *m = Interface{} } +func (m *Interface) String() string { return proto.CompactTextString(m) } +func (*Interface) ProtoMessage() {} +func (*Interface) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{1} } + +func (m *Interface) GetDevice() string { + if m != nil { + return m.Device + } + return "" +} + +func (m *Interface) GetName() string { + if m != nil { + return m.Name + } + return "" +} + +func (m *Interface) GetIPAddresses() []*IPAddress { + if m != nil { + return m.IPAddresses + } + return nil +} + +func (m *Interface) GetMtu() uint64 { + if m != nil { + return m.Mtu + } + return 0 +} + +func (m *Interface) GetHwAddr() string { + if m != nil { + return m.HwAddr + } + return "" +} + +func (m *Interface) GetPciAddr() string { + if m != nil { + return m.PciAddr + } + return "" +} + +type Route struct { + Dest string `protobuf:"bytes,1,opt,name=dest,proto3" json:"dest,omitempty"` + Gateway string `protobuf:"bytes,2,opt,name=gateway,proto3" json:"gateway,omitempty"` + Device string `protobuf:"bytes,3,opt,name=device,proto3" json:"device,omitempty"` + Source string `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"` + Scope uint32 `protobuf:"varint,5,opt,name=scope,proto3" json:"scope,omitempty"` +} + +func (m *Route) Reset() { *m = Route{} } +func (m *Route) String() string { return proto.CompactTextString(m) } +func (*Route) ProtoMessage() {} +func (*Route) Descriptor() ([]byte, []int) { return fileDescriptorTypes, []int{2} } + +func (m *Route) GetDest() string { + if m != nil { + return m.Dest + } + return "" +} + +func (m *Route) GetGateway() string { + if m != nil { + return m.Gateway + } + return "" +} + +func (m *Route) GetDevice() string { + if m != nil { + return m.Device + } + return "" +} + +func (m *Route) GetSource() string { + if m != nil { + return m.Source + } + return "" +} + +func (m *Route) GetScope() uint32 { + if m != nil { + return m.Scope + } + return 0 +} + +func init() { + proto.RegisterType((*IPAddress)(nil), "types.IPAddress") + proto.RegisterType((*Interface)(nil), "types.Interface") + proto.RegisterType((*Route)(nil), "types.Route") + proto.RegisterEnum("types.IPFamily", IPFamily_name, IPFamily_value) +} +func (m *IPAddress) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *IPAddress) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.Family != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintTypes(dAtA, i, uint64(m.Family)) + } + if len(m.Address) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Address))) + i += copy(dAtA[i:], m.Address) + } + if len(m.Mask) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Mask))) + i += copy(dAtA[i:], m.Mask) + } + return i, nil +} + +func (m *Interface) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Interface) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Device) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Device))) + i += copy(dAtA[i:], m.Device) + } + if len(m.Name) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Name))) + i += copy(dAtA[i:], m.Name) + } + if len(m.IPAddresses) > 0 { + for _, msg := range m.IPAddresses { + dAtA[i] = 0x1a + i++ + i = encodeVarintTypes(dAtA, i, uint64(msg.Size())) + n, err := msg.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n + } + } + if m.Mtu != 0 { + dAtA[i] = 0x20 + i++ + i = encodeVarintTypes(dAtA, i, uint64(m.Mtu)) + } + if len(m.HwAddr) > 0 { + dAtA[i] = 0x2a + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.HwAddr))) + i += copy(dAtA[i:], m.HwAddr) + } + if len(m.PciAddr) > 0 { + dAtA[i] = 0x32 + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.PciAddr))) + i += copy(dAtA[i:], m.PciAddr) + } + return i, nil +} + +func (m *Route) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Route) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if len(m.Dest) > 0 { + dAtA[i] = 0xa + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Dest))) + i += copy(dAtA[i:], m.Dest) + } + if len(m.Gateway) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Gateway))) + i += copy(dAtA[i:], m.Gateway) + } + if len(m.Device) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Device))) + i += copy(dAtA[i:], m.Device) + } + if len(m.Source) > 0 { + dAtA[i] = 0x22 + i++ + i = encodeVarintTypes(dAtA, i, uint64(len(m.Source))) + i += copy(dAtA[i:], m.Source) + } + if m.Scope != 0 { + dAtA[i] = 0x28 + i++ + i = encodeVarintTypes(dAtA, i, uint64(m.Scope)) + } + return i, nil +} + +func encodeVarintTypes(dAtA []byte, offset int, v uint64) int { + for v >= 1<<7 { + dAtA[offset] = uint8(v&0x7f | 0x80) + v >>= 7 + offset++ + } + dAtA[offset] = uint8(v) + return offset + 1 +} +func (m *IPAddress) Size() (n int) { + var l int + _ = l + if m.Family != 0 { + n += 1 + sovTypes(uint64(m.Family)) + } + l = len(m.Address) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Mask) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *Interface) Size() (n int) { + var l int + _ = l + l = len(m.Device) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Name) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if len(m.IPAddresses) > 0 { + for _, e := range m.IPAddresses { + l = e.Size() + n += 1 + l + sovTypes(uint64(l)) + } + } + if m.Mtu != 0 { + n += 1 + sovTypes(uint64(m.Mtu)) + } + l = len(m.HwAddr) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.PciAddr) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + return n +} + +func (m *Route) Size() (n int) { + var l int + _ = l + l = len(m.Dest) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Gateway) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Device) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + l = len(m.Source) + if l > 0 { + n += 1 + l + sovTypes(uint64(l)) + } + if m.Scope != 0 { + n += 1 + sovTypes(uint64(m.Scope)) + } + return n +} + +func sovTypes(x uint64) (n int) { + for { + n++ + x >>= 7 + if x == 0 { + break + } + } + return n +} +func sozTypes(x uint64) (n int) { + return sovTypes(uint64((x << 1) ^ uint64((int64(x) >> 63)))) +} +func (m *IPAddress) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: IPAddress: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: IPAddress: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Family", wireType) + } + m.Family = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Family |= (IPFamily(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Address = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Mask", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Mask = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Interface) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Interface: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Interface: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Device = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Name = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field IPAddresses", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.IPAddresses = append(m.IPAddresses, &IPAddress{}) + if err := m.IPAddresses[len(m.IPAddresses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + case 4: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Mtu", wireType) + } + m.Mtu = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Mtu |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 5: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field HwAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.HwAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 6: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field PciAddr", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.PciAddr = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func (m *Route) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: Route: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: Route: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Dest", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Dest = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Gateway", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Gateway = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Device = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 4: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Source", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthTypes + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.Source = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 5: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field Scope", wireType) + } + m.Scope = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowTypes + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.Scope |= (uint32(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipTypes(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthTypes + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} +func skipTypes(dAtA []byte) (n int, err error) { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTypes + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + wireType := int(wire & 0x7) + switch wireType { + case 0: + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTypes + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + iNdEx++ + if dAtA[iNdEx-1] < 0x80 { + break + } + } + return iNdEx, nil + case 1: + iNdEx += 8 + return iNdEx, nil + case 2: + var length int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTypes + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + length |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + iNdEx += length + if length < 0 { + return 0, ErrInvalidLengthTypes + } + return iNdEx, nil + case 3: + for { + var innerWire uint64 + var start int = iNdEx + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return 0, ErrIntOverflowTypes + } + if iNdEx >= l { + return 0, io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + innerWire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + innerWireType := int(innerWire & 0x7) + if innerWireType == 4 { + break + } + next, err := skipTypes(dAtA[start:]) + if err != nil { + return 0, err + } + iNdEx = start + next + } + return iNdEx, nil + case 4: + return iNdEx, nil + case 5: + iNdEx += 4 + return iNdEx, nil + default: + return 0, fmt.Errorf("proto: illegal wireType %d", wireType) + } + } + panic("unreachable") +} + +var ( + ErrInvalidLengthTypes = fmt.Errorf("proto: negative length found during unmarshaling") + ErrIntOverflowTypes = fmt.Errorf("proto: integer overflow") +) + +func init() { proto.RegisterFile("pkg/types/types.proto", fileDescriptorTypes) } + +var fileDescriptorTypes = []byte{ + // 315 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x54, 0x91, 0xcf, 0x4e, 0xc2, 0x40, + 0x10, 0xc6, 0x5d, 0x4a, 0xab, 0x1d, 0xfc, 0xd3, 0x6c, 0x94, 0x6c, 0x3c, 0x90, 0x86, 0x8b, 0x8d, + 0x07, 0x4c, 0xd0, 0x78, 0xd7, 0x83, 0x09, 0x37, 0xb2, 0x6f, 0xb0, 0xb4, 0x03, 0x12, 0x2c, 0x6d, + 0xba, 0x0b, 0x84, 0xf8, 0x50, 0xbe, 0x86, 0x47, 0x1f, 0xc1, 0xf0, 0x24, 0x66, 0x67, 0x17, 0x82, + 0x97, 0x76, 0x7e, 0x3b, 0xf3, 0x75, 0xbe, 0xaf, 0x0b, 0x37, 0xf5, 0x62, 0xf6, 0x60, 0xb6, 0x35, + 0x6a, 0xf7, 0x1c, 0xd4, 0x4d, 0x65, 0x2a, 0x1e, 0x12, 0xf4, 0x27, 0x10, 0x8f, 0xc6, 0x2f, 0x45, + 0xd1, 0xa0, 0xd6, 0xfc, 0x0e, 0xa2, 0xa9, 0x2a, 0xe7, 0x1f, 0x5b, 0xc1, 0x52, 0x96, 0x5d, 0x0e, + 0xaf, 0x06, 0x4e, 0x31, 0x1a, 0xbf, 0xd1, 0xb1, 0xf4, 0x6d, 0x2e, 0xe0, 0x54, 0x39, 0x8d, 0x68, + 0xa5, 0x2c, 0x8b, 0xe5, 0x1e, 0x39, 0x87, 0x76, 0xa9, 0xf4, 0x42, 0x04, 0x74, 0x4c, 0x75, 0xff, + 0x8b, 0x41, 0x3c, 0x5a, 0x1a, 0x6c, 0xa6, 0x2a, 0x47, 0xde, 0x85, 0xa8, 0xc0, 0xf5, 0x3c, 0x47, + 0x5a, 0x12, 0x4b, 0x4f, 0x56, 0xb9, 0x54, 0x25, 0xfa, 0x0f, 0x52, 0xcd, 0x87, 0xd0, 0x39, 0xb8, + 0x43, 0x2d, 0x82, 0x34, 0xc8, 0x3a, 0xc3, 0xe4, 0xe0, 0xca, 0x77, 0xe4, 0xf1, 0x10, 0x4f, 0x20, + 0x28, 0xcd, 0x4a, 0xb4, 0x53, 0x96, 0xb5, 0xa5, 0x2d, 0xed, 0xc6, 0xf7, 0x8d, 0x1d, 0x10, 0xa1, + 0xdb, 0xe8, 0xc8, 0xa6, 0xa8, 0xf3, 0x39, 0x35, 0x22, 0x97, 0xc2, 0x63, 0xff, 0x13, 0x42, 0x59, + 0xad, 0x0c, 0x99, 0x2a, 0x50, 0x1b, 0x6f, 0x95, 0x6a, 0x2b, 0x9b, 0x29, 0x83, 0x1b, 0xb5, 0xdd, + 0x87, 0xf7, 0x78, 0x14, 0x2d, 0xf8, 0x17, 0xad, 0x0b, 0x91, 0xae, 0x56, 0x4d, 0x8e, 0xe4, 0x2a, + 0x96, 0x9e, 0xf8, 0x35, 0x84, 0x3a, 0xaf, 0x6a, 0x24, 0x5f, 0x17, 0xd2, 0xc1, 0xfd, 0x2d, 0x9c, + 0xed, 0x7f, 0x38, 0x8f, 0xa0, 0xb5, 0x7e, 0x4a, 0x4e, 0xe8, 0xfd, 0x9c, 0xb0, 0xd7, 0xf3, 0xef, + 0x5d, 0x8f, 0xfd, 0xec, 0x7a, 0xec, 0x77, 0xd7, 0x63, 0x93, 0x88, 0xae, 0xf2, 0xf1, 0x2f, 0x00, + 0x00, 0xff, 0xff, 0x91, 0x8a, 0xea, 0xe6, 0xe3, 0x01, 0x00, 0x00, +} diff --git a/pkg/types/types.proto b/pkg/types/types.proto new file mode 100644 index 0000000000..c1b427b3c1 --- /dev/null +++ b/pkg/types/types.proto @@ -0,0 +1,41 @@ +// +// Copyright 2018 Intel Corporation. +// +// SPDX-License-Identifier: Apache-2.0 +// + +syntax = "proto3"; + +package types; + +enum IPFamily { + v4 = 0; + v6 = 1; +} + +message IPAddress { + IPFamily family = 1; + string address = 2; + string mask = 3; +} + +message Interface { + string device = 1; + string name = 2; + repeated IPAddress IPAddresses = 3; + uint64 mtu = 4; + string hwAddr = 5; + + // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". + // Here, bridgeAddr is the address at which the bridge is attached on the root bus, + // while deviceAddr is the address at which the network device is attached on the bridge. + string pciAddr = 6; +} + +message Route { + string dest = 1; + string gateway = 2; + string device = 3; + string source = 4; + uint32 scope = 5; +} diff --git a/protocols/grpc/agent.pb.go b/protocols/grpc/agent.pb.go index c1b49bf577..d71cbbda19 100644 --- a/protocols/grpc/agent.pb.go +++ b/protocols/grpc/agent.pb.go @@ -42,10 +42,7 @@ TtyWinResizeRequest CreateSandboxRequest DestroySandboxRequest - IPAddress - Interface Interfaces - Route Routes UpdateInterfaceRequest AddInterfaceRequest @@ -101,6 +98,7 @@ package grpc import proto "github.com/gogo/protobuf/proto" import fmt "fmt" import math "math" +import types "github.com/kata-containers/agent/pkg/types" import google_protobuf2 "github.com/gogo/protobuf/types" import context "golang.org/x/net/context" @@ -119,27 +117,6 @@ var _ = math.Inf // proto package needs to be updated. const _ = proto.GoGoProtoPackageIsVersion2 // please upgrade the proto package -type IPFamily int32 - -const ( - IPFamily_v4 IPFamily = 0 - IPFamily_v6 IPFamily = 1 -) - -var IPFamily_name = map[int32]string{ - 0: "v4", - 1: "v6", -} -var IPFamily_value = map[string]int32{ - "v4": 0, - "v6": 1, -} - -func (x IPFamily) String() string { - return proto.EnumName(IPFamily_name, int32(x)) -} -func (IPFamily) EnumDescriptor() ([]byte, []int) { return fileDescriptorAgent, []int{0} } - type CreateContainerRequest struct { ContainerId string `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` ExecId string `protobuf:"bytes,2,opt,name=exec_id,json=execId,proto3" json:"exec_id,omitempty"` @@ -1148,171 +1125,32 @@ func (m *DestroySandboxRequest) String() string { return proto.Compac func (*DestroySandboxRequest) ProtoMessage() {} func (*DestroySandboxRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{31} } -type IPAddress struct { - Family IPFamily `protobuf:"varint,1,opt,name=family,proto3,enum=grpc.IPFamily" json:"family,omitempty"` - Address string `protobuf:"bytes,2,opt,name=address,proto3" json:"address,omitempty"` - Mask string `protobuf:"bytes,3,opt,name=mask,proto3" json:"mask,omitempty"` -} - -func (m *IPAddress) Reset() { *m = IPAddress{} } -func (m *IPAddress) String() string { return proto.CompactTextString(m) } -func (*IPAddress) ProtoMessage() {} -func (*IPAddress) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{32} } - -func (m *IPAddress) GetFamily() IPFamily { - if m != nil { - return m.Family - } - return IPFamily_v4 -} - -func (m *IPAddress) GetAddress() string { - if m != nil { - return m.Address - } - return "" -} - -func (m *IPAddress) GetMask() string { - if m != nil { - return m.Mask - } - return "" -} - -type Interface struct { - Device string `protobuf:"bytes,1,opt,name=device,proto3" json:"device,omitempty"` - Name string `protobuf:"bytes,2,opt,name=name,proto3" json:"name,omitempty"` - IPAddresses []*IPAddress `protobuf:"bytes,3,rep,name=IPAddresses" json:"IPAddresses,omitempty"` - Mtu uint64 `protobuf:"varint,4,opt,name=mtu,proto3" json:"mtu,omitempty"` - HwAddr string `protobuf:"bytes,5,opt,name=hwAddr,proto3" json:"hwAddr,omitempty"` - // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". - // Here, bridgeAddr is the address at which the bridge is attached on the root bus, - // while deviceAddr is the address at which the network device is attached on the bridge. - PciAddr string `protobuf:"bytes,6,opt,name=pciAddr,proto3" json:"pciAddr,omitempty"` -} - -func (m *Interface) Reset() { *m = Interface{} } -func (m *Interface) String() string { return proto.CompactTextString(m) } -func (*Interface) ProtoMessage() {} -func (*Interface) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{33} } - -func (m *Interface) GetDevice() string { - if m != nil { - return m.Device - } - return "" -} - -func (m *Interface) GetName() string { - if m != nil { - return m.Name - } - return "" -} - -func (m *Interface) GetIPAddresses() []*IPAddress { - if m != nil { - return m.IPAddresses - } - return nil -} - -func (m *Interface) GetMtu() uint64 { - if m != nil { - return m.Mtu - } - return 0 -} - -func (m *Interface) GetHwAddr() string { - if m != nil { - return m.HwAddr - } - return "" -} - -func (m *Interface) GetPciAddr() string { - if m != nil { - return m.PciAddr - } - return "" -} - type Interfaces struct { - Interfaces []*Interface `protobuf:"bytes,1,rep,name=Interfaces" json:"Interfaces,omitempty"` + Interfaces []*types.Interface `protobuf:"bytes,1,rep,name=Interfaces" json:"Interfaces,omitempty"` } func (m *Interfaces) Reset() { *m = Interfaces{} } func (m *Interfaces) String() string { return proto.CompactTextString(m) } func (*Interfaces) ProtoMessage() {} -func (*Interfaces) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{34} } +func (*Interfaces) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{32} } -func (m *Interfaces) GetInterfaces() []*Interface { +func (m *Interfaces) GetInterfaces() []*types.Interface { if m != nil { return m.Interfaces } return nil } -type Route struct { - Dest string `protobuf:"bytes,1,opt,name=dest,proto3" json:"dest,omitempty"` - Gateway string `protobuf:"bytes,2,opt,name=gateway,proto3" json:"gateway,omitempty"` - Device string `protobuf:"bytes,3,opt,name=device,proto3" json:"device,omitempty"` - Source string `protobuf:"bytes,4,opt,name=source,proto3" json:"source,omitempty"` - Scope uint32 `protobuf:"varint,5,opt,name=scope,proto3" json:"scope,omitempty"` -} - -func (m *Route) Reset() { *m = Route{} } -func (m *Route) String() string { return proto.CompactTextString(m) } -func (*Route) ProtoMessage() {} -func (*Route) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{35} } - -func (m *Route) GetDest() string { - if m != nil { - return m.Dest - } - return "" -} - -func (m *Route) GetGateway() string { - if m != nil { - return m.Gateway - } - return "" -} - -func (m *Route) GetDevice() string { - if m != nil { - return m.Device - } - return "" -} - -func (m *Route) GetSource() string { - if m != nil { - return m.Source - } - return "" -} - -func (m *Route) GetScope() uint32 { - if m != nil { - return m.Scope - } - return 0 -} - type Routes struct { - Routes []*Route `protobuf:"bytes,1,rep,name=Routes" json:"Routes,omitempty"` + Routes []*types.Route `protobuf:"bytes,1,rep,name=Routes" json:"Routes,omitempty"` } func (m *Routes) Reset() { *m = Routes{} } func (m *Routes) String() string { return proto.CompactTextString(m) } func (*Routes) ProtoMessage() {} -func (*Routes) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{36} } +func (*Routes) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{33} } -func (m *Routes) GetRoutes() []*Route { +func (m *Routes) GetRoutes() []*types.Route { if m != nil { return m.Routes } @@ -1320,15 +1158,15 @@ func (m *Routes) GetRoutes() []*Route { } type UpdateInterfaceRequest struct { - Interface *Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` + Interface *types.Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` } func (m *UpdateInterfaceRequest) Reset() { *m = UpdateInterfaceRequest{} } func (m *UpdateInterfaceRequest) String() string { return proto.CompactTextString(m) } func (*UpdateInterfaceRequest) ProtoMessage() {} -func (*UpdateInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{37} } +func (*UpdateInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{34} } -func (m *UpdateInterfaceRequest) GetInterface() *Interface { +func (m *UpdateInterfaceRequest) GetInterface() *types.Interface { if m != nil { return m.Interface } @@ -1336,15 +1174,15 @@ func (m *UpdateInterfaceRequest) GetInterface() *Interface { } type AddInterfaceRequest struct { - Interface *Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` + Interface *types.Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` } func (m *AddInterfaceRequest) Reset() { *m = AddInterfaceRequest{} } func (m *AddInterfaceRequest) String() string { return proto.CompactTextString(m) } func (*AddInterfaceRequest) ProtoMessage() {} -func (*AddInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{38} } +func (*AddInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{35} } -func (m *AddInterfaceRequest) GetInterface() *Interface { +func (m *AddInterfaceRequest) GetInterface() *types.Interface { if m != nil { return m.Interface } @@ -1352,15 +1190,15 @@ func (m *AddInterfaceRequest) GetInterface() *Interface { } type RemoveInterfaceRequest struct { - Interface *Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` + Interface *types.Interface `protobuf:"bytes,1,opt,name=interface" json:"interface,omitempty"` } func (m *RemoveInterfaceRequest) Reset() { *m = RemoveInterfaceRequest{} } func (m *RemoveInterfaceRequest) String() string { return proto.CompactTextString(m) } func (*RemoveInterfaceRequest) ProtoMessage() {} -func (*RemoveInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{39} } +func (*RemoveInterfaceRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{36} } -func (m *RemoveInterfaceRequest) GetInterface() *Interface { +func (m *RemoveInterfaceRequest) GetInterface() *types.Interface { if m != nil { return m.Interface } @@ -1374,7 +1212,7 @@ type UpdateRoutesRequest struct { func (m *UpdateRoutesRequest) Reset() { *m = UpdateRoutesRequest{} } func (m *UpdateRoutesRequest) String() string { return proto.CompactTextString(m) } func (*UpdateRoutesRequest) ProtoMessage() {} -func (*UpdateRoutesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{40} } +func (*UpdateRoutesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{37} } func (m *UpdateRoutesRequest) GetRoutes() *Routes { if m != nil { @@ -1389,7 +1227,7 @@ type ListInterfacesRequest struct { func (m *ListInterfacesRequest) Reset() { *m = ListInterfacesRequest{} } func (m *ListInterfacesRequest) String() string { return proto.CompactTextString(m) } func (*ListInterfacesRequest) ProtoMessage() {} -func (*ListInterfacesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{41} } +func (*ListInterfacesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{38} } type ListRoutesRequest struct { } @@ -1397,7 +1235,7 @@ type ListRoutesRequest struct { func (m *ListRoutesRequest) Reset() { *m = ListRoutesRequest{} } func (m *ListRoutesRequest) String() string { return proto.CompactTextString(m) } func (*ListRoutesRequest) ProtoMessage() {} -func (*ListRoutesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{42} } +func (*ListRoutesRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{39} } type OnlineCPUMemRequest struct { // Wait specifies if the caller waits for the agent to online all resources. @@ -1413,7 +1251,7 @@ type OnlineCPUMemRequest struct { func (m *OnlineCPUMemRequest) Reset() { *m = OnlineCPUMemRequest{} } func (m *OnlineCPUMemRequest) String() string { return proto.CompactTextString(m) } func (*OnlineCPUMemRequest) ProtoMessage() {} -func (*OnlineCPUMemRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{43} } +func (*OnlineCPUMemRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{40} } func (m *OnlineCPUMemRequest) GetWait() bool { if m != nil { @@ -1444,7 +1282,7 @@ type ReseedRandomDevRequest struct { func (m *ReseedRandomDevRequest) Reset() { *m = ReseedRandomDevRequest{} } func (m *ReseedRandomDevRequest) String() string { return proto.CompactTextString(m) } func (*ReseedRandomDevRequest) ProtoMessage() {} -func (*ReseedRandomDevRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{44} } +func (*ReseedRandomDevRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{41} } func (m *ReseedRandomDevRequest) GetData() []byte { if m != nil { @@ -1471,7 +1309,7 @@ type AgentDetails struct { func (m *AgentDetails) Reset() { *m = AgentDetails{} } func (m *AgentDetails) String() string { return proto.CompactTextString(m) } func (*AgentDetails) ProtoMessage() {} -func (*AgentDetails) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{45} } +func (*AgentDetails) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{42} } func (m *AgentDetails) GetVersion() string { if m != nil { @@ -1518,7 +1356,7 @@ type GuestDetailsRequest struct { func (m *GuestDetailsRequest) Reset() { *m = GuestDetailsRequest{} } func (m *GuestDetailsRequest) String() string { return proto.CompactTextString(m) } func (*GuestDetailsRequest) ProtoMessage() {} -func (*GuestDetailsRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{46} } +func (*GuestDetailsRequest) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{43} } func (m *GuestDetailsRequest) GetMemBlockSize() bool { if m != nil { @@ -1536,7 +1374,7 @@ type GuestDetailsResponse struct { func (m *GuestDetailsResponse) Reset() { *m = GuestDetailsResponse{} } func (m *GuestDetailsResponse) String() string { return proto.CompactTextString(m) } func (*GuestDetailsResponse) ProtoMessage() {} -func (*GuestDetailsResponse) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{47} } +func (*GuestDetailsResponse) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{44} } func (m *GuestDetailsResponse) GetMemBlockSizeBytes() uint64 { if m != nil { @@ -1585,7 +1423,7 @@ type Storage struct { func (m *Storage) Reset() { *m = Storage{} } func (m *Storage) String() string { return proto.CompactTextString(m) } func (*Storage) ProtoMessage() {} -func (*Storage) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{48} } +func (*Storage) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{45} } func (m *Storage) GetDriver() string { if m != nil { @@ -1668,7 +1506,7 @@ type Device struct { func (m *Device) Reset() { *m = Device{} } func (m *Device) String() string { return proto.CompactTextString(m) } func (*Device) ProtoMessage() {} -func (*Device) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{49} } +func (*Device) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{46} } func (m *Device) GetId() string { if m != nil { @@ -1714,7 +1552,7 @@ type StringUser struct { func (m *StringUser) Reset() { *m = StringUser{} } func (m *StringUser) String() string { return proto.CompactTextString(m) } func (*StringUser) ProtoMessage() {} -func (*StringUser) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{50} } +func (*StringUser) Descriptor() ([]byte, []int) { return fileDescriptorAgent, []int{47} } func (m *StringUser) GetUid() string { if m != nil { @@ -1770,10 +1608,7 @@ func init() { proto.RegisterType((*TtyWinResizeRequest)(nil), "grpc.TtyWinResizeRequest") proto.RegisterType((*CreateSandboxRequest)(nil), "grpc.CreateSandboxRequest") proto.RegisterType((*DestroySandboxRequest)(nil), "grpc.DestroySandboxRequest") - proto.RegisterType((*IPAddress)(nil), "grpc.IPAddress") - proto.RegisterType((*Interface)(nil), "grpc.Interface") proto.RegisterType((*Interfaces)(nil), "grpc.Interfaces") - proto.RegisterType((*Route)(nil), "grpc.Route") proto.RegisterType((*Routes)(nil), "grpc.Routes") proto.RegisterType((*UpdateInterfaceRequest)(nil), "grpc.UpdateInterfaceRequest") proto.RegisterType((*AddInterfaceRequest)(nil), "grpc.AddInterfaceRequest") @@ -1789,7 +1624,6 @@ func init() { proto.RegisterType((*Storage)(nil), "grpc.Storage") proto.RegisterType((*Device)(nil), "grpc.Device") proto.RegisterType((*StringUser)(nil), "grpc.StringUser") - proto.RegisterEnum("grpc.IPFamily", IPFamily_name, IPFamily_value) } // Reference imports to suppress errors if they are not otherwise used. @@ -1828,9 +1662,9 @@ type AgentServiceClient interface { CloseStdin(ctx context.Context, in *CloseStdinRequest, opts ...grpc1.CallOption) (*google_protobuf2.Empty, error) TtyWinResize(ctx context.Context, in *TtyWinResizeRequest, opts ...grpc1.CallOption) (*google_protobuf2.Empty, error) // networking - AddInterface(ctx context.Context, in *AddInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) - UpdateInterface(ctx context.Context, in *UpdateInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) - RemoveInterface(ctx context.Context, in *RemoveInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) + AddInterface(ctx context.Context, in *AddInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) + UpdateInterface(ctx context.Context, in *UpdateInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) + RemoveInterface(ctx context.Context, in *RemoveInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) UpdateRoutes(ctx context.Context, in *UpdateRoutesRequest, opts ...grpc1.CallOption) (*Routes, error) ListInterfaces(ctx context.Context, in *ListInterfacesRequest, opts ...grpc1.CallOption) (*Interfaces, error) ListRoutes(ctx context.Context, in *ListRoutesRequest, opts ...grpc1.CallOption) (*Routes, error) @@ -1994,8 +1828,8 @@ func (c *agentServiceClient) TtyWinResize(ctx context.Context, in *TtyWinResizeR return out, nil } -func (c *agentServiceClient) AddInterface(ctx context.Context, in *AddInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) { - out := new(Interface) +func (c *agentServiceClient) AddInterface(ctx context.Context, in *AddInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) { + out := new(types.Interface) err := grpc1.Invoke(ctx, "/grpc.AgentService/AddInterface", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2003,8 +1837,8 @@ func (c *agentServiceClient) AddInterface(ctx context.Context, in *AddInterfaceR return out, nil } -func (c *agentServiceClient) UpdateInterface(ctx context.Context, in *UpdateInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) { - out := new(Interface) +func (c *agentServiceClient) UpdateInterface(ctx context.Context, in *UpdateInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) { + out := new(types.Interface) err := grpc1.Invoke(ctx, "/grpc.AgentService/UpdateInterface", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2012,8 +1846,8 @@ func (c *agentServiceClient) UpdateInterface(ctx context.Context, in *UpdateInte return out, nil } -func (c *agentServiceClient) RemoveInterface(ctx context.Context, in *RemoveInterfaceRequest, opts ...grpc1.CallOption) (*Interface, error) { - out := new(Interface) +func (c *agentServiceClient) RemoveInterface(ctx context.Context, in *RemoveInterfaceRequest, opts ...grpc1.CallOption) (*types.Interface, error) { + out := new(types.Interface) err := grpc1.Invoke(ctx, "/grpc.AgentService/RemoveInterface", in, out, c.cc, opts...) if err != nil { return nil, err @@ -2121,9 +1955,9 @@ type AgentServiceServer interface { CloseStdin(context.Context, *CloseStdinRequest) (*google_protobuf2.Empty, error) TtyWinResize(context.Context, *TtyWinResizeRequest) (*google_protobuf2.Empty, error) // networking - AddInterface(context.Context, *AddInterfaceRequest) (*Interface, error) - UpdateInterface(context.Context, *UpdateInterfaceRequest) (*Interface, error) - RemoveInterface(context.Context, *RemoveInterfaceRequest) (*Interface, error) + AddInterface(context.Context, *AddInterfaceRequest) (*types.Interface, error) + UpdateInterface(context.Context, *UpdateInterfaceRequest) (*types.Interface, error) + RemoveInterface(context.Context, *RemoveInterfaceRequest) (*types.Interface, error) UpdateRoutes(context.Context, *UpdateRoutesRequest) (*Routes, error) ListInterfaces(context.Context, *ListInterfacesRequest) (*Interfaces, error) ListRoutes(context.Context, *ListRoutesRequest) (*Routes, error) @@ -4037,100 +3871,6 @@ func (m *DestroySandboxRequest) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *IPAddress) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *IPAddress) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if m.Family != 0 { - dAtA[i] = 0x8 - i++ - i = encodeVarintAgent(dAtA, i, uint64(m.Family)) - } - if len(m.Address) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Address))) - i += copy(dAtA[i:], m.Address) - } - if len(m.Mask) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Mask))) - i += copy(dAtA[i:], m.Mask) - } - return i, nil -} - -func (m *Interface) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Interface) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Device) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Device))) - i += copy(dAtA[i:], m.Device) - } - if len(m.Name) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Name))) - i += copy(dAtA[i:], m.Name) - } - if len(m.IPAddresses) > 0 { - for _, msg := range m.IPAddresses { - dAtA[i] = 0x1a - i++ - i = encodeVarintAgent(dAtA, i, uint64(msg.Size())) - n, err := msg.MarshalTo(dAtA[i:]) - if err != nil { - return 0, err - } - i += n - } - } - if m.Mtu != 0 { - dAtA[i] = 0x20 - i++ - i = encodeVarintAgent(dAtA, i, uint64(m.Mtu)) - } - if len(m.HwAddr) > 0 { - dAtA[i] = 0x2a - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.HwAddr))) - i += copy(dAtA[i:], m.HwAddr) - } - if len(m.PciAddr) > 0 { - dAtA[i] = 0x32 - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.PciAddr))) - i += copy(dAtA[i:], m.PciAddr) - } - return i, nil -} - func (m *Interfaces) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -4161,53 +3901,6 @@ func (m *Interfaces) MarshalTo(dAtA []byte) (int, error) { return i, nil } -func (m *Route) Marshal() (dAtA []byte, err error) { - size := m.Size() - dAtA = make([]byte, size) - n, err := m.MarshalTo(dAtA) - if err != nil { - return nil, err - } - return dAtA[:n], nil -} - -func (m *Route) MarshalTo(dAtA []byte) (int, error) { - var i int - _ = i - var l int - _ = l - if len(m.Dest) > 0 { - dAtA[i] = 0xa - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Dest))) - i += copy(dAtA[i:], m.Dest) - } - if len(m.Gateway) > 0 { - dAtA[i] = 0x12 - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Gateway))) - i += copy(dAtA[i:], m.Gateway) - } - if len(m.Device) > 0 { - dAtA[i] = 0x1a - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Device))) - i += copy(dAtA[i:], m.Device) - } - if len(m.Source) > 0 { - dAtA[i] = 0x22 - i++ - i = encodeVarintAgent(dAtA, i, uint64(len(m.Source))) - i += copy(dAtA[i:], m.Source) - } - if m.Scope != 0 { - dAtA[i] = 0x28 - i++ - i = encodeVarintAgent(dAtA, i, uint64(m.Scope)) - } - return i, nil -} - func (m *Routes) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -5340,54 +5033,6 @@ func (m *DestroySandboxRequest) Size() (n int) { return n } -func (m *IPAddress) Size() (n int) { - var l int - _ = l - if m.Family != 0 { - n += 1 + sovAgent(uint64(m.Family)) - } - l = len(m.Address) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.Mask) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - return n -} - -func (m *Interface) Size() (n int) { - var l int - _ = l - l = len(m.Device) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.Name) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - if len(m.IPAddresses) > 0 { - for _, e := range m.IPAddresses { - l = e.Size() - n += 1 + l + sovAgent(uint64(l)) - } - } - if m.Mtu != 0 { - n += 1 + sovAgent(uint64(m.Mtu)) - } - l = len(m.HwAddr) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.PciAddr) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - return n -} - func (m *Interfaces) Size() (n int) { var l int _ = l @@ -5400,31 +5045,6 @@ func (m *Interfaces) Size() (n int) { return n } -func (m *Route) Size() (n int) { - var l int - _ = l - l = len(m.Dest) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.Gateway) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.Device) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - l = len(m.Source) - if l > 0 { - n += 1 + l + sovAgent(uint64(l)) - } - if m.Scope != 0 { - n += 1 + sovAgent(uint64(m.Scope)) - } - return n -} - func (m *Routes) Size() (n int) { var l int _ = l @@ -9904,7 +9524,7 @@ func (m *DestroySandboxRequest) Unmarshal(dAtA []byte) error { } return nil } -func (m *IPAddress) Unmarshal(dAtA []byte) error { +func (m *Interfaces) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 for iNdEx < l { @@ -9927,17 +9547,17 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { fieldNum := int32(wire >> 3) wireType := int(wire & 0x7) if wireType == 4 { - return fmt.Errorf("proto: IPAddress: wiretype end group for non-group") + return fmt.Errorf("proto: Interfaces: wiretype end group for non-group") } if fieldNum <= 0 { - return fmt.Errorf("proto: IPAddress: illegal tag %d (wire type %d)", fieldNum, wire) + return fmt.Errorf("proto: Interfaces: illegal tag %d (wire type %d)", fieldNum, wire) } switch fieldNum { case 1: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Family", wireType) + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Interfaces", wireType) } - m.Family = 0 + var msglen int for shift := uint(0); ; shift += 7 { if shift >= 64 { return ErrIntOverflowAgent @@ -9947,362 +9567,19 @@ func (m *IPAddress) Unmarshal(dAtA []byte) error { } b := dAtA[iNdEx] iNdEx++ - m.Family |= (IPFamily(b) & 0x7F) << shift + msglen |= (int(b) & 0x7F) << shift if b < 0x80 { break } } - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Address", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Address = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Mask", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Mask = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipAgent(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthAgent - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Interface) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Interface: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Interface: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Device = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Name", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Name = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field IPAddresses", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthAgent + if msglen < 0 { + return ErrInvalidLengthAgent } postIndex := iNdEx + msglen if postIndex > l { return io.ErrUnexpectedEOF } - m.IPAddresses = append(m.IPAddresses, &IPAddress{}) - if err := m.IPAddresses[len(m.IPAddresses)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { - return err - } - iNdEx = postIndex - case 4: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Mtu", wireType) - } - m.Mtu = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Mtu |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - case 5: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field HwAddr", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.HwAddr = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 6: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field PciAddr", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.PciAddr = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - default: - iNdEx = preIndex - skippy, err := skipAgent(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthAgent - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} -func (m *Interfaces) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Interfaces: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Interfaces: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Interfaces", wireType) - } - var msglen int - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - msglen |= (int(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - if msglen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + msglen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Interfaces = append(m.Interfaces, &Interface{}) + m.Interfaces = append(m.Interfaces, &types.Interface{}) if err := m.Interfaces[len(m.Interfaces)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -10328,191 +9605,6 @@ func (m *Interfaces) Unmarshal(dAtA []byte) error { } return nil } -func (m *Route) Unmarshal(dAtA []byte) error { - l := len(dAtA) - iNdEx := 0 - for iNdEx < l { - preIndex := iNdEx - var wire uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - wire |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - fieldNum := int32(wire >> 3) - wireType := int(wire & 0x7) - if wireType == 4 { - return fmt.Errorf("proto: Route: wiretype end group for non-group") - } - if fieldNum <= 0 { - return fmt.Errorf("proto: Route: illegal tag %d (wire type %d)", fieldNum, wire) - } - switch fieldNum { - case 1: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Dest", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Dest = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 2: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Gateway", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Gateway = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 3: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Device", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Device = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 4: - if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Source", wireType) - } - var stringLen uint64 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - stringLen |= (uint64(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - intStringLen := int(stringLen) - if intStringLen < 0 { - return ErrInvalidLengthAgent - } - postIndex := iNdEx + intStringLen - if postIndex > l { - return io.ErrUnexpectedEOF - } - m.Source = string(dAtA[iNdEx:postIndex]) - iNdEx = postIndex - case 5: - if wireType != 0 { - return fmt.Errorf("proto: wrong wireType = %d for field Scope", wireType) - } - m.Scope = 0 - for shift := uint(0); ; shift += 7 { - if shift >= 64 { - return ErrIntOverflowAgent - } - if iNdEx >= l { - return io.ErrUnexpectedEOF - } - b := dAtA[iNdEx] - iNdEx++ - m.Scope |= (uint32(b) & 0x7F) << shift - if b < 0x80 { - break - } - } - default: - iNdEx = preIndex - skippy, err := skipAgent(dAtA[iNdEx:]) - if err != nil { - return err - } - if skippy < 0 { - return ErrInvalidLengthAgent - } - if (iNdEx + skippy) > l { - return io.ErrUnexpectedEOF - } - iNdEx += skippy - } - } - - if iNdEx > l { - return io.ErrUnexpectedEOF - } - return nil -} func (m *Routes) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 @@ -10568,7 +9660,7 @@ func (m *Routes) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Routes = append(m.Routes, &Route{}) + m.Routes = append(m.Routes, &types.Route{}) if err := m.Routes[len(m.Routes)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -10650,7 +9742,7 @@ func (m *UpdateInterfaceRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Interface == nil { - m.Interface = &Interface{} + m.Interface = &types.Interface{} } if err := m.Interface.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -10733,7 +9825,7 @@ func (m *AddInterfaceRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Interface == nil { - m.Interface = &Interface{} + m.Interface = &types.Interface{} } if err := m.Interface.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -10816,7 +9908,7 @@ func (m *RemoveInterfaceRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Interface == nil { - m.Interface = &Interface{} + m.Interface = &types.Interface{} } if err := m.Interface.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -12229,167 +11321,158 @@ var ( func init() { proto.RegisterFile("agent.proto", fileDescriptorAgent) } var fileDescriptorAgent = []byte{ - // 2582 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x18, 0xdb, 0x6e, 0x24, 0x47, - 0x95, 0xb9, 0x78, 0xec, 0x39, 0x73, 0xf3, 0x94, 0xbd, 0xde, 0xc9, 0x6c, 0x08, 0x4e, 0x07, 0x36, - 0x4e, 0x42, 0xbc, 0x8a, 0x13, 0x91, 0x68, 0x57, 0xab, 0x65, 0x7d, 0xc1, 0x36, 0xc9, 0xb2, 0x43, - 0x7b, 0xad, 0x45, 0x42, 0xa8, 0xd5, 0xee, 0x2e, 0xcf, 0x54, 0x3c, 0xdd, 0xd5, 0xe9, 0xaa, 0xb6, - 0x3d, 0x89, 0x84, 0x78, 0xe2, 0x2f, 0xf8, 0x01, 0x84, 0x78, 0xe1, 0x89, 0x77, 0x1e, 0xf2, 0xc8, - 0x3b, 0x12, 0x42, 0xfb, 0x09, 0x7c, 0x01, 0xaa, 0x5b, 0x5f, 0x66, 0xc6, 0x5e, 0x70, 0x2c, 0xf1, - 0x32, 0xd3, 0xe7, 0x52, 0xe7, 0x56, 0x55, 0xa7, 0xce, 0x39, 0xd0, 0x70, 0x87, 0x38, 0xe4, 0x9b, - 0x51, 0x4c, 0x39, 0x45, 0xd5, 0x61, 0x1c, 0x79, 0xfd, 0x3a, 0xf5, 0x88, 0x42, 0xf4, 0xef, 0x0d, - 0x29, 0x1d, 0x8e, 0xf1, 0x03, 0x09, 0x9d, 0x24, 0xa7, 0x0f, 0x70, 0x10, 0xf1, 0x89, 0x22, 0x5a, - 0x7f, 0x28, 0xc3, 0xda, 0x4e, 0x8c, 0x5d, 0x8e, 0x77, 0x68, 0xc8, 0x5d, 0x12, 0xe2, 0xd8, 0xc6, - 0x5f, 0x25, 0x98, 0x71, 0xf4, 0x36, 0x34, 0x3d, 0x83, 0x73, 0x88, 0xdf, 0x2b, 0xad, 0x97, 0x36, - 0xea, 0x76, 0x23, 0xc5, 0x1d, 0xfa, 0xe8, 0x2e, 0x2c, 0xe2, 0x4b, 0xec, 0x09, 0x6a, 0x59, 0x52, - 0x6b, 0x02, 0x3c, 0xf4, 0xd1, 0x47, 0xd0, 0x60, 0x3c, 0x26, 0xe1, 0xd0, 0x49, 0x18, 0x8e, 0x7b, - 0x95, 0xf5, 0xd2, 0x46, 0x63, 0x6b, 0x79, 0x53, 0x98, 0xb6, 0x79, 0x24, 0x09, 0xc7, 0x0c, 0xc7, - 0x36, 0xb0, 0xf4, 0x1b, 0xdd, 0x87, 0x45, 0x1f, 0x9f, 0x13, 0x0f, 0xb3, 0x5e, 0x75, 0xbd, 0xb2, - 0xd1, 0xd8, 0x6a, 0x2a, 0xf6, 0x5d, 0x89, 0xb4, 0x0d, 0x11, 0xbd, 0x07, 0x4b, 0x8c, 0xd3, 0xd8, - 0x1d, 0x62, 0xd6, 0x5b, 0x90, 0x8c, 0x2d, 0x23, 0x57, 0x62, 0xed, 0x94, 0x8c, 0xde, 0x84, 0xca, - 0xf3, 0x9d, 0xc3, 0x5e, 0x4d, 0x6a, 0x07, 0xcd, 0x15, 0x61, 0xcf, 0x16, 0x68, 0xf4, 0x0e, 0xb4, - 0x98, 0x1b, 0xfa, 0x27, 0xf4, 0xd2, 0x89, 0x88, 0x1f, 0xb2, 0xde, 0xe2, 0x7a, 0x69, 0x63, 0xc9, - 0x6e, 0x6a, 0xe4, 0x40, 0xe0, 0xac, 0x87, 0x70, 0xe7, 0x88, 0xbb, 0x31, 0xbf, 0x41, 0x74, 0xac, - 0x63, 0x58, 0xb3, 0x71, 0x40, 0xcf, 0x6f, 0x14, 0xda, 0x1e, 0x2c, 0x72, 0x12, 0x60, 0x9a, 0x70, - 0x19, 0xda, 0x96, 0x6d, 0x40, 0xeb, 0x4f, 0x25, 0x40, 0x7b, 0x97, 0xd8, 0x1b, 0xc4, 0xd4, 0xc3, - 0x8c, 0xfd, 0x9f, 0xb6, 0xeb, 0x5d, 0x58, 0x8c, 0x94, 0x01, 0xbd, 0xaa, 0x64, 0xd7, 0xbb, 0x60, - 0xac, 0x32, 0x54, 0xeb, 0x4b, 0x58, 0x3d, 0x22, 0xc3, 0xd0, 0x1d, 0xdf, 0xa2, 0xbd, 0x6b, 0x50, - 0x63, 0x52, 0xa6, 0x34, 0xb5, 0x65, 0x6b, 0xc8, 0x1a, 0x00, 0x7a, 0xe9, 0x12, 0x7e, 0x7b, 0x9a, - 0xac, 0x0f, 0x61, 0xa5, 0x20, 0x91, 0x45, 0x34, 0x64, 0x58, 0x1a, 0xc0, 0x5d, 0x9e, 0x30, 0x29, - 0x6c, 0xc1, 0xd6, 0x90, 0x85, 0x61, 0xf5, 0x0b, 0xc2, 0x0c, 0x3b, 0xfe, 0x5f, 0x4c, 0x58, 0x83, - 0xda, 0x29, 0x8d, 0x03, 0x97, 0x1b, 0x0b, 0x14, 0x84, 0x10, 0x54, 0xdd, 0x78, 0xc8, 0x7a, 0x95, - 0xf5, 0xca, 0x46, 0xdd, 0x96, 0xdf, 0xe2, 0x54, 0x4e, 0xa9, 0xd1, 0x76, 0xbd, 0x0d, 0x4d, 0x1d, - 0x77, 0x67, 0x4c, 0x18, 0x97, 0x7a, 0x9a, 0x76, 0x43, 0xe3, 0xc4, 0x1a, 0x8b, 0xc2, 0xda, 0x71, - 0xe4, 0xdf, 0xf0, 0xc2, 0x6f, 0x41, 0x3d, 0xc6, 0x8c, 0x26, 0xb1, 0xb8, 0xa6, 0x65, 0xb9, 0xef, - 0xab, 0x6a, 0xdf, 0xbf, 0x20, 0x61, 0x72, 0x69, 0x1b, 0x9a, 0x9d, 0xb1, 0xe9, 0x2b, 0xc4, 0xd9, - 0x4d, 0xae, 0xd0, 0x43, 0xb8, 0x33, 0x70, 0x13, 0x76, 0x13, 0x5b, 0xad, 0x47, 0xe2, 0xfa, 0xb1, - 0x24, 0xb8, 0xd1, 0xe2, 0x3f, 0x96, 0x60, 0x69, 0x27, 0x4a, 0x8e, 0x99, 0x3b, 0xc4, 0xe8, 0x07, - 0xd0, 0xe0, 0x94, 0xbb, 0x63, 0x27, 0x11, 0xa0, 0x64, 0xaf, 0xda, 0x20, 0x51, 0x8a, 0x41, 0x84, - 0x1d, 0xc7, 0x5e, 0x94, 0x68, 0x8e, 0xf2, 0x7a, 0x65, 0xa3, 0x6a, 0x37, 0x14, 0x4e, 0xb1, 0x6c, - 0xc2, 0x8a, 0xa4, 0x39, 0x24, 0x74, 0xce, 0x70, 0x1c, 0xe2, 0x71, 0x40, 0x7d, 0x2c, 0xcf, 0x6f, - 0xd5, 0xee, 0x4a, 0xd2, 0x61, 0xf8, 0x79, 0x4a, 0x40, 0xef, 0x43, 0x37, 0xe5, 0x17, 0x97, 0x52, - 0x72, 0x57, 0x25, 0x77, 0x47, 0x73, 0x1f, 0x6b, 0xb4, 0xf5, 0x5b, 0x68, 0xbf, 0x18, 0xc5, 0x94, - 0xf3, 0x31, 0x09, 0x87, 0xbb, 0x2e, 0x77, 0x45, 0xf6, 0x88, 0x70, 0x4c, 0xa8, 0xcf, 0xb4, 0xb5, - 0x06, 0x44, 0x1f, 0x40, 0x97, 0x2b, 0x5e, 0xec, 0x3b, 0x86, 0xa7, 0x2c, 0x79, 0x96, 0x53, 0xc2, - 0x40, 0x33, 0xff, 0x08, 0xda, 0x19, 0xb3, 0xc8, 0x3f, 0xda, 0xde, 0x56, 0x8a, 0x7d, 0x41, 0x02, - 0x6c, 0x9d, 0xcb, 0x58, 0xc9, 0x4d, 0x46, 0x1f, 0x40, 0x3d, 0x8b, 0x43, 0x49, 0x9e, 0x90, 0xb6, - 0x3a, 0x21, 0x26, 0x9c, 0xf6, 0x52, 0x1a, 0x94, 0xc7, 0xd0, 0xe1, 0xa9, 0xe1, 0x8e, 0xef, 0x72, - 0xb7, 0x78, 0xa8, 0x8a, 0x5e, 0xd9, 0x6d, 0x5e, 0x80, 0xad, 0x47, 0x50, 0x1f, 0x10, 0x9f, 0x29, - 0xc5, 0x3d, 0x58, 0xf4, 0x92, 0x38, 0xc6, 0x21, 0x37, 0x2e, 0x6b, 0x10, 0xad, 0xc2, 0xc2, 0x98, - 0x04, 0x84, 0x6b, 0x37, 0x15, 0x60, 0x51, 0x80, 0x67, 0x38, 0xa0, 0xf1, 0x44, 0x06, 0x6c, 0x15, - 0x16, 0xf2, 0x9b, 0xab, 0x00, 0x74, 0x0f, 0xea, 0x81, 0x7b, 0x99, 0x6e, 0xaa, 0xa0, 0x2c, 0x05, - 0xee, 0xa5, 0x32, 0xbe, 0x07, 0x8b, 0xa7, 0x2e, 0x19, 0x7b, 0x21, 0xd7, 0x51, 0x31, 0x60, 0xa6, - 0xb0, 0x9a, 0x57, 0xf8, 0xb7, 0x32, 0x34, 0x94, 0x46, 0x65, 0xf0, 0x2a, 0x2c, 0x78, 0xae, 0x37, - 0x4a, 0x55, 0x4a, 0x00, 0xdd, 0x37, 0x86, 0x94, 0xf3, 0x49, 0x38, 0xb3, 0xd4, 0x98, 0xf6, 0x00, - 0x80, 0x5d, 0xb8, 0x91, 0xb6, 0xad, 0x72, 0x05, 0x73, 0x5d, 0xf0, 0x28, 0x73, 0x3f, 0x86, 0xa6, - 0x3a, 0x77, 0x7a, 0x49, 0xf5, 0x8a, 0x25, 0x0d, 0xc5, 0xa5, 0x16, 0xbd, 0x03, 0xad, 0x84, 0x61, - 0x67, 0x44, 0x70, 0xec, 0xc6, 0xde, 0x68, 0xd2, 0x5b, 0x50, 0x6f, 0x64, 0xc2, 0xf0, 0x81, 0xc1, - 0xa1, 0x2d, 0x58, 0x10, 0xe9, 0x8f, 0xf5, 0x6a, 0xf2, 0x39, 0x7e, 0x33, 0x2f, 0x52, 0xba, 0xba, - 0x29, 0x7f, 0xf7, 0x42, 0x1e, 0x4f, 0x6c, 0xc5, 0xda, 0xff, 0x0c, 0x20, 0x43, 0xa2, 0x65, 0xa8, - 0x9c, 0xe1, 0x89, 0xbe, 0x87, 0xe2, 0x53, 0x04, 0xe7, 0xdc, 0x1d, 0x27, 0x26, 0xea, 0x0a, 0x78, - 0x58, 0xfe, 0xac, 0x64, 0x79, 0xd0, 0xd9, 0x1e, 0x9f, 0x11, 0x9a, 0x5b, 0xbe, 0x0a, 0x0b, 0x81, - 0xfb, 0x25, 0x8d, 0x4d, 0x24, 0x25, 0x20, 0xb1, 0x24, 0xa4, 0xb1, 0x11, 0x21, 0x01, 0xd4, 0x86, - 0x32, 0x8d, 0x64, 0xbc, 0xea, 0x76, 0x99, 0x46, 0x99, 0xa2, 0x6a, 0x4e, 0x91, 0xf5, 0xcf, 0x2a, - 0x40, 0xa6, 0x05, 0xd9, 0xd0, 0x27, 0xd4, 0x61, 0x38, 0x16, 0x25, 0x88, 0x73, 0x32, 0xe1, 0x98, - 0x39, 0x31, 0xf6, 0x92, 0x98, 0x91, 0x73, 0xb1, 0x7f, 0xc2, 0xed, 0x3b, 0xca, 0xed, 0x29, 0xdb, - 0xec, 0xbb, 0x84, 0x1e, 0xa9, 0x75, 0xdb, 0x62, 0x99, 0x6d, 0x56, 0xa1, 0x43, 0xb8, 0x93, 0xc9, - 0xf4, 0x73, 0xe2, 0xca, 0xd7, 0x89, 0x5b, 0x49, 0xc5, 0xf9, 0x99, 0xa8, 0x3d, 0x58, 0x21, 0xd4, - 0xf9, 0x2a, 0xc1, 0x49, 0x41, 0x50, 0xe5, 0x3a, 0x41, 0x5d, 0x42, 0x7f, 0x29, 0x17, 0x64, 0x62, - 0x06, 0xf0, 0x46, 0xce, 0x4b, 0x71, 0xdd, 0x73, 0xc2, 0xaa, 0xd7, 0x09, 0x5b, 0x4b, 0xad, 0x12, - 0xf9, 0x20, 0x93, 0xf8, 0x73, 0x58, 0x23, 0xd4, 0xb9, 0x70, 0x09, 0x9f, 0x16, 0xb7, 0xf0, 0x1a, - 0x27, 0xc5, 0xa3, 0x5b, 0x94, 0xa5, 0x9c, 0x0c, 0x70, 0x3c, 0x2c, 0x38, 0x59, 0x7b, 0x8d, 0x93, - 0xcf, 0xe4, 0x82, 0x4c, 0xcc, 0x53, 0xe8, 0x12, 0x3a, 0x6d, 0xcd, 0xe2, 0x75, 0x42, 0x3a, 0x84, - 0x16, 0x2d, 0xd9, 0x86, 0x2e, 0xc3, 0x1e, 0xa7, 0x71, 0xfe, 0x10, 0x2c, 0x5d, 0x27, 0x62, 0x59, - 0xf3, 0xa7, 0x32, 0xac, 0x5f, 0x43, 0xf3, 0x20, 0x19, 0x62, 0x3e, 0x3e, 0x49, 0x93, 0xc1, 0xad, - 0xe5, 0x1f, 0xeb, 0xdf, 0x65, 0x68, 0xec, 0x0c, 0x63, 0x9a, 0x44, 0x85, 0x9c, 0xac, 0x2e, 0xe9, - 0x74, 0x4e, 0x96, 0x2c, 0x32, 0x27, 0x2b, 0xe6, 0x4f, 0xa0, 0x19, 0xc8, 0xab, 0xab, 0xf9, 0x55, - 0x1e, 0xea, 0xce, 0x5c, 0x6a, 0xbb, 0x11, 0xe4, 0x92, 0xd9, 0x26, 0x40, 0x44, 0x7c, 0xa6, 0xd7, - 0xa8, 0x74, 0xd4, 0xd1, 0x15, 0xa1, 0x49, 0xd1, 0x76, 0x3d, 0x4a, 0xb3, 0xf5, 0x47, 0xd0, 0x38, - 0x11, 0x41, 0xd2, 0x0b, 0x0a, 0xc9, 0x28, 0x8b, 0x9e, 0x0d, 0x27, 0xd9, 0x25, 0x3c, 0x80, 0xd6, - 0x48, 0x85, 0x4c, 0x2f, 0x52, 0x67, 0xe8, 0x1d, 0xed, 0x49, 0xe6, 0xef, 0x66, 0x3e, 0xb2, 0x6a, - 0x03, 0x9a, 0xa3, 0x1c, 0xaa, 0x7f, 0x04, 0xdd, 0x19, 0x96, 0x39, 0x39, 0x68, 0x23, 0x9f, 0x83, - 0x1a, 0x5b, 0x48, 0x29, 0xca, 0xaf, 0xcc, 0xe7, 0xa5, 0x5f, 0xc0, 0xda, 0x74, 0x99, 0xa3, 0x8b, - 0xb2, 0x4f, 0xa0, 0xe9, 0x49, 0xeb, 0x0a, 0x3b, 0xd0, 0x9d, 0xb1, 0xdb, 0x6e, 0x78, 0x19, 0x60, - 0xf9, 0x80, 0x5e, 0xc6, 0x84, 0xe3, 0x23, 0x1e, 0x63, 0x37, 0xb8, 0x8d, 0xaa, 0x19, 0x41, 0x55, - 0x3e, 0xb1, 0x15, 0x59, 0x14, 0xca, 0x6f, 0xeb, 0x5d, 0x58, 0x29, 0x68, 0xd1, 0x26, 0x2f, 0x43, - 0x65, 0x8c, 0x43, 0x29, 0xbd, 0x65, 0x8b, 0x4f, 0xcb, 0x85, 0xae, 0x8d, 0x5d, 0xff, 0xf6, 0xac, - 0xd1, 0x2a, 0x2a, 0x99, 0x8a, 0x0d, 0x40, 0x79, 0x15, 0xda, 0x14, 0x63, 0x75, 0x29, 0x67, 0xf5, - 0x73, 0xe8, 0xee, 0x8c, 0x29, 0xc3, 0x47, 0xdc, 0x27, 0xe1, 0x6d, 0x94, 0xf9, 0xdf, 0xc0, 0xca, - 0x0b, 0x3e, 0x79, 0x29, 0x84, 0x31, 0xf2, 0x35, 0xbe, 0x25, 0xff, 0x62, 0x7a, 0x61, 0xfc, 0x8b, - 0xe9, 0x85, 0xa8, 0xf0, 0x3d, 0x3a, 0x4e, 0x82, 0x50, 0x1e, 0xf7, 0x96, 0xad, 0x21, 0xeb, 0x1f, - 0x25, 0x58, 0x55, 0x3d, 0xf8, 0x91, 0x6a, 0x3d, 0x8d, 0xfa, 0x3e, 0x2c, 0x8d, 0x28, 0xe3, 0xa1, - 0x1b, 0x60, 0xad, 0x3a, 0x85, 0x85, 0x78, 0xd1, 0xb3, 0x96, 0x65, 0x57, 0x20, 0x3e, 0x0b, 0x8d, - 0x71, 0xe5, 0xfa, 0xc6, 0x78, 0xa6, 0xf5, 0xad, 0xce, 0xb6, 0xbe, 0xe8, 0xfb, 0x00, 0x86, 0x89, - 0xf8, 0xf2, 0xe1, 0xaf, 0xdb, 0x75, 0x8d, 0x39, 0xf4, 0xd1, 0x7d, 0xe8, 0x0c, 0x85, 0x95, 0xce, - 0x88, 0xd2, 0x33, 0x27, 0x72, 0xf9, 0x48, 0x36, 0xda, 0x75, 0xbb, 0x25, 0xd1, 0x07, 0x94, 0x9e, - 0x0d, 0x5c, 0x3e, 0xb2, 0xee, 0xc2, 0x9d, 0x5d, 0xcc, 0x78, 0x4c, 0x27, 0x45, 0xef, 0x2c, 0x17, - 0xea, 0x87, 0x83, 0xa7, 0xbe, 0x1f, 0x63, 0xc6, 0xd0, 0x7d, 0xa8, 0x9d, 0xba, 0x01, 0x19, 0xab, - 0x0b, 0xd8, 0x36, 0xf9, 0xe9, 0x70, 0xf0, 0x33, 0x89, 0xb5, 0x35, 0x55, 0x24, 0x3d, 0x57, 0x2d, - 0xd1, 0xe1, 0x36, 0xa0, 0x38, 0x27, 0x81, 0xcb, 0xce, 0xf4, 0xd3, 0x2e, 0xbf, 0xad, 0x3f, 0x97, - 0xa0, 0x7e, 0x18, 0x72, 0x1c, 0x9f, 0xba, 0x9e, 0x6c, 0xda, 0xd4, 0x10, 0x41, 0x07, 0x53, 0x43, - 0x62, 0xa5, 0x0c, 0xb1, 0x12, 0x28, 0xbf, 0x45, 0x7e, 0x4a, 0x8d, 0x4b, 0xe3, 0xd9, 0x31, 0x46, - 0x69, 0x82, 0x9d, 0xe7, 0x11, 0x3b, 0x12, 0xf0, 0x44, 0xd7, 0x11, 0xe2, 0x53, 0x28, 0x1c, 0x5d, - 0x08, 0x06, 0x1d, 0x3d, 0x0d, 0xc9, 0xea, 0xdc, 0x23, 0x92, 0xa0, 0x42, 0x66, 0x40, 0xeb, 0x31, - 0x40, 0x6a, 0x2f, 0x13, 0x35, 0x5e, 0x06, 0xe9, 0x32, 0xc3, 0xd8, 0x60, 0xf0, 0x76, 0x8e, 0xc5, - 0xfa, 0x06, 0x16, 0x6c, 0x9a, 0x70, 0x75, 0x69, 0xb0, 0xee, 0xff, 0xea, 0xb6, 0xfc, 0x16, 0x5a, - 0x87, 0x2e, 0xc7, 0x17, 0xee, 0xc4, 0x84, 0x4e, 0x83, 0xb9, 0xc0, 0x54, 0x0a, 0x81, 0x11, 0x5d, - 0xae, 0x6c, 0xe2, 0xa4, 0x53, 0x75, 0x5b, 0x43, 0xe2, 0xb1, 0x62, 0x1e, 0x8d, 0xb0, 0x74, 0xab, - 0x65, 0x2b, 0xc0, 0xfa, 0x10, 0x6a, 0x52, 0xb9, 0x38, 0x5e, 0xfa, 0x4b, 0xdb, 0xdc, 0x50, 0x36, - 0x4b, 0x9c, 0xad, 0x49, 0xd6, 0xbe, 0xe9, 0x43, 0x33, 0x57, 0xf4, 0xb1, 0xff, 0x10, 0xea, 0xc4, - 0xe0, 0x74, 0xb2, 0x9c, 0xf1, 0x3a, 0xe3, 0xb0, 0x76, 0x61, 0xe5, 0xa9, 0xef, 0x7f, 0x57, 0x29, - 0xfb, 0x66, 0x58, 0xf3, 0x5d, 0x05, 0x3d, 0x82, 0x15, 0xe5, 0x97, 0xf2, 0xd3, 0x48, 0xf9, 0x21, - 0xd4, 0x62, 0x13, 0x93, 0x52, 0x36, 0xdd, 0xd2, 0x4c, 0x9a, 0x26, 0x2e, 0x8b, 0x68, 0xd2, 0xb3, - 0x2d, 0x35, 0x97, 0x65, 0x05, 0xba, 0x82, 0x50, 0x90, 0x69, 0xfd, 0x06, 0x56, 0x9e, 0x87, 0x63, - 0x12, 0xe2, 0x9d, 0xc1, 0xf1, 0x33, 0x9c, 0x66, 0x65, 0x04, 0x55, 0x51, 0x72, 0x49, 0x45, 0x4b, - 0xb6, 0xfc, 0x16, 0x69, 0x2a, 0x3c, 0x71, 0xbc, 0x28, 0x61, 0x7a, 0x9c, 0x54, 0x0b, 0x4f, 0x76, - 0xa2, 0x84, 0xa1, 0x37, 0x40, 0x3c, 0xfd, 0x0e, 0x0d, 0xc7, 0x13, 0xb9, 0xfb, 0x4b, 0xf6, 0xa2, - 0x17, 0x25, 0xcf, 0xc3, 0xf1, 0xc4, 0xfa, 0xb1, 0x6c, 0xa0, 0x31, 0xf6, 0x6d, 0x37, 0xf4, 0x69, - 0xb0, 0x8b, 0xcf, 0x73, 0x1a, 0xd2, 0x66, 0xcd, 0xe4, 0xe4, 0x6f, 0x4b, 0xd0, 0x7c, 0x3a, 0xc4, - 0x21, 0xdf, 0xc5, 0xdc, 0x25, 0x63, 0xd9, 0x90, 0x9d, 0xe3, 0x98, 0x11, 0x1a, 0xea, 0x63, 0x68, - 0x40, 0xd1, 0x4f, 0x93, 0x90, 0x70, 0xc7, 0x77, 0x71, 0x40, 0x43, 0x29, 0x65, 0xc9, 0x06, 0x81, - 0xda, 0x95, 0x18, 0xf4, 0x2e, 0x74, 0xd4, 0x11, 0x74, 0x46, 0x6e, 0xe8, 0x8f, 0x71, 0x6c, 0xc6, - 0x1f, 0x6d, 0x85, 0x3e, 0xd0, 0x58, 0xf4, 0x1e, 0x2c, 0xeb, 0xa4, 0x96, 0x71, 0x56, 0x25, 0x67, - 0x47, 0xe3, 0x0b, 0xac, 0x49, 0x14, 0xd1, 0x98, 0x33, 0x87, 0x61, 0xcf, 0xa3, 0x41, 0xa4, 0xbb, - 0x99, 0x8e, 0xc1, 0x1f, 0x29, 0xb4, 0xd8, 0xc2, 0x7d, 0xe1, 0xa7, 0xf6, 0x24, 0xdb, 0xc2, 0x76, - 0x80, 0x03, 0xe7, 0x64, 0x4c, 0xbd, 0x33, 0x47, 0x3c, 0x13, 0x3a, 0xc2, 0xa2, 0x5e, 0xda, 0x16, - 0xc8, 0x23, 0xf2, 0x35, 0xb6, 0x7e, 0x57, 0x82, 0xd5, 0xe2, 0x6a, 0xfd, 0x90, 0x3d, 0x80, 0xd5, - 0xe2, 0x72, 0xd5, 0x48, 0xe8, 0x8a, 0xaf, 0x9b, 0x17, 0x22, 0x5b, 0x05, 0xf4, 0x29, 0xb4, 0xe4, - 0x60, 0xd7, 0xf1, 0x95, 0xa4, 0x62, 0x1d, 0x92, 0x8f, 0xb5, 0xdd, 0x74, 0x73, 0x90, 0xf5, 0x97, - 0x12, 0x2c, 0xea, 0xa4, 0x2f, 0xef, 0x76, 0x4c, 0xce, 0x71, 0x9c, 0x26, 0x3d, 0x09, 0x89, 0xd6, - 0x5e, 0x7d, 0x39, 0x34, 0xe2, 0x84, 0xa6, 0x4f, 0x49, 0x4b, 0x61, 0x9f, 0x2b, 0x64, 0x2e, 0x05, - 0x54, 0x0a, 0x29, 0x60, 0x0d, 0x6a, 0xa7, 0x8c, 0x4f, 0xa2, 0x34, 0x35, 0x28, 0x48, 0x6c, 0xba, - 0x91, 0xb7, 0x20, 0xe5, 0x19, 0x50, 0x6c, 0x7a, 0x40, 0x93, 0x90, 0x3b, 0x11, 0x25, 0x21, 0xd7, - 0x89, 0x0f, 0x24, 0x6a, 0x20, 0x30, 0xd6, 0xef, 0x4b, 0x50, 0x53, 0xc3, 0x5e, 0xd1, 0xa4, 0xa5, - 0xaf, 0x6d, 0x99, 0xc8, 0xca, 0x45, 0xea, 0xd2, 0x19, 0x5a, 0x6a, 0xba, 0x0b, 0x8b, 0xe7, 0x81, - 0x7a, 0x77, 0xb4, 0x69, 0xe7, 0x81, 0x78, 0x70, 0x84, 0x67, 0xd9, 0xa3, 0x2d, 0xe9, 0xca, 0xc4, - 0x56, 0x8a, 0x95, 0x6c, 0x57, 0x5a, 0x6a, 0xfd, 0x4a, 0xf4, 0xa6, 0xe9, 0xa0, 0x73, 0x19, 0x2a, - 0x49, 0x6a, 0x8c, 0xf8, 0x14, 0x98, 0x61, 0xfa, 0xdc, 0x8b, 0x4f, 0x74, 0x1f, 0xda, 0xae, 0xef, - 0x13, 0xb1, 0xdc, 0x1d, 0xef, 0x13, 0x3f, 0x3d, 0xae, 0x45, 0xec, 0xfb, 0x7d, 0x58, 0x32, 0x2f, - 0x1a, 0xaa, 0x41, 0xf9, 0xfc, 0x93, 0xe5, 0xef, 0xc9, 0xff, 0x9f, 0x2c, 0x97, 0xb6, 0xfe, 0xda, - 0xd6, 0xf7, 0x47, 0x77, 0x52, 0x68, 0x1f, 0x3a, 0x53, 0x93, 0x79, 0xa4, 0x5b, 0xeb, 0xf9, 0x03, - 0xfb, 0xfe, 0xda, 0xa6, 0x9a, 0xf4, 0x6f, 0x9a, 0x49, 0xff, 0xe6, 0x5e, 0x10, 0xf1, 0x09, 0xda, - 0x83, 0x76, 0x71, 0x86, 0x8d, 0xee, 0x99, 0xc2, 0x60, 0xce, 0x64, 0xfb, 0x4a, 0x31, 0xfb, 0xd0, - 0x99, 0x1a, 0x67, 0x1b, 0x7b, 0xe6, 0x4f, 0xb9, 0xaf, 0x14, 0xf4, 0x04, 0x1a, 0xb9, 0xf9, 0x35, - 0xea, 0x29, 0x21, 0xb3, 0x23, 0xed, 0x2b, 0x05, 0xec, 0x40, 0xab, 0x30, 0x52, 0x46, 0x7d, 0xed, - 0xcf, 0x9c, 0x39, 0xf3, 0x95, 0x42, 0xb6, 0xa1, 0x91, 0x9b, 0xec, 0x1a, 0x2b, 0x66, 0xc7, 0xc7, - 0xfd, 0x37, 0xe6, 0x50, 0xf4, 0x95, 0x3e, 0x80, 0x56, 0x61, 0x0e, 0x6b, 0x0c, 0x99, 0x37, 0x03, - 0xee, 0xdf, 0x9b, 0x4b, 0xd3, 0x92, 0xf6, 0xa1, 0x33, 0x35, 0x95, 0x35, 0xc1, 0x9d, 0x3f, 0xac, - 0xbd, 0xd2, 0xad, 0xcf, 0xe5, 0x66, 0xe7, 0xda, 0x90, 0xdc, 0x66, 0xcf, 0xce, 0x60, 0xfb, 0x6f, - 0xce, 0x27, 0x6a, 0xab, 0xf6, 0xa0, 0x5d, 0x1c, 0xbf, 0x1a, 0x61, 0x73, 0x87, 0xb2, 0xd7, 0x9f, - 0x9c, 0xc2, 0x24, 0x36, 0x3b, 0x39, 0xf3, 0x06, 0xb4, 0x57, 0x0a, 0x7a, 0x0a, 0xa0, 0xbb, 0x15, - 0x9f, 0x84, 0xe9, 0x96, 0xcd, 0x74, 0x49, 0xe9, 0x96, 0xcd, 0xe9, 0x6c, 0x9e, 0x00, 0xa8, 0x26, - 0xc3, 0xa7, 0x09, 0x47, 0x77, 0x8d, 0x19, 0x53, 0x9d, 0x4d, 0xbf, 0x37, 0x4b, 0x98, 0x11, 0x80, - 0xe3, 0xf8, 0x26, 0x02, 0x1e, 0x03, 0x64, 0xcd, 0x8b, 0x11, 0x30, 0xd3, 0xce, 0x5c, 0x13, 0x83, - 0x66, 0xbe, 0x55, 0x41, 0xda, 0xd7, 0x39, 0xed, 0xcb, 0x95, 0x22, 0x1e, 0x42, 0x33, 0x5f, 0x31, - 0x19, 0x11, 0x73, 0xaa, 0xa8, 0xfe, 0x74, 0xa5, 0x83, 0x7e, 0x6a, 0x0e, 0x6a, 0x86, 0x2a, 0x1c, - 0xd4, 0xff, 0x4a, 0xc2, 0x54, 0xa5, 0x55, 0xcc, 0x23, 0xaf, 0x97, 0xf0, 0x29, 0x34, 0xf3, 0x25, - 0x96, 0xb1, 0x7f, 0x4e, 0xd9, 0xd5, 0x2f, 0x94, 0x59, 0xe8, 0x09, 0xb4, 0x8b, 0xe5, 0x15, 0xca, - 0x5d, 0xca, 0x99, 0xa2, 0xab, 0xbf, 0x3c, 0xa5, 0x98, 0xa1, 0x8f, 0x01, 0xb2, 0x32, 0xcc, 0xec, - 0xdd, 0x4c, 0x61, 0x36, 0xa5, 0x75, 0x07, 0x5a, 0x85, 0xf6, 0xce, 0x64, 0x89, 0x79, 0x3d, 0xdf, - 0x75, 0x49, 0xbc, 0xd8, 0x46, 0x19, 0xd3, 0xe7, 0x36, 0x57, 0xd7, 0x9d, 0x9e, 0x7c, 0xc9, 0x68, - 0x42, 0x37, 0xa7, 0x8c, 0x7c, 0xcd, 0x6d, 0xce, 0x97, 0x85, 0xb9, 0xdb, 0x3c, 0xa7, 0x5a, 0xbc, - 0x52, 0xd0, 0x01, 0x74, 0xf6, 0x31, 0xcf, 0xd7, 0x4a, 0xc6, 0x9c, 0x39, 0xd5, 0x57, 0xbf, 0x3f, - 0x8f, 0xa4, 0xae, 0xd4, 0x76, 0xf3, 0xdb, 0x57, 0x6f, 0x95, 0xfe, 0xfe, 0xea, 0xad, 0xd2, 0xbf, - 0x5e, 0xbd, 0x55, 0x3a, 0xa9, 0x49, 0x3d, 0x1f, 0xff, 0x27, 0x00, 0x00, 0xff, 0xff, 0x3d, 0xd4, - 0x0e, 0x85, 0x17, 0x1f, 0x00, 0x00, + // 2442 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x58, 0x49, 0x6f, 0x1c, 0xc7, + 0x15, 0xc6, 0x2c, 0x5c, 0xe6, 0xcd, 0xc6, 0x29, 0x52, 0xd4, 0x78, 0xe4, 0x28, 0x74, 0xcb, 0x91, + 0xe8, 0x38, 0x1e, 0xc6, 0x94, 0x11, 0x1b, 0x12, 0x1c, 0x41, 0x5c, 0x40, 0x32, 0xb6, 0x22, 0xa6, + 0x29, 0x42, 0x01, 0x82, 0xa0, 0xd1, 0xec, 0x2e, 0xcd, 0x94, 0x39, 0xdd, 0xd5, 0xee, 0xaa, 0xa6, + 0x38, 0x0e, 0x10, 0xe4, 0x94, 0x7f, 0x91, 0x3f, 0x10, 0xe4, 0x96, 0x6b, 0x8e, 0x39, 0xf8, 0x98, + 0x7b, 0x80, 0x20, 0xd0, 0x4f, 0xc8, 0x2f, 0x08, 0x6a, 0xeb, 0x65, 0x16, 0xca, 0xa1, 0x09, 0xe4, + 0xd2, 0xe8, 0xf7, 0xea, 0xd5, 0xf7, 0x96, 0xaa, 0x7a, 0xf5, 0xea, 0x41, 0xdd, 0x1d, 0xe0, 0x90, + 0xf7, 0xa3, 0x98, 0x72, 0x8a, 0xaa, 0x83, 0x38, 0xf2, 0x7a, 0x35, 0xea, 0x11, 0xc5, 0xe8, 0xfd, + 0x6c, 0x40, 0xf8, 0x30, 0x39, 0xeb, 0x7b, 0x34, 0xd8, 0x3a, 0x77, 0xb9, 0xfb, 0x91, 0x47, 0x43, + 0xee, 0x92, 0x10, 0xc7, 0x6c, 0x4b, 0x4e, 0xdc, 0x8a, 0xce, 0x07, 0x5b, 0x7c, 0x1c, 0x61, 0xa6, + 0xbe, 0x7a, 0xde, 0x9d, 0x01, 0xa5, 0x83, 0x11, 0xde, 0x92, 0xd4, 0x59, 0xf2, 0x6a, 0x0b, 0x07, + 0x11, 0x1f, 0xab, 0x41, 0xeb, 0x4f, 0x65, 0x58, 0xdf, 0x8d, 0xb1, 0xcb, 0xf1, 0xae, 0x41, 0xb3, + 0xf1, 0xd7, 0x09, 0x66, 0x1c, 0xbd, 0x07, 0x8d, 0x54, 0x83, 0x43, 0xfc, 0x6e, 0x69, 0xa3, 0xb4, + 0x59, 0xb3, 0xeb, 0x29, 0xef, 0xc8, 0x47, 0xb7, 0x61, 0x09, 0x5f, 0x62, 0x4f, 0x8c, 0x96, 0xe5, + 0xe8, 0xa2, 0x20, 0x8f, 0x7c, 0xf4, 0x31, 0xd4, 0x19, 0x8f, 0x49, 0x38, 0x70, 0x12, 0x86, 0xe3, + 0x6e, 0x65, 0xa3, 0xb4, 0x59, 0xdf, 0x5e, 0xe9, 0x0b, 0x97, 0xfa, 0x27, 0x72, 0xe0, 0x94, 0xe1, + 0xd8, 0x06, 0x96, 0xfe, 0xa3, 0xfb, 0xb0, 0xe4, 0xe3, 0x0b, 0xe2, 0x61, 0xd6, 0xad, 0x6e, 0x54, + 0x36, 0xeb, 0xdb, 0x0d, 0x25, 0xbe, 0x27, 0x99, 0xb6, 0x19, 0x44, 0x1f, 0xc0, 0x32, 0xe3, 0x34, + 0x76, 0x07, 0x98, 0x75, 0x17, 0xa4, 0x60, 0xd3, 0xe0, 0x4a, 0xae, 0x9d, 0x0e, 0xa3, 0x77, 0xa1, + 0xf2, 0x7c, 0xf7, 0xa8, 0xbb, 0x28, 0xb5, 0x83, 0x96, 0x8a, 0xb0, 0x67, 0x0b, 0x36, 0xba, 0x07, + 0x4d, 0xe6, 0x86, 0xfe, 0x19, 0xbd, 0x74, 0x22, 0xe2, 0x87, 0xac, 0xbb, 0xb4, 0x51, 0xda, 0x5c, + 0xb6, 0x1b, 0x9a, 0x79, 0x2c, 0x78, 0xd6, 0x23, 0xb8, 0x75, 0xc2, 0xdd, 0x98, 0x5f, 0x23, 0x3a, + 0xd6, 0x29, 0xac, 0xdb, 0x38, 0xa0, 0x17, 0xd7, 0x0a, 0x6d, 0x17, 0x96, 0x38, 0x09, 0x30, 0x4d, + 0xb8, 0x0c, 0x6d, 0xd3, 0x36, 0xa4, 0xf5, 0x97, 0x12, 0xa0, 0xfd, 0x4b, 0xec, 0x1d, 0xc7, 0xd4, + 0xc3, 0x8c, 0xfd, 0x9f, 0x96, 0xeb, 0x01, 0x2c, 0x45, 0xca, 0x80, 0x6e, 0x55, 0x8a, 0xeb, 0x55, + 0x30, 0x56, 0x99, 0x51, 0xeb, 0x2b, 0x58, 0x3b, 0x21, 0x83, 0xd0, 0x1d, 0xdd, 0xa0, 0xbd, 0xeb, + 0xb0, 0xc8, 0x24, 0xa6, 0x34, 0xb5, 0x69, 0x6b, 0xca, 0x3a, 0x06, 0xf4, 0xd2, 0x25, 0xfc, 0xe6, + 0x34, 0x59, 0x1f, 0xc1, 0x6a, 0x01, 0x91, 0x45, 0x34, 0x64, 0x58, 0x1a, 0xc0, 0x5d, 0x9e, 0x30, + 0x09, 0xb6, 0x60, 0x6b, 0xca, 0xc2, 0xb0, 0xf6, 0x25, 0x61, 0x46, 0x1c, 0xff, 0x2f, 0x26, 0xac, + 0xc3, 0xe2, 0x2b, 0x1a, 0x07, 0x2e, 0x37, 0x16, 0x28, 0x0a, 0x21, 0xa8, 0xba, 0xf1, 0x80, 0x75, + 0x2b, 0x1b, 0x95, 0xcd, 0x9a, 0x2d, 0xff, 0xc5, 0xae, 0x9c, 0x50, 0xa3, 0xed, 0x7a, 0x0f, 0x1a, + 0x3a, 0xee, 0xce, 0x88, 0x30, 0x2e, 0xf5, 0x34, 0xec, 0xba, 0xe6, 0x89, 0x39, 0x16, 0x85, 0xf5, + 0xd3, 0xc8, 0xbf, 0xe6, 0x81, 0xdf, 0x86, 0x5a, 0x8c, 0x19, 0x4d, 0x62, 0x71, 0x4c, 0xcb, 0x72, + 0xdd, 0xd7, 0xd4, 0xba, 0x7f, 0x49, 0xc2, 0xe4, 0xd2, 0x36, 0x63, 0x76, 0x26, 0xa6, 0x8f, 0x10, + 0x67, 0xd7, 0x39, 0x42, 0x8f, 0xe0, 0xd6, 0xb1, 0x9b, 0xb0, 0xeb, 0xd8, 0x6a, 0x3d, 0x16, 0xc7, + 0x8f, 0x25, 0xc1, 0xb5, 0x26, 0xff, 0xb9, 0x04, 0xcb, 0xbb, 0x51, 0x72, 0xca, 0xdc, 0x01, 0x46, + 0x3f, 0x84, 0x3a, 0xa7, 0xdc, 0x1d, 0x39, 0x89, 0x20, 0xa5, 0x78, 0xd5, 0x06, 0xc9, 0x52, 0x02, + 0x22, 0xec, 0x38, 0xf6, 0xa2, 0x44, 0x4b, 0x94, 0x37, 0x2a, 0x9b, 0x55, 0xbb, 0xae, 0x78, 0x4a, + 0xa4, 0x0f, 0xab, 0x72, 0xcc, 0x21, 0xa1, 0x73, 0x8e, 0xe3, 0x10, 0x8f, 0x02, 0xea, 0x63, 0xb9, + 0x7f, 0xab, 0x76, 0x47, 0x0e, 0x1d, 0x85, 0x5f, 0xa4, 0x03, 0xe8, 0xc7, 0xd0, 0x49, 0xe5, 0xc5, + 0xa1, 0x94, 0xd2, 0x55, 0x29, 0xdd, 0xd6, 0xd2, 0xa7, 0x9a, 0x6d, 0xfd, 0x1e, 0x5a, 0x2f, 0x86, + 0x31, 0xe5, 0x7c, 0x44, 0xc2, 0xc1, 0x9e, 0xcb, 0x5d, 0x91, 0x3d, 0x22, 0x1c, 0x13, 0xea, 0x33, + 0x6d, 0xad, 0x21, 0xd1, 0x87, 0xd0, 0xe1, 0x4a, 0x16, 0xfb, 0x8e, 0x91, 0x29, 0x4b, 0x99, 0x95, + 0x74, 0xe0, 0x58, 0x0b, 0xff, 0x08, 0x5a, 0x99, 0xb0, 0xc8, 0x3f, 0xda, 0xde, 0x66, 0xca, 0x7d, + 0x41, 0x02, 0x6c, 0x5d, 0xc8, 0x58, 0xc9, 0x45, 0x46, 0x1f, 0x42, 0x2d, 0x8b, 0x43, 0x49, 0xee, + 0x90, 0x96, 0xda, 0x21, 0x26, 0x9c, 0xf6, 0x72, 0x1a, 0x94, 0xcf, 0xa1, 0xcd, 0x53, 0xc3, 0x1d, + 0xdf, 0xe5, 0x6e, 0x71, 0x53, 0x15, 0xbd, 0xb2, 0x5b, 0xbc, 0x40, 0x5b, 0x8f, 0xa1, 0x76, 0x4c, + 0x7c, 0xa6, 0x14, 0x77, 0x61, 0xc9, 0x4b, 0xe2, 0x18, 0x87, 0xdc, 0xb8, 0xac, 0x49, 0xb4, 0x06, + 0x0b, 0x23, 0x12, 0x10, 0xae, 0xdd, 0x54, 0x84, 0x45, 0x01, 0x9e, 0xe1, 0x80, 0xc6, 0x63, 0x19, + 0xb0, 0x35, 0x58, 0xc8, 0x2f, 0xae, 0x22, 0xd0, 0x1d, 0xa8, 0x05, 0xee, 0x65, 0xba, 0xa8, 0x62, + 0x64, 0x39, 0x70, 0x2f, 0x95, 0xf1, 0x5d, 0x58, 0x7a, 0xe5, 0x92, 0x91, 0x17, 0x72, 0x1d, 0x15, + 0x43, 0x66, 0x0a, 0xab, 0x79, 0x85, 0x7f, 0x2f, 0x43, 0x5d, 0x69, 0x54, 0x06, 0xaf, 0xc1, 0x82, + 0xe7, 0x7a, 0xc3, 0x54, 0xa5, 0x24, 0xd0, 0x7d, 0x63, 0x48, 0x39, 0x9f, 0x84, 0x33, 0x4b, 0x8d, + 0x69, 0x5b, 0x00, 0xec, 0xb5, 0x1b, 0x69, 0xdb, 0x2a, 0x73, 0x84, 0x6b, 0x42, 0x46, 0x99, 0xfb, + 0x10, 0x1a, 0x6a, 0xdf, 0xe9, 0x29, 0xd5, 0x39, 0x53, 0xea, 0x4a, 0x4a, 0x4d, 0xba, 0x07, 0xcd, + 0x84, 0x61, 0x67, 0x48, 0x70, 0xec, 0xc6, 0xde, 0x70, 0xdc, 0x5d, 0x50, 0x77, 0x64, 0xc2, 0xf0, + 0xa1, 0xe1, 0xa1, 0x6d, 0x58, 0x10, 0xe9, 0x8f, 0x75, 0x17, 0xe5, 0x75, 0xfc, 0x6e, 0x1e, 0x52, + 0xba, 0xda, 0x97, 0xdf, 0xfd, 0x90, 0xc7, 0x63, 0x5b, 0x89, 0xf6, 0x3e, 0x03, 0xc8, 0x98, 0x68, + 0x05, 0x2a, 0xe7, 0x78, 0xac, 0xcf, 0xa1, 0xf8, 0x15, 0xc1, 0xb9, 0x70, 0x47, 0x89, 0x89, 0xba, + 0x22, 0x1e, 0x95, 0x3f, 0x2b, 0x59, 0x1e, 0xb4, 0x77, 0x46, 0xe7, 0x84, 0xe6, 0xa6, 0xaf, 0xc1, + 0x42, 0xe0, 0x7e, 0x45, 0x63, 0x13, 0x49, 0x49, 0x48, 0x2e, 0x09, 0x69, 0x6c, 0x20, 0x24, 0x81, + 0x5a, 0x50, 0xa6, 0x91, 0x8c, 0x57, 0xcd, 0x2e, 0xd3, 0x28, 0x53, 0x54, 0xcd, 0x29, 0xb2, 0xfe, + 0x55, 0x05, 0xc8, 0xb4, 0x20, 0x1b, 0x7a, 0x84, 0x3a, 0x0c, 0xc7, 0xa2, 0x04, 0x71, 0xce, 0xc6, + 0x1c, 0x33, 0x27, 0xc6, 0x5e, 0x12, 0x33, 0x72, 0x21, 0xd6, 0x4f, 0xb8, 0x7d, 0x4b, 0xb9, 0x3d, + 0x61, 0x9b, 0x7d, 0x9b, 0xd0, 0x13, 0x35, 0x6f, 0x47, 0x4c, 0xb3, 0xcd, 0x2c, 0x74, 0x04, 0xb7, + 0x32, 0x4c, 0x3f, 0x07, 0x57, 0xbe, 0x0a, 0x6e, 0x35, 0x85, 0xf3, 0x33, 0xa8, 0x7d, 0x58, 0x25, + 0xd4, 0xf9, 0x3a, 0xc1, 0x49, 0x01, 0xa8, 0x72, 0x15, 0x50, 0x87, 0xd0, 0x5f, 0xc9, 0x09, 0x19, + 0xcc, 0x31, 0xbc, 0x93, 0xf3, 0x52, 0x1c, 0xf7, 0x1c, 0x58, 0xf5, 0x2a, 0xb0, 0xf5, 0xd4, 0x2a, + 0x91, 0x0f, 0x32, 0xc4, 0x5f, 0xc0, 0x3a, 0xa1, 0xce, 0x6b, 0x97, 0xf0, 0x49, 0xb8, 0x85, 0xb7, + 0x38, 0x29, 0x2e, 0xdd, 0x22, 0x96, 0x72, 0x32, 0xc0, 0xf1, 0xa0, 0xe0, 0xe4, 0xe2, 0x5b, 0x9c, + 0x7c, 0x26, 0x27, 0x64, 0x30, 0x4f, 0xa1, 0x43, 0xe8, 0xa4, 0x35, 0x4b, 0x57, 0x81, 0xb4, 0x09, + 0x2d, 0x5a, 0xb2, 0x03, 0x1d, 0x86, 0x3d, 0x4e, 0xe3, 0xfc, 0x26, 0x58, 0xbe, 0x0a, 0x62, 0x45, + 0xcb, 0xa7, 0x18, 0xd6, 0x6f, 0xa0, 0x71, 0x98, 0x0c, 0x30, 0x1f, 0x9d, 0xa5, 0xc9, 0xe0, 0xc6, + 0xf2, 0x8f, 0xf5, 0x9f, 0x32, 0xd4, 0x77, 0x07, 0x31, 0x4d, 0xa2, 0x42, 0x4e, 0x56, 0x87, 0x74, + 0x32, 0x27, 0x4b, 0x11, 0x99, 0x93, 0x95, 0xf0, 0x27, 0xd0, 0x08, 0xe4, 0xd1, 0xd5, 0xf2, 0x2a, + 0x0f, 0x75, 0xa6, 0x0e, 0xb5, 0x5d, 0x0f, 0x72, 0xc9, 0xac, 0x0f, 0x10, 0x11, 0x9f, 0xe9, 0x39, + 0x2a, 0x1d, 0xb5, 0x75, 0x45, 0x68, 0x52, 0xb4, 0x5d, 0x8b, 0xd2, 0x6c, 0xfd, 0x31, 0xd4, 0xcf, + 0x44, 0x90, 0xf4, 0x84, 0x42, 0x32, 0xca, 0xa2, 0x67, 0xc3, 0x59, 0x76, 0x08, 0x0f, 0xa1, 0x39, + 0x54, 0x21, 0xd3, 0x93, 0xd4, 0x1e, 0xba, 0xa7, 0x3d, 0xc9, 0xfc, 0xed, 0xe7, 0x23, 0xab, 0x16, + 0xa0, 0x31, 0xcc, 0xb1, 0x7a, 0x27, 0xd0, 0x99, 0x12, 0x99, 0x91, 0x83, 0x36, 0xf3, 0x39, 0xa8, + 0xbe, 0x8d, 0x94, 0xa2, 0xfc, 0xcc, 0x7c, 0x5e, 0xfa, 0x25, 0xac, 0x4f, 0x96, 0x39, 0xba, 0x28, + 0xfb, 0x04, 0x1a, 0x9e, 0xb4, 0xae, 0xb0, 0x02, 0x9d, 0x29, 0xbb, 0xed, 0xba, 0x97, 0x11, 0x96, + 0x0f, 0xe8, 0x65, 0x4c, 0x38, 0x3e, 0xe1, 0x31, 0x76, 0x83, 0x9b, 0xa8, 0x9a, 0x11, 0x54, 0xe5, + 0x15, 0x5b, 0x91, 0x45, 0xa1, 0xfc, 0xb7, 0x1e, 0xc0, 0x6a, 0x41, 0x8b, 0x36, 0x79, 0x05, 0x2a, + 0x23, 0x1c, 0x4a, 0xf4, 0xa6, 0x2d, 0x7e, 0x2d, 0x17, 0x3a, 0x36, 0x76, 0xfd, 0x9b, 0xb3, 0x46, + 0xab, 0xa8, 0x64, 0x2a, 0x36, 0x01, 0xe5, 0x55, 0x68, 0x53, 0x8c, 0xd5, 0xa5, 0x9c, 0xd5, 0xcf, + 0xa1, 0xb3, 0x3b, 0xa2, 0x0c, 0x9f, 0x70, 0x9f, 0x84, 0x37, 0x51, 0xe6, 0xff, 0x0e, 0x56, 0x5f, + 0xf0, 0xf1, 0x4b, 0x01, 0xc6, 0xc8, 0x37, 0xf8, 0x86, 0xfc, 0x8b, 0xe9, 0x6b, 0xe3, 0x5f, 0x4c, + 0x5f, 0x8b, 0x0a, 0xdf, 0xa3, 0xa3, 0x24, 0x08, 0xe5, 0x76, 0x6f, 0xda, 0x9a, 0xb2, 0xfe, 0x59, + 0x82, 0x35, 0xf5, 0x06, 0x3f, 0x51, 0x4f, 0x4f, 0xa3, 0xbe, 0x07, 0xcb, 0x43, 0xca, 0x78, 0xe8, + 0x06, 0x58, 0xab, 0x4e, 0x69, 0x01, 0x2f, 0xde, 0xac, 0x65, 0xf9, 0x2a, 0x10, 0xbf, 0x85, 0x87, + 0x71, 0xe5, 0xea, 0x87, 0xf1, 0xd4, 0xd3, 0xb7, 0x3a, 0xfd, 0xf4, 0x45, 0x3f, 0x00, 0x30, 0x42, + 0xc4, 0x97, 0x17, 0x7f, 0xcd, 0xae, 0x69, 0xce, 0x91, 0x8f, 0xee, 0x43, 0x7b, 0x20, 0xac, 0x74, + 0x86, 0x94, 0x9e, 0x3b, 0x91, 0xcb, 0x87, 0xf2, 0xa1, 0x5d, 0xb3, 0x9b, 0x92, 0x7d, 0x48, 0xe9, + 0xf9, 0xb1, 0xcb, 0x87, 0xd6, 0x6d, 0xb8, 0xb5, 0x87, 0x19, 0x8f, 0xe9, 0xb8, 0xe8, 0x9d, 0xf5, + 0x73, 0x80, 0xa3, 0x90, 0xe3, 0xf8, 0x95, 0x2b, 0x9e, 0xf5, 0x3f, 0xcd, 0x53, 0xfa, 0x4a, 0x5d, + 0xe9, 0xab, 0x3e, 0x46, 0x3a, 0x60, 0xe7, 0x64, 0xac, 0x3e, 0x2c, 0xda, 0x34, 0xe1, 0x98, 0xa1, + 0xf7, 0xcd, 0x9f, 0x9e, 0xd7, 0xd0, 0xf3, 0x24, 0xd3, 0xd6, 0x63, 0xd6, 0xa1, 0x79, 0xf8, 0x64, + 0x70, 0x3a, 0xce, 0x7d, 0xa8, 0x11, 0xc3, 0xd3, 0xa7, 0x73, 0x5a, 0x75, 0x26, 0x62, 0xed, 0xc3, + 0xea, 0x53, 0xdf, 0xff, 0xde, 0x30, 0x87, 0xa6, 0x3f, 0xf0, 0xbd, 0x91, 0x1e, 0xc3, 0xaa, 0x72, + 0x4d, 0xb9, 0x6a, 0x60, 0xde, 0x87, 0xc5, 0xd8, 0xc4, 0xa5, 0x94, 0x75, 0x54, 0xb4, 0x90, 0x1e, + 0x13, 0x0b, 0x24, 0x1e, 0x86, 0x59, 0x64, 0xcd, 0x02, 0xad, 0x42, 0x47, 0x0c, 0x14, 0x30, 0xad, + 0xdf, 0xc2, 0xea, 0xf3, 0x70, 0x44, 0x42, 0xbc, 0x7b, 0x7c, 0xfa, 0x0c, 0xa7, 0x99, 0x00, 0x41, + 0x55, 0x5c, 0xf3, 0x52, 0xd1, 0xb2, 0x2d, 0xff, 0xc5, 0xd1, 0x08, 0xcf, 0x1c, 0x2f, 0x4a, 0x98, + 0x6e, 0x61, 0x2c, 0x86, 0x67, 0xbb, 0x51, 0xc2, 0xd0, 0x3b, 0x20, 0xae, 0x1b, 0x87, 0x86, 0xa3, + 0xb1, 0x3c, 0x1f, 0xcb, 0xf6, 0x92, 0x17, 0x25, 0xcf, 0xc3, 0xd1, 0xd8, 0xfa, 0x89, 0x7c, 0xb4, + 0x61, 0xec, 0xdb, 0x6e, 0xe8, 0xd3, 0x60, 0x0f, 0x5f, 0xe4, 0x34, 0xa4, 0x0f, 0x04, 0x93, 0x07, + 0xbe, 0x2d, 0x41, 0xe3, 0xe9, 0x00, 0x87, 0x7c, 0x0f, 0x73, 0x97, 0x8c, 0xe4, 0x23, 0xe0, 0x02, + 0xc7, 0x8c, 0xd0, 0x50, 0x1f, 0x18, 0x43, 0x8a, 0x37, 0x1c, 0x09, 0x09, 0x77, 0x7c, 0x17, 0x07, + 0x34, 0x94, 0x28, 0xcb, 0x36, 0x08, 0xd6, 0x9e, 0xe4, 0xa0, 0x07, 0xd0, 0x56, 0x2d, 0x26, 0x67, + 0xe8, 0x86, 0xfe, 0x08, 0xc7, 0xe6, 0xc9, 0xdd, 0x52, 0xec, 0x43, 0xcd, 0x45, 0x1f, 0xc0, 0x8a, + 0x3e, 0x48, 0x99, 0x64, 0x55, 0x4a, 0xb6, 0x35, 0xbf, 0x20, 0x9a, 0x44, 0x11, 0x8d, 0x39, 0x73, + 0x18, 0xf6, 0x3c, 0x1a, 0x44, 0xba, 0x82, 0x6e, 0x1b, 0xfe, 0x89, 0x62, 0x8b, 0x25, 0x3c, 0x10, + 0x7e, 0x6a, 0x4f, 0xb2, 0x25, 0x6c, 0x05, 0x38, 0x70, 0xce, 0x46, 0xd4, 0x3b, 0x77, 0x44, 0x6a, + 0xd2, 0x11, 0x16, 0x77, 0xf4, 0x8e, 0x60, 0x9e, 0x90, 0x6f, 0xb0, 0xf5, 0x87, 0x12, 0xac, 0x15, + 0x67, 0xeb, 0xe4, 0xb9, 0x05, 0x6b, 0xc5, 0xe9, 0xaa, 0x78, 0xd5, 0x55, 0x46, 0x27, 0x0f, 0x22, + 0xcb, 0x53, 0xf4, 0x29, 0x34, 0x65, 0x2f, 0xd1, 0xf1, 0x15, 0x52, 0xf1, 0xee, 0xcb, 0xc7, 0xda, + 0x6e, 0xb8, 0x39, 0xca, 0xfa, 0x6b, 0x09, 0x96, 0x74, 0xa2, 0x11, 0x89, 0xce, 0x8f, 0xc9, 0x05, + 0x8e, 0xf5, 0x22, 0x68, 0x4a, 0x3c, 0x27, 0xd5, 0x9f, 0x43, 0x23, 0x4e, 0x68, 0x9a, 0xbe, 0x9a, + 0x8a, 0xfb, 0x5c, 0x31, 0x65, 0x73, 0x45, 0xf6, 0x0e, 0x74, 0x99, 0xae, 0x29, 0xd9, 0x21, 0x61, + 0xe2, 0x14, 0xc8, 0x74, 0x55, 0xb3, 0x35, 0x25, 0x16, 0xdd, 0xe0, 0x2d, 0x48, 0x3c, 0x43, 0x8a, + 0x45, 0x0f, 0x68, 0x12, 0x72, 0x27, 0xa2, 0x24, 0xe4, 0x3a, 0x3f, 0x81, 0x64, 0x1d, 0x0b, 0x8e, + 0xf5, 0xc7, 0x12, 0x2c, 0xaa, 0x06, 0xa3, 0x78, 0x18, 0xa4, 0x19, 0xbe, 0x4c, 0xe4, 0x6d, 0x29, + 0x75, 0xa9, 0xac, 0x2e, 0xff, 0xc5, 0x8e, 0xbe, 0x08, 0x54, 0xae, 0xd3, 0xa6, 0x5d, 0x04, 0x22, + 0xc9, 0x09, 0xcf, 0xb2, 0x8b, 0x42, 0x8e, 0x2b, 0x13, 0x9b, 0x29, 0x57, 0x8a, 0xcd, 0xb5, 0xd4, + 0xfa, 0xb5, 0x78, 0x0f, 0xa5, 0xcd, 0xb5, 0x15, 0xa8, 0x24, 0xa9, 0x31, 0xe2, 0x57, 0x70, 0x06, + 0xe9, 0x15, 0x23, 0x7e, 0xd1, 0x7d, 0x68, 0xb9, 0xbe, 0x4f, 0xc4, 0x74, 0x77, 0x74, 0x40, 0xfc, + 0x74, 0xbb, 0x16, 0xb9, 0xdb, 0x7f, 0x6b, 0xe9, 0x33, 0xa2, 0x2b, 0x74, 0x74, 0x00, 0xed, 0x89, + 0x8e, 0x2f, 0xd2, 0x4f, 0xb6, 0xd9, 0x8d, 0xe0, 0xde, 0x7a, 0x5f, 0x75, 0x90, 0xfb, 0xa6, 0x83, + 0xdc, 0xdf, 0x0f, 0x22, 0x3e, 0x46, 0xfb, 0xd0, 0x2a, 0xf6, 0x46, 0xd1, 0x1d, 0x73, 0xe1, 0xcc, + 0xe8, 0x98, 0xce, 0x85, 0x39, 0x80, 0xf6, 0x44, 0x9b, 0xd4, 0xd8, 0x33, 0xbb, 0x7b, 0x3a, 0x17, + 0xe8, 0x09, 0xd4, 0x73, 0x7d, 0x51, 0xd4, 0x55, 0x20, 0xd3, 0xad, 0xd2, 0xb9, 0x00, 0xbb, 0xd0, + 0x2c, 0xb4, 0x2a, 0x51, 0x4f, 0xfb, 0x33, 0xa3, 0x7f, 0x39, 0x17, 0x64, 0x07, 0xea, 0xb9, 0x8e, + 0xa1, 0xb1, 0x62, 0xba, 0x2d, 0xd9, 0x7b, 0x67, 0xc6, 0x88, 0x3e, 0xb6, 0x87, 0xd0, 0x2c, 0xf4, + 0xf7, 0x8c, 0x21, 0xb3, 0x7a, 0x8b, 0xbd, 0x3b, 0x33, 0xc7, 0x34, 0xd2, 0x01, 0xb4, 0x27, 0xba, + 0x7d, 0x26, 0xb8, 0xb3, 0x9b, 0x80, 0x73, 0xdd, 0xfa, 0x42, 0x2e, 0x76, 0xae, 0xbc, 0xcd, 0x2d, + 0xf6, 0x74, 0x6f, 0xaf, 0xf7, 0xee, 0xec, 0x41, 0x6d, 0xd5, 0x3e, 0xb4, 0x8a, 0x6d, 0x3d, 0x03, + 0x36, 0xb3, 0xd9, 0x77, 0xf5, 0xce, 0x29, 0x74, 0xf8, 0xb2, 0x9d, 0x33, 0xab, 0xf1, 0x37, 0x17, + 0xe8, 0x29, 0x80, 0xae, 0x82, 0x7d, 0x12, 0xa6, 0x4b, 0x36, 0x55, 0x7d, 0xa7, 0x4b, 0x36, 0xa3, + 0x62, 0x7e, 0x02, 0xa0, 0x8a, 0x57, 0x9f, 0x26, 0x1c, 0xdd, 0x36, 0x66, 0x4c, 0x54, 0xcc, 0xbd, + 0xee, 0xf4, 0xc0, 0x14, 0x00, 0x8e, 0xe3, 0xeb, 0x00, 0x7c, 0x0e, 0x90, 0x15, 0xc5, 0x06, 0x60, + 0xaa, 0x4c, 0xbe, 0x22, 0x06, 0x8d, 0x7c, 0x09, 0x8c, 0xb4, 0xaf, 0x33, 0xca, 0xe2, 0xb9, 0x10, + 0x8f, 0xa1, 0x91, 0xaf, 0x8b, 0x0c, 0xc4, 0x8c, 0x5a, 0xa9, 0x37, 0x55, 0xce, 0xa0, 0xa7, 0x66, + 0xa7, 0x66, 0xac, 0xc2, 0x4e, 0xfd, 0x6e, 0x10, 0x13, 0x05, 0x55, 0x31, 0x93, 0x7c, 0x07, 0x88, + 0x4f, 0xa1, 0x91, 0xaf, 0xa4, 0x8c, 0x0b, 0x33, 0xaa, 0xab, 0x5e, 0xa1, 0x9a, 0x42, 0x4f, 0xa0, + 0x55, 0xac, 0xa2, 0x50, 0xee, 0x5c, 0x4e, 0xd5, 0x56, 0x3d, 0xfd, 0xd4, 0xcd, 0x89, 0x3f, 0x04, + 0xc8, 0xaa, 0x2d, 0xb3, 0x7c, 0x53, 0xf5, 0xd7, 0x84, 0xd6, 0x5d, 0x68, 0x16, 0x5e, 0x0e, 0x26, + 0x51, 0xcc, 0x7a, 0x4e, 0x5c, 0x95, 0xc7, 0x8b, 0x15, 0xba, 0x31, 0x7d, 0x66, 0xdd, 0x7e, 0xd5, + 0x06, 0xca, 0x57, 0x86, 0x26, 0x74, 0x33, 0xaa, 0xc5, 0xb7, 0x1c, 0xe8, 0x7c, 0xf5, 0x97, 0x3b, + 0xd0, 0x33, 0x8a, 0xc2, 0xb9, 0x40, 0x87, 0xd0, 0x3e, 0xc0, 0x3c, 0x5f, 0x12, 0x19, 0x73, 0x66, + 0x14, 0x59, 0xbd, 0xde, 0xac, 0x21, 0x75, 0xaa, 0x76, 0x1a, 0xdf, 0xbe, 0xb9, 0x5b, 0xfa, 0xc7, + 0x9b, 0xbb, 0xa5, 0x7f, 0xbf, 0xb9, 0x5b, 0x3a, 0x5b, 0x94, 0x7a, 0x1e, 0xfe, 0x37, 0x00, 0x00, + 0xff, 0xff, 0x5e, 0x1c, 0x23, 0x7f, 0xaa, 0x1d, 0x00, 0x00, } diff --git a/protocols/grpc/agent.proto b/protocols/grpc/agent.proto index 828f02c758..d1e5140dcd 100644 --- a/protocols/grpc/agent.proto +++ b/protocols/grpc/agent.proto @@ -9,9 +9,9 @@ syntax = "proto3"; package grpc; import "oci.proto"; +import "github.com/kata-containers/agent/pkg/types/types.proto"; import "google/protobuf/empty.proto"; - // unstable service AgentService { // execution @@ -42,9 +42,9 @@ service AgentService { rpc TtyWinResize(TtyWinResizeRequest) returns (google.protobuf.Empty); // networking - rpc AddInterface(AddInterfaceRequest) returns(Interface); - rpc UpdateInterface(UpdateInterfaceRequest) returns (Interface); - rpc RemoveInterface(RemoveInterfaceRequest) returns (Interface); + rpc AddInterface(AddInterfaceRequest) returns(types.Interface); + rpc UpdateInterface(UpdateInterfaceRequest) returns (types.Interface); + rpc RemoveInterface(RemoveInterfaceRequest) returns (types.Interface); rpc UpdateRoutes(UpdateRoutesRequest) returns (Routes); rpc ListInterfaces(ListInterfacesRequest) returns(Interfaces); rpc ListRoutes(ListRoutesRequest) returns (Routes); @@ -274,56 +274,24 @@ message CreateSandboxRequest { message DestroySandboxRequest { } -enum IPFamily { - v4 = 0; - v6 = 1; -} - -message IPAddress { - IPFamily family = 1; - string address = 2; - string mask = 3; -} - -message Interface { - string device = 1; - string name = 2; - repeated IPAddress IPAddresses = 3; - uint64 mtu = 4; - string hwAddr = 5; - - // pciAddr is the PCI address in the format "bridgeAddr/deviceAddr". - // Here, bridgeAddr is the address at which the bridge is attached on the root bus, - // while deviceAddr is the address at which the network device is attached on the bridge. - string pciAddr = 6; -} - message Interfaces { - repeated Interface Interfaces = 1; -} - -message Route { - string dest = 1; - string gateway = 2; - string device = 3; - string source = 4; - uint32 scope = 5; + repeated types.Interface Interfaces = 1; } message Routes { - repeated Route Routes = 1; + repeated types.Route Routes = 1; } message UpdateInterfaceRequest { - Interface interface = 1; + types.Interface interface = 1; } message AddInterfaceRequest { - Interface interface = 1; + types.Interface interface = 1; } message RemoveInterfaceRequest { - Interface interface = 1; + types.Interface interface = 1; } message UpdateRoutesRequest { diff --git a/protocols/grpc/health.pb.go b/protocols/grpc/health.pb.go index 2126ae3259..7f3d4e72a5 100644 --- a/protocols/grpc/health.pb.go +++ b/protocols/grpc/health.pb.go @@ -108,7 +108,10 @@ func init() { } func (this *CheckRequest) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*CheckRequest) @@ -121,7 +124,10 @@ func (this *CheckRequest) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -132,7 +138,10 @@ func (this *CheckRequest) Equal(that interface{}) bool { } func (this *HealthCheckResponse) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*HealthCheckResponse) @@ -145,7 +154,10 @@ func (this *HealthCheckResponse) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -156,7 +168,10 @@ func (this *HealthCheckResponse) Equal(that interface{}) bool { } func (this *VersionCheckResponse) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*VersionCheckResponse) @@ -169,7 +184,10 @@ func (this *VersionCheckResponse) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } diff --git a/protocols/grpc/oci.pb.go b/protocols/grpc/oci.pb.go index 5296a082f2..cbfbab5870 100644 --- a/protocols/grpc/oci.pb.go +++ b/protocols/grpc/oci.pb.go @@ -1499,7 +1499,10 @@ func init() { } func (this *Spec) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Spec) @@ -1512,7 +1515,10 @@ func (this *Spec) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1560,7 +1566,10 @@ func (this *Spec) Equal(that interface{}) bool { } func (this *Process) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Process) @@ -1573,7 +1582,10 @@ func (this *Process) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1632,7 +1644,10 @@ func (this *Process) Equal(that interface{}) bool { } func (this *Box) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Box) @@ -1645,7 +1660,10 @@ func (this *Box) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1659,7 +1677,10 @@ func (this *Box) Equal(that interface{}) bool { } func (this *User) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*User) @@ -1672,7 +1693,10 @@ func (this *User) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1697,7 +1721,10 @@ func (this *User) Equal(that interface{}) bool { } func (this *LinuxCapabilities) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxCapabilities) @@ -1710,7 +1737,10 @@ func (this *LinuxCapabilities) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1758,7 +1788,10 @@ func (this *LinuxCapabilities) Equal(that interface{}) bool { } func (this *POSIXRlimit) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*POSIXRlimit) @@ -1771,7 +1804,10 @@ func (this *POSIXRlimit) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1788,7 +1824,10 @@ func (this *POSIXRlimit) Equal(that interface{}) bool { } func (this *Mount) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Mount) @@ -1801,7 +1840,10 @@ func (this *Mount) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1826,7 +1868,10 @@ func (this *Mount) Equal(that interface{}) bool { } func (this *Root) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Root) @@ -1839,7 +1884,10 @@ func (this *Root) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1853,7 +1901,10 @@ func (this *Root) Equal(that interface{}) bool { } func (this *Hooks) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Hooks) @@ -1866,7 +1917,10 @@ func (this *Hooks) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1898,7 +1952,10 @@ func (this *Hooks) Equal(that interface{}) bool { } func (this *Hook) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Hook) @@ -1911,7 +1968,10 @@ func (this *Hook) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -1941,7 +2001,10 @@ func (this *Hook) Equal(that interface{}) bool { } func (this *Linux) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Linux) @@ -1954,7 +2017,10 @@ func (this *Linux) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2036,7 +2102,10 @@ func (this *Linux) Equal(that interface{}) bool { } func (this *Windows) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Windows) @@ -2049,7 +2118,10 @@ func (this *Windows) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2060,7 +2132,10 @@ func (this *Windows) Equal(that interface{}) bool { } func (this *Solaris) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*Solaris) @@ -2073,7 +2148,10 @@ func (this *Solaris) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2084,7 +2162,10 @@ func (this *Solaris) Equal(that interface{}) bool { } func (this *LinuxIDMapping) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxIDMapping) @@ -2097,7 +2178,10 @@ func (this *LinuxIDMapping) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2114,7 +2198,10 @@ func (this *LinuxIDMapping) Equal(that interface{}) bool { } func (this *LinuxNamespace) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxNamespace) @@ -2127,7 +2214,10 @@ func (this *LinuxNamespace) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2141,7 +2231,10 @@ func (this *LinuxNamespace) Equal(that interface{}) bool { } func (this *LinuxDevice) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxDevice) @@ -2154,7 +2247,10 @@ func (this *LinuxDevice) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2183,7 +2279,10 @@ func (this *LinuxDevice) Equal(that interface{}) bool { } func (this *LinuxResources) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxResources) @@ -2196,7 +2295,10 @@ func (this *LinuxResources) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2235,7 +2337,10 @@ func (this *LinuxResources) Equal(that interface{}) bool { } func (this *LinuxMemory) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxMemory) @@ -2248,7 +2353,10 @@ func (this *LinuxMemory) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2277,7 +2385,10 @@ func (this *LinuxMemory) Equal(that interface{}) bool { } func (this *LinuxCPU) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxCPU) @@ -2290,7 +2401,10 @@ func (this *LinuxCPU) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2319,7 +2433,10 @@ func (this *LinuxCPU) Equal(that interface{}) bool { } func (this *LinuxWeightDevice) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxWeightDevice) @@ -2332,7 +2449,10 @@ func (this *LinuxWeightDevice) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2352,7 +2472,10 @@ func (this *LinuxWeightDevice) Equal(that interface{}) bool { } func (this *LinuxThrottleDevice) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxThrottleDevice) @@ -2365,7 +2488,10 @@ func (this *LinuxThrottleDevice) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2382,7 +2508,10 @@ func (this *LinuxThrottleDevice) Equal(that interface{}) bool { } func (this *LinuxBlockIO) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxBlockIO) @@ -2395,7 +2524,10 @@ func (this *LinuxBlockIO) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2449,7 +2581,10 @@ func (this *LinuxBlockIO) Equal(that interface{}) bool { } func (this *LinuxPids) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxPids) @@ -2462,7 +2597,10 @@ func (this *LinuxPids) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2473,7 +2611,10 @@ func (this *LinuxPids) Equal(that interface{}) bool { } func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxDeviceCgroup) @@ -2486,7 +2627,10 @@ func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2509,7 +2653,10 @@ func (this *LinuxDeviceCgroup) Equal(that interface{}) bool { } func (this *LinuxNetwork) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxNetwork) @@ -2522,7 +2669,10 @@ func (this *LinuxNetwork) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2541,7 +2691,10 @@ func (this *LinuxNetwork) Equal(that interface{}) bool { } func (this *LinuxHugepageLimit) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxHugepageLimit) @@ -2554,7 +2707,10 @@ func (this *LinuxHugepageLimit) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2568,7 +2724,10 @@ func (this *LinuxHugepageLimit) Equal(that interface{}) bool { } func (this *LinuxInterfacePriority) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxInterfacePriority) @@ -2581,7 +2740,10 @@ func (this *LinuxInterfacePriority) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2595,7 +2757,10 @@ func (this *LinuxInterfacePriority) Equal(that interface{}) bool { } func (this *LinuxSeccomp) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxSeccomp) @@ -2608,7 +2773,10 @@ func (this *LinuxSeccomp) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2635,7 +2803,10 @@ func (this *LinuxSeccomp) Equal(that interface{}) bool { } func (this *LinuxSeccompArg) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxSeccompArg) @@ -2648,7 +2819,10 @@ func (this *LinuxSeccompArg) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2668,7 +2842,10 @@ func (this *LinuxSeccompArg) Equal(that interface{}) bool { } func (this *LinuxSyscall) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxSyscall) @@ -2681,7 +2858,10 @@ func (this *LinuxSyscall) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } @@ -2708,7 +2888,10 @@ func (this *LinuxSyscall) Equal(that interface{}) bool { } func (this *LinuxIntelRdt) Equal(that interface{}) bool { if that == nil { - return this == nil + if this == nil { + return true + } + return false } that1, ok := that.(*LinuxIntelRdt) @@ -2721,7 +2904,10 @@ func (this *LinuxIntelRdt) Equal(that interface{}) bool { } } if that1 == nil { - return this == nil + if this == nil { + return true + } + return false } else if this == nil { return false } diff --git a/protocols/mockserver/mockserver.go b/protocols/mockserver/mockserver.go index 5419571040..424a514dfa 100644 --- a/protocols/mockserver/mockserver.go +++ b/protocols/mockserver/mockserver.go @@ -15,6 +15,7 @@ import ( "google.golang.org/grpc/codes" "google.golang.org/grpc/status" + pbTypes "github.com/kata-containers/agent/pkg/types" pb "github.com/kata-containers/agent/protocols/grpc" ) @@ -286,7 +287,7 @@ func (m *mockServer) DestroySandbox(ctx context.Context, req *pb.DestroySandboxR return &types.Empty{}, nil } -func (m *mockServer) AddInterface(context.Context, *pb.AddInterfaceRequest) (*pb.Interface, error) { +func (m *mockServer) AddInterface(context.Context, *pb.AddInterfaceRequest) (*pbTypes.Interface, error) { mockLock.RLock() defer mockLock.RUnlock() if err := m.podExist(); err != nil { @@ -296,7 +297,7 @@ func (m *mockServer) AddInterface(context.Context, *pb.AddInterfaceRequest) (*pb return nil, nil } -func (m *mockServer) RemoveInterface(context.Context, *pb.RemoveInterfaceRequest) (*pb.Interface, error) { +func (m *mockServer) RemoveInterface(context.Context, *pb.RemoveInterfaceRequest) (*pbTypes.Interface, error) { mockLock.RLock() defer mockLock.RUnlock() if err := m.podExist(); err != nil { @@ -306,7 +307,7 @@ func (m *mockServer) RemoveInterface(context.Context, *pb.RemoveInterfaceRequest return nil, nil } -func (m *mockServer) UpdateInterface(ctx context.Context, req *pb.UpdateInterfaceRequest) (*pb.Interface, error) { +func (m *mockServer) UpdateInterface(ctx context.Context, req *pb.UpdateInterfaceRequest) (*pbTypes.Interface, error) { mockLock.RLock() defer mockLock.RUnlock() if err := m.podExist(); err != nil {