From d0b7f38d7e236480ca093f7679d50a8ab4d41eca Mon Sep 17 00:00:00 2001 From: Ivan Eroshkin Date: Tue, 21 Feb 2023 18:17:09 +0100 Subject: [PATCH] [SDFAB-1096] Introducing host discovery capability (#384) * [SDFAB-1096] Introducing host discovery capability * Rebasing repo --- VERSION | 2 +- go/onos/topo/fabric.pb.go | 455 ++++++++++++++++++++++++++--------- proto/onos/topo/fabric.proto | 7 + protoset/onos-topo.protoset | Bin 35236 -> 35334 bytes python/onos/topo/__init__.py | 17 +- 5 files changed, 365 insertions(+), 116 deletions(-) diff --git a/VERSION b/VERSION index ec46f8b7..839912c2 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.10.27-dev +0.10.27 diff --git a/go/onos/topo/fabric.pb.go b/go/onos/topo/fabric.pb.go index 2b338a43..5db83aa6 100644 --- a/go/onos/topo/fabric.pb.go +++ b/go/onos/topo/fabric.pb.go @@ -46,7 +46,7 @@ func (x NetworkLayer_Type) String() string { } func (NetworkLayer_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{7, 0} + return fileDescriptor_705cdab724be9631, []int{8, 0} } type IPAddress_Type int32 @@ -71,7 +71,7 @@ func (x IPAddress_Type) String() string { } func (IPAddress_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{10, 0} + return fileDescriptor_705cdab724be9631, []int{11, 0} } type ControllerInfo_Type int32 @@ -93,7 +93,7 @@ func (x ControllerInfo_Type) String() string { } func (ControllerInfo_Type) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{13, 0} + return fileDescriptor_705cdab724be9631, []int{14, 0} } // ConfigurationAction @@ -137,7 +137,7 @@ func (x P4PipelineInfo_ConfigurationAction) String() string { } func (P4PipelineInfo_ConfigurationAction) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{16, 0} + return fileDescriptor_705cdab724be9631, []int{17, 0} } // Endpoint is a pair of an IP Address or DNS name and a TCP port number @@ -461,6 +461,59 @@ func (m *Link) GetLastChange() uint64 { return 0 } +// NetworkInterface is an aspect carrying basic host information +type NetworkInterface struct { + MacDevicePort string `protobuf:"bytes,1,opt,name=mac_device_port,json=macDevicePort,proto3" json:"mac_device_port,omitempty"` + Ip *IPAddress `protobuf:"bytes,2,opt,name=ip,proto3" json:"ip,omitempty"` +} + +func (m *NetworkInterface) Reset() { *m = NetworkInterface{} } +func (m *NetworkInterface) String() string { return proto.CompactTextString(m) } +func (*NetworkInterface) ProtoMessage() {} +func (*NetworkInterface) Descriptor() ([]byte, []int) { + return fileDescriptor_705cdab724be9631, []int{5} +} +func (m *NetworkInterface) XXX_Unmarshal(b []byte) error { + return m.Unmarshal(b) +} +func (m *NetworkInterface) XXX_Marshal(b []byte, deterministic bool) ([]byte, error) { + if deterministic { + return xxx_messageInfo_NetworkInterface.Marshal(b, m, deterministic) + } else { + b = b[:cap(b)] + n, err := m.MarshalToSizedBuffer(b) + if err != nil { + return nil, err + } + return b[:n], nil + } +} +func (m *NetworkInterface) XXX_Merge(src proto.Message) { + xxx_messageInfo_NetworkInterface.Merge(m, src) +} +func (m *NetworkInterface) XXX_Size() int { + return m.Size() +} +func (m *NetworkInterface) XXX_DiscardUnknown() { + xxx_messageInfo_NetworkInterface.DiscardUnknown(m) +} + +var xxx_messageInfo_NetworkInterface proto.InternalMessageInfo + +func (m *NetworkInterface) GetMacDevicePort() string { + if m != nil { + return m.MacDevicePort + } + return "" +} + +func (m *NetworkInterface) GetIp() *IPAddress { + if m != nil { + return m.Ip + } + return nil +} + // DEPRECATED: P4RuntimeServer is an entity aspect tracking P4Runtime server contact details type P4RuntimeServer struct { Endpoint *Endpoint `protobuf:"bytes,1,opt,name=endpoint,proto3" json:"endpoint,omitempty"` @@ -471,7 +524,7 @@ func (m *P4RuntimeServer) Reset() { *m = P4RuntimeServer{} } func (m *P4RuntimeServer) String() string { return proto.CompactTextString(m) } func (*P4RuntimeServer) ProtoMessage() {} func (*P4RuntimeServer) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{5} + return fileDescriptor_705cdab724be9631, []int{6} } func (m *P4RuntimeServer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -523,7 +576,7 @@ func (m *GNMIServer) Reset() { *m = GNMIServer{} } func (m *GNMIServer) String() string { return proto.CompactTextString(m) } func (*GNMIServer) ProtoMessage() {} func (*GNMIServer) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{6} + return fileDescriptor_705cdab724be9631, []int{7} } func (m *GNMIServer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -569,7 +622,7 @@ func (m *NetworkLayer) Reset() { *m = NetworkLayer{} } func (m *NetworkLayer) String() string { return proto.CompactTextString(m) } func (*NetworkLayer) ProtoMessage() {} func (*NetworkLayer) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{7} + return fileDescriptor_705cdab724be9631, []int{8} } func (m *NetworkLayer) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -623,7 +676,7 @@ func (m *Switch) Reset() { *m = Switch{} } func (m *Switch) String() string { return proto.CompactTextString(m) } func (*Switch) ProtoMessage() {} func (*Switch) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{8} + return fileDescriptor_705cdab724be9631, []int{9} } func (m *Switch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -684,7 +737,7 @@ func (m *Router) Reset() { *m = Router{} } func (m *Router) String() string { return proto.CompactTextString(m) } func (*Router) ProtoMessage() {} func (*Router) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{9} + return fileDescriptor_705cdab724be9631, []int{10} } func (m *Router) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -744,7 +797,7 @@ func (m *IPAddress) Reset() { *m = IPAddress{} } func (m *IPAddress) String() string { return proto.CompactTextString(m) } func (*IPAddress) ProtoMessage() {} func (*IPAddress) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{10} + return fileDescriptor_705cdab724be9631, []int{11} } func (m *IPAddress) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -797,7 +850,7 @@ func (m *LogicalLink) Reset() { *m = LogicalLink{} } func (m *LogicalLink) String() string { return proto.CompactTextString(m) } func (*LogicalLink) ProtoMessage() {} func (*LogicalLink) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{11} + return fileDescriptor_705cdab724be9631, []int{12} } func (m *LogicalLink) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -859,7 +912,7 @@ func (m *PhyInterface) Reset() { *m = PhyInterface{} } func (m *PhyInterface) String() string { return proto.CompactTextString(m) } func (*PhyInterface) ProtoMessage() {} func (*PhyInterface) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{12} + return fileDescriptor_705cdab724be9631, []int{13} } func (m *PhyInterface) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -978,7 +1031,7 @@ func (m *ControllerInfo) Reset() { *m = ControllerInfo{} } func (m *ControllerInfo) String() string { return proto.CompactTextString(m) } func (*ControllerInfo) ProtoMessage() {} func (*ControllerInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{13} + return fileDescriptor_705cdab724be9631, []int{14} } func (m *ControllerInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1051,7 +1104,7 @@ func (m *ControllerRole) Reset() { *m = ControllerRole{} } func (m *ControllerRole) String() string { return proto.CompactTextString(m) } func (*ControllerRole) ProtoMessage() {} func (*ControllerRole) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{14} + return fileDescriptor_705cdab724be9631, []int{15} } func (m *ControllerRole) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1106,7 +1159,7 @@ func (m *P4RTServerInfo) Reset() { *m = P4RTServerInfo{} } func (m *P4RTServerInfo) String() string { return proto.CompactTextString(m) } func (*P4RTServerInfo) ProtoMessage() {} func (*P4RTServerInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{15} + return fileDescriptor_705cdab724be9631, []int{16} } func (m *P4RTServerInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1175,7 +1228,7 @@ func (m *P4PipelineInfo) Reset() { *m = P4PipelineInfo{} } func (m *P4PipelineInfo) String() string { return proto.CompactTextString(m) } func (*P4PipelineInfo) ProtoMessage() {} func (*P4PipelineInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{16} + return fileDescriptor_705cdab724be9631, []int{17} } func (m *P4PipelineInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1243,7 +1296,7 @@ func (m *P4RTMastershipState) Reset() { *m = P4RTMastershipState{} } func (m *P4RTMastershipState) String() string { return proto.CompactTextString(m) } func (*P4RTMastershipState) ProtoMessage() {} func (*P4RTMastershipState) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{17} + return fileDescriptor_705cdab724be9631, []int{18} } func (m *P4RTMastershipState) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1303,7 +1356,7 @@ func (m *Service) Reset() { *m = Service{} } func (m *Service) String() string { return proto.CompactTextString(m) } func (*Service) ProtoMessage() {} func (*Service) Descriptor() ([]byte, []int) { - return fileDescriptor_705cdab724be9631, []int{18} + return fileDescriptor_705cdab724be9631, []int{19} } func (m *Service) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1356,6 +1409,7 @@ func init() { proto.RegisterType((*LocalAgents)(nil), "onos.topo.LocalAgents") proto.RegisterType((*Port)(nil), "onos.topo.Port") proto.RegisterType((*Link)(nil), "onos.topo.Link") + proto.RegisterType((*NetworkInterface)(nil), "onos.topo.NetworkInterface") proto.RegisterType((*P4RuntimeServer)(nil), "onos.topo.P4RuntimeServer") proto.RegisterType((*GNMIServer)(nil), "onos.topo.gNMIServer") proto.RegisterType((*NetworkLayer)(nil), "onos.topo.NetworkLayer") @@ -1375,95 +1429,97 @@ func init() { func init() { proto.RegisterFile("onos/topo/fabric.proto", fileDescriptor_705cdab724be9631) } var fileDescriptor_705cdab724be9631 = []byte{ - // 1400 bytes of a gzipped FileDescriptorProto + // 1433 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x56, 0x4d, 0x6f, 0xdb, 0x46, - 0x13, 0x36, 0x25, 0x46, 0x1f, 0x23, 0xc9, 0x56, 0x56, 0x4e, 0xa0, 0x18, 0x2f, 0x24, 0xbf, 0xc4, - 0x9b, 0x17, 0x0e, 0xd0, 0xd8, 0x85, 0xeb, 0x7e, 0x1d, 0xda, 0x54, 0x96, 0x94, 0x96, 0x81, 0xad, - 0x08, 0x6b, 0x27, 0x45, 0x4e, 0xea, 0x9a, 0x5c, 0x4b, 0x44, 0xa8, 0x5d, 0x82, 0x5c, 0x25, 0xd5, - 0xa1, 0x3d, 0x14, 0x3d, 0x14, 0x3d, 0xe5, 0xd8, 0x9f, 0xd3, 0x63, 0x81, 0x5e, 0x82, 0x9e, 0x7a, - 0x72, 0x0b, 0xe5, 0x07, 0xb4, 0x3f, 0xa1, 0xd8, 0xe5, 0x87, 0x28, 0xcb, 0x4e, 0xe3, 0x9c, 0xb8, - 0xf3, 0xec, 0xcc, 0xec, 0xcc, 0xce, 0x33, 0xb3, 0x84, 0x9b, 0x9c, 0xf1, 0x60, 0x47, 0x70, 0x8f, - 0xef, 0x9c, 0x92, 0x13, 0xdf, 0xb1, 0xb6, 0x3d, 0x9f, 0x0b, 0x8e, 0x8a, 0x12, 0xdf, 0x96, 0xf8, - 0xc6, 0xfa, 0x90, 0x0f, 0xb9, 0x42, 0x77, 0xe4, 0x2a, 0x54, 0xd8, 0x68, 0x0c, 0x39, 0x1f, 0xba, - 0x74, 0x47, 0x49, 0x27, 0x93, 0xd3, 0x1d, 0x7b, 0xe2, 0x13, 0xe1, 0x70, 0x16, 0xed, 0xdf, 0x3a, - 0xbf, 0x4f, 0xd8, 0x34, 0xdc, 0x32, 0x3e, 0x82, 0x42, 0x97, 0xd9, 0x1e, 0x77, 0x98, 0x40, 0x75, - 0xc8, 0x13, 0xdb, 0xf6, 0x69, 0x10, 0xd4, 0xb5, 0x4d, 0x6d, 0xab, 0x88, 0x63, 0x11, 0x21, 0xd0, - 0x3d, 0xee, 0x8b, 0x7a, 0x66, 0x53, 0xdb, 0xaa, 0x60, 0xb5, 0x36, 0x7e, 0xd3, 0xa0, 0x72, 0x24, - 0x7c, 0x22, 0x26, 0xe3, 0xd6, 0x90, 0x32, 0x11, 0xa0, 0x07, 0x50, 0xf1, 0xf6, 0x7c, 0x31, 0xa0, - 0x91, 0x43, 0xe5, 0xa5, 0xb4, 0x5b, 0xdb, 0x4e, 0xe2, 0xdf, 0x8e, 0xcf, 0xda, 0xaf, 0xce, 0xce, - 0x9a, 0xe5, 0xfe, 0x1e, 0x3e, 0x8e, 0x11, 0x5c, 0x96, 0xb6, 0x49, 0x2c, 0x0f, 0xa0, 0x32, 0x64, - 0x63, 0x67, 0xee, 0x2b, 0xf3, 0x2f, 0xbe, 0x3e, 0xef, 0x1d, 0x9a, 0x73, 0x5f, 0xd2, 0x36, 0xf1, - 0x75, 0x07, 0x8a, 0x36, 0x7d, 0xe6, 0x58, 0x74, 0xe0, 0xd8, 0xf5, 0xec, 0xa6, 0xb6, 0xa5, 0xef, - 0x97, 0x67, 0x67, 0xcd, 0x42, 0x47, 0x81, 0x66, 0x07, 0x17, 0xc2, 0x6d, 0xd3, 0x36, 0xfe, 0xd6, - 0xa0, 0x74, 0xc0, 0x2d, 0xe2, 0x46, 0x29, 0xb5, 0xa1, 0xe6, 0x3a, 0xec, 0xe9, 0x80, 0x48, 0xf1, - 0x4d, 0x12, 0xc3, 0xd7, 0xa5, 0xbe, 0xb2, 0x4e, 0xce, 0x6f, 0x43, 0x6d, 0xc4, 0x03, 0x71, 0xde, - 0x49, 0xe6, 0x35, 0x4e, 0xa4, 0xfe, 0xa2, 0x93, 0x2f, 0x01, 0x31, 0xb2, 0xe4, 0x23, 0x7b, 0xf9, - 0xad, 0xac, 0xcf, 0xce, 0x9a, 0xd5, 0x5e, 0xeb, 0x78, 0xc1, 0x0d, 0xae, 0x32, 0xb2, 0xe8, 0xd8, - 0xf8, 0x59, 0x03, 0xbd, 0xcf, 0x7d, 0x81, 0xd6, 0xe1, 0x9a, 0xc3, 0x6c, 0xfa, 0xb5, 0xca, 0xae, - 0x82, 0x43, 0x01, 0xdd, 0x84, 0x1c, 0x9b, 0x8c, 0x4f, 0xa8, 0x1f, 0x15, 0x3f, 0x92, 0xd0, 0x7f, - 0xa1, 0x6c, 0x3b, 0x81, 0xe7, 0x92, 0xe9, 0x80, 0x91, 0x31, 0x55, 0x91, 0x14, 0x71, 0x29, 0xc2, - 0x7a, 0x64, 0x4c, 0x25, 0x9f, 0x28, 0x23, 0x27, 0x2e, 0xb5, 0xeb, 0xfa, 0xa6, 0xb6, 0x55, 0xc0, - 0xb1, 0x28, 0x8f, 0x0a, 0x3c, 0x4a, 0xed, 0xfa, 0x35, 0x65, 0x15, 0x0a, 0xf2, 0xa8, 0x40, 0x10, - 0x31, 0x09, 0xea, 0x39, 0x05, 0x47, 0x12, 0x6a, 0x42, 0xc9, 0x25, 0x81, 0x18, 0x58, 0x23, 0xc2, - 0x86, 0xb4, 0x9e, 0x97, 0x15, 0xc4, 0x20, 0xa1, 0xb6, 0x42, 0x8c, 0x7b, 0xa0, 0x1f, 0x38, 0xec, - 0x69, 0xca, 0x81, 0xf6, 0x3a, 0x07, 0x99, 0x25, 0x07, 0x63, 0x58, 0xeb, 0xef, 0xe1, 0x09, 0x13, - 0xce, 0x98, 0x1e, 0x51, 0xff, 0x19, 0xf5, 0xd1, 0x0e, 0x14, 0xde, 0xa4, 0xdc, 0x89, 0xd2, 0x55, - 0x58, 0xf6, 0x09, 0xc0, 0xb0, 0x77, 0x68, 0xbe, 0xe5, 0x49, 0xc6, 0x14, 0xca, 0x3d, 0x2a, 0x9e, - 0x73, 0xff, 0xe9, 0x01, 0x99, 0x52, 0x1f, 0xbd, 0x0b, 0xba, 0x98, 0x7a, 0x54, 0x19, 0xaf, 0xee, - 0xfe, 0x27, 0x65, 0x9c, 0x56, 0xdb, 0x3e, 0x9e, 0x7a, 0x14, 0x2b, 0xcd, 0xa5, 0xe2, 0x65, 0x96, - 0x8a, 0x67, 0xac, 0x83, 0x2e, 0x0d, 0x50, 0x19, 0x0a, 0x8f, 0x7a, 0x9d, 0x2e, 0x3e, 0x68, 0x3d, - 0xa9, 0xae, 0x18, 0x3f, 0x6a, 0x90, 0x3b, 0x7a, 0xee, 0x08, 0x6b, 0x84, 0xfe, 0x0f, 0x85, 0x31, - 0xb7, 0xa9, 0x2b, 0xd3, 0x55, 0xd7, 0xbd, 0x5f, 0x9a, 0x9d, 0x35, 0xf3, 0x87, 0x12, 0x33, 0x3b, - 0x38, 0xaf, 0x36, 0x4d, 0x5b, 0xce, 0x0e, 0x9f, 0xbb, 0xf1, 0x19, 0x6a, 0x8d, 0x3a, 0x50, 0x1b, - 0x13, 0x46, 0x86, 0x74, 0xbc, 0xc0, 0x66, 0xfd, 0xf2, 0xec, 0xd1, 0x5c, 0x3f, 0x61, 0xee, 0x37, - 0x90, 0xc3, 0x7c, 0x22, 0xa8, 0x8f, 0x6e, 0x9d, 0x8f, 0xe5, 0xad, 0x8e, 0xcf, 0x5e, 0xed, 0x78, - 0x06, 0x45, 0xb3, 0xdf, 0x8a, 0x26, 0xe4, 0xdd, 0x85, 0x1a, 0xdc, 0x4a, 0xf9, 0x48, 0x74, 0xd2, - 0x05, 0xb8, 0x09, 0x19, 0xc7, 0x0b, 0x63, 0xda, 0xcf, 0xcd, 0xce, 0x9a, 0x19, 0xb3, 0x8f, 0x33, - 0x8e, 0x67, 0x6c, 0x44, 0xb7, 0x5e, 0x00, 0xdd, 0xec, 0x3f, 0xde, 0xab, 0xae, 0x44, 0xab, 0x0f, - 0xaa, 0x9a, 0xf1, 0x42, 0xcd, 0xa6, 0xa1, 0x63, 0x11, 0x57, 0xb1, 0xfd, 0x1e, 0x14, 0x03, 0x3e, - 0xf1, 0x25, 0xe1, 0xbc, 0x88, 0x38, 0xeb, 0x17, 0x9d, 0x1b, 0xd2, 0xf0, 0x48, 0xa9, 0x9a, 0x7d, - 0x5c, 0x08, 0x8d, 0x4c, 0x0f, 0x7d, 0x06, 0x79, 0x9b, 0x06, 0x62, 0x10, 0x45, 0x72, 0x99, 0xf9, - 0xf5, 0xd9, 0x59, 0xb3, 0xd2, 0xa1, 0x81, 0x70, 0x98, 0x7a, 0x54, 0xcc, 0x3e, 0xce, 0x49, 0x3b, - 0xd3, 0x33, 0x7e, 0xc8, 0x42, 0xb9, 0x3f, 0x9a, 0x9a, 0x4c, 0x50, 0xff, 0x94, 0x58, 0xcb, 0xc4, - 0xd2, 0x96, 0xa7, 0x42, 0xd2, 0xfb, 0x99, 0x74, 0xef, 0x37, 0xa1, 0x24, 0x5f, 0x95, 0x41, 0x34, - 0x6b, 0xb2, 0x6a, 0xd6, 0x80, 0x84, 0x7a, 0xe1, 0xbc, 0xb9, 0x0d, 0xab, 0xb2, 0x7d, 0x19, 0x75, - 0x63, 0x1d, 0x5d, 0xe9, 0x54, 0x22, 0x34, 0x52, 0xbb, 0x03, 0x45, 0x41, 0xfc, 0x21, 0x15, 0x92, - 0x0a, 0x6a, 0xba, 0x84, 0xe9, 0x1f, 0x2b, 0x50, 0x76, 0x61, 0xb8, 0x6d, 0xda, 0xe9, 0xf1, 0x94, - 0x5b, 0x1c, 0x4f, 0x77, 0xa0, 0x3a, 0xa2, 0xc4, 0x15, 0xa3, 0x81, 0xc3, 0x6c, 0xc7, 0x22, 0x82, - 0xfb, 0x6a, 0xea, 0x14, 0xf1, 0x5a, 0x88, 0x9b, 0x31, 0x2c, 0x99, 0xe7, 0x9c, 0x0e, 0xc2, 0xb9, - 0x59, 0x50, 0x01, 0xe5, 0x9d, 0x53, 0x53, 0x4d, 0xce, 0x26, 0x94, 0xc6, 0xc4, 0x1a, 0xc4, 0x4f, - 0x6a, 0x51, 0x39, 0x80, 0x31, 0xb1, 0x62, 0xce, 0xdc, 0x86, 0x55, 0x32, 0x11, 0x7c, 0xc0, 0xe8, - 0x90, 0x0b, 0x87, 0x08, 0x5a, 0x07, 0x15, 0x47, 0x45, 0xa2, 0xbd, 0x18, 0x44, 0xff, 0x53, 0x5c, - 0x29, 0x5d, 0x5e, 0x21, 0xc5, 0x9c, 0xef, 0x32, 0xb0, 0xda, 0xe6, 0x4c, 0xf8, 0xdc, 0x75, 0xa9, - 0x6f, 0xb2, 0x53, 0x8e, 0x76, 0x17, 0x38, 0xd9, 0x48, 0x99, 0x2e, 0x2a, 0xa6, 0x89, 0x79, 0x37, - 0xd5, 0x2e, 0xa5, 0x05, 0x1e, 0xcf, 0x6d, 0x30, 0x77, 0x69, 0xd4, 0x49, 0x9f, 0x42, 0xd5, 0x0a, - 0xf1, 0x37, 0x6a, 0xa3, 0xb5, 0x48, 0x39, 0x79, 0xd5, 0x36, 0xa0, 0x30, 0x09, 0xa8, 0xaf, 0xb8, - 0xa2, 0xab, 0x0b, 0x4a, 0x64, 0xb9, 0xe7, 0x91, 0x20, 0x78, 0xce, 0xfd, 0xf8, 0x9d, 0x48, 0x64, - 0xe3, 0x46, 0xd4, 0x27, 0x15, 0x28, 0xf6, 0xf7, 0xf0, 0xa3, 0xde, 0xb1, 0x79, 0xd8, 0xad, 0xae, - 0x18, 0x38, 0x7d, 0x07, 0x32, 0x4c, 0xd9, 0xfe, 0x29, 0x22, 0xaa, 0x35, 0x7a, 0x07, 0x72, 0x16, - 0x67, 0xa7, 0xce, 0x30, 0xa1, 0x7d, 0xf8, 0x7f, 0xb4, 0x1d, 0xff, 0x1f, 0x6d, 0xb7, 0xd8, 0x14, - 0x47, 0x3a, 0xc6, 0x5f, 0x1a, 0xac, 0xca, 0x1f, 0x95, 0x70, 0x5a, 0xab, 0x8b, 0xbd, 0x28, 0x6b, - 0xed, 0x0a, 0x59, 0x7f, 0x0c, 0x79, 0xf9, 0xd2, 0xf0, 0x89, 0x48, 0xee, 0xf9, 0x7c, 0x04, 0x9d, - 0xe8, 0x0f, 0x6e, 0x5f, 0xff, 0xe9, 0x8f, 0xa6, 0x86, 0x63, 0xfd, 0x2b, 0xbc, 0x32, 0xe8, 0x43, - 0x28, 0x7a, 0x8e, 0x47, 0x5d, 0x87, 0xd1, 0xa0, 0xae, 0x6f, 0x66, 0xcf, 0xd5, 0xb3, 0xbf, 0xd7, - 0x8f, 0x76, 0x65, 0x4e, 0x78, 0xae, 0x6b, 0xfc, 0x9a, 0x91, 0x19, 0xa7, 0x77, 0x2f, 0xbc, 0xc6, - 0x3a, 0xe4, 0x9f, 0x51, 0x3f, 0x70, 0x38, 0x8b, 0x5a, 0x39, 0x16, 0x91, 0x01, 0x65, 0xe2, 0x5b, - 0x23, 0x47, 0x50, 0x4b, 0x4c, 0xfc, 0xf8, 0xdf, 0x60, 0x01, 0x43, 0x5f, 0xc1, 0x7a, 0x78, 0xc1, - 0x51, 0xa2, 0x03, 0x62, 0xc9, 0x8f, 0x62, 0xc1, 0xea, 0xee, 0xdd, 0x4b, 0x03, 0x95, 0x3c, 0x9c, - 0x5b, 0xb5, 0x94, 0x11, 0xae, 0x59, 0xcb, 0xa0, 0xf1, 0xbd, 0x06, 0xb5, 0x0b, 0x94, 0xd1, 0x1a, - 0x94, 0x1e, 0xf5, 0x8e, 0xfa, 0xdd, 0xb6, 0x79, 0xdf, 0xec, 0x76, 0xaa, 0x2b, 0x08, 0x20, 0xf7, - 0xb8, 0x8b, 0xcd, 0xfb, 0x4f, 0xaa, 0x1a, 0xaa, 0xc1, 0x5a, 0xb8, 0x1e, 0xb4, 0x7a, 0x9d, 0xc1, - 0x51, 0xeb, 0x71, 0xb7, 0x9a, 0x41, 0x37, 0xe0, 0x7a, 0x0a, 0x6c, 0x3f, 0x3c, 0x3c, 0x34, 0x8f, - 0xab, 0x59, 0x69, 0x17, 0xad, 0x75, 0x54, 0x87, 0x75, 0xdc, 0x6d, 0x3f, 0xec, 0xb5, 0xcd, 0x83, - 0x6e, 0x5a, 0xeb, 0x9a, 0x21, 0xa0, 0x26, 0xe9, 0x73, 0x48, 0x02, 0x41, 0xfd, 0x60, 0xe4, 0x78, - 0x47, 0x42, 0x76, 0x35, 0x02, 0x5d, 0x50, 0x7f, 0xac, 0x6e, 0x54, 0xc7, 0x6a, 0x8d, 0xde, 0x87, - 0x8a, 0xc5, 0x19, 0xa3, 0x2a, 0x4e, 0x59, 0xe0, 0xf0, 0x81, 0x50, 0xff, 0xb7, 0xed, 0x64, 0xc3, - 0xec, 0xe0, 0xf2, 0x5c, 0x2d, 0xf5, 0xc4, 0x65, 0xe7, 0x4f, 0x9c, 0xf1, 0x2d, 0xe4, 0x25, 0x61, - 0x1d, 0x8b, 0x2e, 0x8e, 0x44, 0xed, 0xb5, 0x23, 0xf1, 0x0b, 0x58, 0x1b, 0x27, 0x71, 0xca, 0x9f, - 0xa7, 0x78, 0x10, 0x34, 0x16, 0xea, 0xb1, 0x94, 0x0d, 0x3e, 0x6f, 0xb6, 0x5f, 0xff, 0x65, 0xd6, - 0xd0, 0x5e, 0xce, 0x1a, 0xda, 0x9f, 0xb3, 0x86, 0xf6, 0xe2, 0x55, 0x63, 0xe5, 0xe5, 0xab, 0xc6, - 0xca, 0xef, 0xaf, 0x1a, 0x2b, 0x27, 0x39, 0xc5, 0xf1, 0xf7, 0xfe, 0x09, 0x00, 0x00, 0xff, 0xff, - 0xd3, 0x5d, 0xb1, 0xbb, 0xee, 0x0c, 0x00, 0x00, + 0x13, 0x36, 0x25, 0x46, 0x1f, 0x23, 0xc9, 0x56, 0x56, 0x4e, 0xa0, 0x18, 0x2f, 0x24, 0xbf, 0x44, + 0x13, 0x38, 0x40, 0x63, 0x17, 0xae, 0xfb, 0x75, 0x68, 0x53, 0x59, 0x52, 0x5a, 0x06, 0xb6, 0x22, + 0xac, 0x9d, 0x14, 0x39, 0x29, 0x6b, 0x72, 0x2d, 0x11, 0xa1, 0x76, 0x09, 0x72, 0x95, 0x54, 0x87, + 0xf6, 0x50, 0xf4, 0x50, 0xf4, 0x94, 0x63, 0x7f, 0x4e, 0x8f, 0x05, 0x7a, 0x09, 0x7a, 0xea, 0xc9, + 0x2d, 0x94, 0x1f, 0xd0, 0xfe, 0x84, 0x62, 0x97, 0x1f, 0xa2, 0x6c, 0xc7, 0x89, 0x73, 0x22, 0x67, + 0x76, 0x66, 0x76, 0x66, 0xf6, 0x99, 0x67, 0x17, 0xae, 0x73, 0xc6, 0x83, 0x2d, 0xc1, 0x3d, 0xbe, + 0x75, 0x4c, 0x8e, 0x7c, 0xc7, 0xda, 0xf4, 0x7c, 0x2e, 0x38, 0x2a, 0x4a, 0xfd, 0xa6, 0xd4, 0xaf, + 0xad, 0x0e, 0xf9, 0x90, 0x2b, 0xed, 0x96, 0xfc, 0x0b, 0x0d, 0xd6, 0x1a, 0x43, 0xce, 0x87, 0x2e, + 0xdd, 0x52, 0xd2, 0xd1, 0xe4, 0x78, 0xcb, 0x9e, 0xf8, 0x44, 0x38, 0x9c, 0x45, 0xeb, 0x37, 0x4e, + 0xaf, 0x13, 0x36, 0x0d, 0x97, 0x8c, 0x4f, 0xa1, 0xd0, 0x65, 0xb6, 0xc7, 0x1d, 0x26, 0x50, 0x1d, + 0xf2, 0xc4, 0xb6, 0x7d, 0x1a, 0x04, 0x75, 0x6d, 0x5d, 0xdb, 0x28, 0xe2, 0x58, 0x44, 0x08, 0x74, + 0x8f, 0xfb, 0xa2, 0x9e, 0x59, 0xd7, 0x36, 0x2a, 0x58, 0xfd, 0x1b, 0x7f, 0x68, 0x50, 0x39, 0x10, + 0x3e, 0x11, 0x93, 0x71, 0x6b, 0x48, 0x99, 0x08, 0xd0, 0x7d, 0xa8, 0x78, 0x3b, 0xbe, 0x18, 0xd0, + 0x28, 0xa0, 0x8a, 0x52, 0xda, 0xae, 0x6d, 0x26, 0xf9, 0x6f, 0xc6, 0x7b, 0xed, 0x56, 0x67, 0x27, + 0xcd, 0x72, 0x7f, 0x07, 0x1f, 0xc6, 0x1a, 0x5c, 0x96, 0xbe, 0x49, 0x2e, 0xf7, 0xa1, 0x32, 0x64, + 0x63, 0x67, 0x1e, 0x2b, 0xf3, 0x86, 0x58, 0x5f, 0xf5, 0xf6, 0xcd, 0x79, 0x2c, 0xe9, 0x9b, 0xc4, + 0xba, 0x0d, 0x45, 0x9b, 0x3e, 0x73, 0x2c, 0x3a, 0x70, 0xec, 0x7a, 0x76, 0x5d, 0xdb, 0xd0, 0x77, + 0xcb, 0xb3, 0x93, 0x66, 0xa1, 0xa3, 0x94, 0x66, 0x07, 0x17, 0xc2, 0x65, 0xd3, 0x36, 0xfe, 0xd5, + 0xa0, 0xb4, 0xc7, 0x2d, 0xe2, 0x46, 0x25, 0xb5, 0xa1, 0xe6, 0x3a, 0xec, 0xe9, 0x80, 0x48, 0xf1, + 0x6d, 0x0a, 0xc3, 0x57, 0xa5, 0xbd, 0xf2, 0x4e, 0xf6, 0x6f, 0x43, 0x6d, 0xc4, 0x03, 0x71, 0x3a, + 0x48, 0xe6, 0x82, 0x20, 0xd2, 0x7e, 0x31, 0xc8, 0x37, 0x80, 0x18, 0x39, 0x13, 0x23, 0xfb, 0xfa, + 0xae, 0xac, 0xce, 0x4e, 0x9a, 0xd5, 0x5e, 0xeb, 0x70, 0x21, 0x0c, 0xae, 0x32, 0xb2, 0x18, 0xd8, + 0xf8, 0x55, 0x03, 0xbd, 0xcf, 0x7d, 0x81, 0x56, 0xe1, 0x8a, 0xc3, 0x6c, 0xfa, 0xad, 0xaa, 0xae, + 0x82, 0x43, 0x01, 0x5d, 0x87, 0x1c, 0x9b, 0x8c, 0x8f, 0xa8, 0x1f, 0x1d, 0x7e, 0x24, 0xa1, 0xff, + 0x43, 0xd9, 0x76, 0x02, 0xcf, 0x25, 0xd3, 0x01, 0x23, 0x63, 0xaa, 0x32, 0x29, 0xe2, 0x52, 0xa4, + 0xeb, 0x91, 0x31, 0x95, 0x78, 0xa2, 0x8c, 0x1c, 0xb9, 0xd4, 0xae, 0xeb, 0xeb, 0xda, 0x46, 0x01, + 0xc7, 0xa2, 0xdc, 0x2a, 0xf0, 0x28, 0xb5, 0xeb, 0x57, 0x94, 0x57, 0x28, 0xc8, 0xad, 0x02, 0x41, + 0xc4, 0x24, 0xa8, 0xe7, 0x94, 0x3a, 0x92, 0x50, 0x13, 0x4a, 0x2e, 0x09, 0xc4, 0xc0, 0x1a, 0x11, + 0x36, 0xa4, 0xf5, 0xbc, 0x3c, 0x41, 0x0c, 0x52, 0xd5, 0x56, 0x1a, 0xe3, 0x2e, 0xe8, 0x7b, 0x0e, + 0x7b, 0x9a, 0x0a, 0xa0, 0x5d, 0x14, 0x20, 0x73, 0x26, 0xc0, 0x13, 0xa8, 0xf6, 0xa8, 0x78, 0xce, + 0xfd, 0xa7, 0x26, 0x13, 0xd4, 0x3f, 0x26, 0x16, 0x45, 0xb7, 0x60, 0x65, 0x4c, 0xac, 0x41, 0x84, + 0x1c, 0x05, 0xff, 0x30, 0x6a, 0x65, 0x4c, 0xac, 0x10, 0x3a, 0xaa, 0x6d, 0xef, 0x41, 0xc6, 0xf1, + 0xa2, 0xc3, 0x5c, 0x4d, 0x1d, 0x84, 0xd9, 0x6f, 0x85, 0xd3, 0x83, 0x33, 0x8e, 0x67, 0x8c, 0x61, + 0xa5, 0xbf, 0x83, 0x27, 0x4c, 0x38, 0x63, 0x7a, 0x40, 0xfd, 0x67, 0xd4, 0x47, 0x5b, 0x50, 0x78, + 0x1b, 0x40, 0x25, 0x46, 0x97, 0xc1, 0xf1, 0xe7, 0x00, 0xc3, 0xde, 0xbe, 0xf9, 0x8e, 0x3b, 0x19, + 0x53, 0x28, 0x47, 0xfd, 0xd8, 0x23, 0x53, 0xea, 0xa3, 0x0f, 0x40, 0x17, 0x53, 0x8f, 0x2a, 0xe7, + 0xe5, 0xed, 0xff, 0xa5, 0x9c, 0xd3, 0x66, 0x9b, 0x87, 0x53, 0x8f, 0x62, 0x65, 0x79, 0x06, 0x1e, + 0x99, 0x33, 0xf0, 0x30, 0x56, 0x41, 0x97, 0x0e, 0xa8, 0x0c, 0x85, 0x87, 0xbd, 0x4e, 0x17, 0xef, + 0xb5, 0x1e, 0x57, 0x97, 0x8c, 0x9f, 0x35, 0xc8, 0x1d, 0x3c, 0x77, 0x84, 0x35, 0x42, 0xb7, 0xa0, + 0x30, 0xe6, 0x36, 0x75, 0x65, 0xb9, 0xaa, 0xf5, 0xbb, 0xa5, 0xd9, 0x49, 0x33, 0xbf, 0x2f, 0x75, + 0x66, 0x07, 0xe7, 0xd5, 0xa2, 0x69, 0x4b, 0x76, 0xf2, 0xb9, 0x1b, 0xef, 0xa1, 0xfe, 0x51, 0x07, + 0x6a, 0x63, 0xc2, 0xc8, 0x90, 0x8e, 0x17, 0xe6, 0x45, 0x7f, 0x7d, 0xf5, 0x68, 0x6e, 0x9f, 0xcc, + 0xc6, 0x77, 0x90, 0xc3, 0x7c, 0x22, 0xa8, 0x8f, 0x6e, 0x9c, 0xce, 0xe5, 0x9d, 0xb6, 0xcf, 0x5e, + 0x6e, 0x7b, 0x06, 0xc5, 0x04, 0x45, 0xe8, 0xce, 0xc2, 0x19, 0xdc, 0x38, 0x0f, 0x69, 0xe9, 0x03, + 0xb8, 0x9e, 0xc0, 0xb2, 0xb8, 0x9b, 0x9b, 0x9d, 0x34, 0x33, 0x66, 0x5f, 0x01, 0x71, 0x2d, 0xea, + 0x7a, 0x01, 0x74, 0xb3, 0xff, 0x68, 0xa7, 0xba, 0x14, 0xfd, 0x7d, 0x5c, 0xd5, 0x8c, 0x17, 0x8a, + 0xfd, 0x86, 0x8e, 0x45, 0x5c, 0x35, 0x4f, 0x77, 0xa1, 0x18, 0xf0, 0x89, 0x2f, 0x01, 0xe7, 0x45, + 0xc0, 0x39, 0x17, 0xe1, 0x21, 0x0c, 0x0f, 0x94, 0xa9, 0xd9, 0xc7, 0x85, 0xd0, 0xc9, 0xf4, 0xd0, + 0x97, 0x90, 0xb7, 0x69, 0x20, 0x06, 0x17, 0x0f, 0xc8, 0xee, 0xd5, 0xd9, 0x49, 0xb3, 0xd2, 0xa1, + 0x81, 0x70, 0x98, 0xba, 0xb6, 0xcc, 0x3e, 0xce, 0x49, 0x3f, 0xd3, 0x33, 0x7e, 0xca, 0x42, 0xb9, + 0x3f, 0x9a, 0xce, 0xc7, 0xf2, 0x34, 0xb0, 0xb4, 0xb3, 0xbc, 0x93, 0xb0, 0x4b, 0x26, 0xcd, 0x2e, + 0x4d, 0x28, 0xc9, 0x21, 0x1e, 0x44, 0x6c, 0x96, 0x55, 0x6c, 0x06, 0x52, 0xd5, 0x0b, 0x19, 0xed, + 0x26, 0x2c, 0x4b, 0x82, 0x60, 0xd4, 0x8d, 0x6d, 0x74, 0x65, 0x53, 0x89, 0xb4, 0x91, 0xd9, 0x6d, + 0x28, 0x0a, 0xe2, 0x0f, 0xa9, 0x90, 0x50, 0x50, 0xfc, 0x15, 0x96, 0x7f, 0xa8, 0x94, 0x72, 0x0a, + 0xc3, 0x65, 0xd3, 0x4e, 0x13, 0x60, 0x6e, 0x91, 0x00, 0x6f, 0x43, 0x75, 0x44, 0x89, 0x2b, 0x46, + 0x03, 0x87, 0xd9, 0x8e, 0x45, 0x04, 0xf7, 0x15, 0xaf, 0x15, 0xf1, 0x4a, 0xa8, 0x37, 0x63, 0xb5, + 0x44, 0x9e, 0x73, 0x3c, 0x08, 0x99, 0xb9, 0xa0, 0x12, 0xca, 0x3b, 0xc7, 0xa6, 0xe2, 0xe6, 0x26, + 0x94, 0x24, 0x45, 0xc5, 0x97, 0x76, 0x51, 0x05, 0x80, 0x31, 0xb1, 0x62, 0xcc, 0xdc, 0x84, 0x65, + 0x32, 0x11, 0x7c, 0xc0, 0xe8, 0x90, 0x0b, 0x87, 0x08, 0x5a, 0x07, 0x95, 0x47, 0x45, 0x6a, 0x7b, + 0xb1, 0x32, 0xa2, 0xb0, 0xd2, 0x1b, 0x28, 0xec, 0x87, 0x0c, 0x2c, 0xb7, 0x39, 0x13, 0x3e, 0x77, + 0x5d, 0xea, 0x9b, 0xec, 0x98, 0xa3, 0xed, 0x05, 0x4c, 0x36, 0x52, 0xae, 0x8b, 0x86, 0x69, 0x60, + 0xde, 0x49, 0x8d, 0x4b, 0x69, 0x01, 0xc7, 0x73, 0x1f, 0xcc, 0x5d, 0x1a, 0x4d, 0xd2, 0x17, 0x50, + 0xb5, 0x42, 0xfd, 0x5b, 0x8d, 0xd1, 0x4a, 0x64, 0x9c, 0xdc, 0x9b, 0x6b, 0x50, 0x98, 0x04, 0xd4, + 0x57, 0x58, 0xd1, 0x55, 0x83, 0x12, 0x59, 0xae, 0x79, 0x24, 0x08, 0x9e, 0x73, 0x3f, 0xbe, 0x89, + 0x12, 0xd9, 0xb8, 0x16, 0xcd, 0x49, 0x05, 0x8a, 0xfd, 0x1d, 0xfc, 0xb0, 0x77, 0x68, 0xee, 0x77, + 0xab, 0x4b, 0x06, 0x4e, 0xf7, 0x40, 0xa6, 0x29, 0xc7, 0x3f, 0x05, 0x44, 0xf5, 0x8f, 0xde, 0x87, + 0x9c, 0xc5, 0xd9, 0xb1, 0x33, 0x4c, 0x60, 0x1f, 0xbe, 0xc0, 0x36, 0xe3, 0x17, 0xd8, 0x66, 0x8b, + 0x4d, 0x71, 0x64, 0x63, 0xfc, 0xa3, 0xc1, 0xb2, 0x7c, 0x0a, 0x85, 0x6c, 0xad, 0x1a, 0x7b, 0x5e, + 0xd5, 0xda, 0x25, 0xaa, 0xfe, 0x0c, 0xf2, 0xf2, 0xa6, 0xe1, 0x13, 0x91, 0xf4, 0xf9, 0x74, 0x06, + 0x9d, 0xe8, 0x8d, 0xb8, 0xab, 0xff, 0xf2, 0x57, 0x53, 0xc3, 0xb1, 0xfd, 0x25, 0x6e, 0x19, 0xf4, + 0x09, 0x14, 0x3d, 0xc7, 0xa3, 0xae, 0xc3, 0x68, 0x50, 0xd7, 0xd7, 0xb3, 0xa7, 0xce, 0xb3, 0xbf, + 0xd3, 0x8f, 0x56, 0x65, 0x4d, 0x78, 0x6e, 0x6b, 0xfc, 0x9e, 0x91, 0x15, 0xa7, 0x57, 0xcf, 0x6d, + 0x63, 0x1d, 0xf2, 0xcf, 0xa8, 0x1f, 0x38, 0x9c, 0x45, 0xa3, 0x1c, 0x8b, 0xc8, 0x80, 0x32, 0xf1, + 0xad, 0x91, 0x23, 0xa8, 0x25, 0x26, 0x7e, 0xfc, 0xfa, 0x58, 0xd0, 0xa1, 0x27, 0xb0, 0x1a, 0x36, + 0x38, 0x2a, 0x74, 0x40, 0x2c, 0xf9, 0x51, 0x28, 0x58, 0xde, 0xbe, 0xf3, 0xda, 0x44, 0x25, 0x0e, + 0xe7, 0x5e, 0x2d, 0xe5, 0x84, 0x6b, 0xd6, 0x59, 0xa5, 0xf1, 0xa3, 0x06, 0xb5, 0x73, 0x8c, 0xd1, + 0x0a, 0x94, 0x1e, 0xf6, 0x0e, 0xfa, 0xdd, 0xb6, 0x79, 0xcf, 0xec, 0x76, 0xaa, 0x4b, 0x08, 0x20, + 0xf7, 0xa8, 0x8b, 0xcd, 0x7b, 0x8f, 0xab, 0x1a, 0xaa, 0xc1, 0x4a, 0xf8, 0x3f, 0x68, 0xf5, 0x3a, + 0x83, 0x83, 0xd6, 0xa3, 0x6e, 0x35, 0x83, 0xae, 0xc1, 0xd5, 0x94, 0xb2, 0xfd, 0x60, 0x7f, 0xdf, + 0x3c, 0xac, 0x66, 0xa5, 0x5f, 0xf4, 0xaf, 0xa3, 0x3a, 0xac, 0xe2, 0x6e, 0xfb, 0x41, 0xaf, 0x6d, + 0xee, 0x75, 0xd3, 0x56, 0x57, 0x0c, 0x01, 0x35, 0x09, 0x9f, 0x7d, 0x12, 0x08, 0xea, 0x07, 0x23, + 0xc7, 0x3b, 0x10, 0x72, 0xaa, 0x11, 0xe8, 0x82, 0xfa, 0x63, 0xd5, 0x51, 0x1d, 0xab, 0x7f, 0xf4, + 0x11, 0x54, 0x2c, 0xce, 0x18, 0x55, 0x79, 0xca, 0x03, 0x0e, 0x2f, 0x08, 0xf5, 0x82, 0x6e, 0x27, + 0x0b, 0x66, 0x07, 0x97, 0xe7, 0x66, 0xa9, 0x2b, 0x2e, 0x3b, 0xbf, 0xe2, 0x8c, 0xef, 0x21, 0x2f, + 0x01, 0xeb, 0x58, 0x74, 0x91, 0x12, 0xb5, 0x0b, 0x29, 0xf1, 0x6b, 0xf9, 0xaa, 0x8a, 0xf3, 0x94, + 0xcf, 0xb3, 0x98, 0x08, 0x1a, 0x0b, 0xe7, 0x71, 0xa6, 0x1a, 0x7c, 0xda, 0x6d, 0xb7, 0xfe, 0xdb, + 0xac, 0xa1, 0xbd, 0x9c, 0x35, 0xb4, 0xbf, 0x67, 0x0d, 0xed, 0xc5, 0xab, 0xc6, 0xd2, 0xcb, 0x57, + 0x8d, 0xa5, 0x3f, 0x5f, 0x35, 0x96, 0x8e, 0x72, 0x0a, 0xe3, 0x1f, 0xfe, 0x17, 0x00, 0x00, 0xff, + 0xff, 0xa8, 0xd1, 0x12, 0x90, 0x50, 0x0d, 0x00, 0x00, } func (m *Endpoint) Marshal() (dAtA []byte, err error) { @@ -1716,6 +1772,48 @@ func (m *Link) MarshalToSizedBuffer(dAtA []byte) (int, error) { return len(dAtA) - i, nil } +func (m *NetworkInterface) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalToSizedBuffer(dAtA[:size]) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *NetworkInterface) MarshalTo(dAtA []byte) (int, error) { + size := m.Size() + return m.MarshalToSizedBuffer(dAtA[:size]) +} + +func (m *NetworkInterface) MarshalToSizedBuffer(dAtA []byte) (int, error) { + i := len(dAtA) + _ = i + var l int + _ = l + if m.Ip != nil { + { + size, err := m.Ip.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintFabric(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x12 + } + if len(m.MacDevicePort) > 0 { + i -= len(m.MacDevicePort) + copy(dAtA[i:], m.MacDevicePort) + i = encodeVarintFabric(dAtA, i, uint64(len(m.MacDevicePort))) + i-- + dAtA[i] = 0xa + } + return len(dAtA) - i, nil +} + func (m *P4RuntimeServer) Marshal() (dAtA []byte, err error) { size := m.Size() dAtA = make([]byte, size) @@ -2259,12 +2357,12 @@ func (m *P4RTServerInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { dAtA[i] = 0x18 } if m.Timeout != nil { - n16, err16 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Timeout, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Timeout):]) - if err16 != nil { - return 0, err16 + n17, err17 := github_com_gogo_protobuf_types.StdDurationMarshalTo(*m.Timeout, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdDuration(*m.Timeout):]) + if err17 != nil { + return 0, err17 } - i -= n16 - i = encodeVarintFabric(dAtA, i, uint64(n16)) + i -= n17 + i = encodeVarintFabric(dAtA, i, uint64(n17)) i-- dAtA[i] = 0x12 } @@ -2533,6 +2631,23 @@ func (m *Link) Size() (n int) { return n } +func (m *NetworkInterface) Size() (n int) { + if m == nil { + return 0 + } + var l int + _ = l + l = len(m.MacDevicePort) + if l > 0 { + n += 1 + l + sovFabric(uint64(l)) + } + if m.Ip != nil { + l = m.Ip.Size() + n += 1 + l + sovFabric(uint64(l)) + } + return n +} + func (m *P4RuntimeServer) Size() (n int) { if m == nil { return 0 @@ -3563,6 +3678,124 @@ func (m *Link) Unmarshal(dAtA []byte) error { } return nil } +func (m *NetworkInterface) 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 ErrIntOverflowFabric + } + 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: NetworkInterface: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: NetworkInterface: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field MacDevicePort", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFabric + } + 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 ErrInvalidLengthFabric + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthFabric + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.MacDevicePort = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Ip", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFabric + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthFabric + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthFabric + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Ip == nil { + m.Ip = &IPAddress{} + } + if err := m.Ip.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex + default: + iNdEx = preIndex + skippy, err := skipFabric(dAtA[iNdEx:]) + if err != nil { + return err + } + if (skippy < 0) || (iNdEx+skippy) < 0 { + return ErrInvalidLengthFabric + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func (m *P4RuntimeServer) Unmarshal(dAtA []byte) error { l := len(dAtA) iNdEx := 0 diff --git a/proto/onos/topo/fabric.proto b/proto/onos/topo/fabric.proto index 40fe682b..d0c3a5be 100644 --- a/proto/onos/topo/fabric.proto +++ b/proto/onos/topo/fabric.proto @@ -47,6 +47,13 @@ message Link { uint64 last_change = 2; } +// NetworkInterface is an aspect carrying basic host information +message NetworkInterface { + string mac_device_port = 1; // mac-device/port + IPAddress ip = 2; + // ToDo - add VLAN later +} + // TODO: Refactor, simplify and clean-up the aspects below; move them to Underlay/VirtualNet/etc. app APIs // Most of the following are deprecated diff --git a/protoset/onos-topo.protoset b/protoset/onos-topo.protoset index 7d520e6f0a58acbffbae80d3e8d2fe70a9ed2140..58d9b712b61679c53c965b5b7a0f4c82c0c1e463 100644 GIT binary patch delta 95 zcmZ27nW=3G(}pxFrfpK2Gpwqa?Gv~J{8CHG^NX@Q^GZ^S(h`$Xh19tCa}$%}Q&P(^ ulT+gh@{39&7!?>bID>eB!Y*LZ0HC0d3K!GlhYoTqK}?win;+R8@&*73Z6F8$ delta 22 ecmZph!n9;E(}pxFrYn-0GpwqaH@n&$^acQA%m}Ig diff --git a/python/onos/topo/__init__.py b/python/onos/topo/__init__.py index d4ff39df..5faf29e9 100644 --- a/python/onos/topo/__init__.py +++ b/python/onos/topo/__init__.py @@ -479,25 +479,34 @@ def __post_init__(self) -> None: @dataclass(eq=False, repr=False) -class P4RuntimeServer(betterproto.Message): +class NetworkInterface(betterproto.Message): """ ProtocolState contains information related to service and connectivity to a device """ # The protocol to which state relates - endpoint: "Endpoint" = betterproto.message_field(1) + mac_device_port: str = betterproto.string_field(1) # ConnectivityState contains the L3 connectivity information - device_id: int = betterproto.uint64_field(3) + ip: "IpAddress" = betterproto.message_field(2) def __post_init__(self) -> None: super().__post_init__() @dataclass(eq=False, repr=False) -class GNmiServer(betterproto.Message): +class P4RuntimeServer(betterproto.Message): """Protocols""" + endpoint: "Endpoint" = betterproto.message_field(1) + device_id: int = betterproto.uint64_field(3) + + def __post_init__(self) -> None: + super().__post_init__() + + +@dataclass(eq=False, repr=False) +class GNmiServer(betterproto.Message): endpoint: "Endpoint" = betterproto.message_field(1) def __post_init__(self) -> None: