diff --git a/Collection Models/ONU Information Collection/ONU remote information/an-epon-onu-transceivers.proto b/Collection Models/ONU Information Collection/ONU remote information/an-epon-onu-transceivers.proto index 52479a6819efecd96ca5207bf90d0d97a6a0b5de..5cdc4908fa4ff0e4e0caab49f5262a0952a5d911 100644 --- a/Collection Models/ONU Information Collection/ONU remote information/an-epon-onu-transceivers.proto +++ b/Collection Models/ONU Information Collection/ONU remote information/an-epon-onu-transceivers.proto @@ -21,7 +21,7 @@ message EponOnuTransceivers { //The current voltage of the optical module.The unit is 0.01V. int32 optical_unit_voltage = 6; - // Optical module type.(0:unknown,1:gpon,2:xg-pon,3:xgs-pon,4:gpon-and-xgpon,5:gpon-and-xgspon,-1:invalid) + // Optical module type.(0:unknown,1:epon,2:10g-epon-s,3:10g-epon-a,-1:invalid) int32 module_type = 7; //Optical module subtype. diff --git a/Collection Models/Optical Link Information Collection/an-epon-pm-olt-transceivers.proto b/Collection Models/Optical Link Information Collection/an-epon-pm-olt-transceivers.proto index 4d1c35351381fd12ff22c429b29b0db9fac3a085..8d962a746533157a90df8e38d68d0fb60a83ccb1 100644 --- a/Collection Models/Optical Link Information Collection/an-epon-pm-olt-transceivers.proto +++ b/Collection Models/Optical Link Information Collection/an-epon-pm-olt-transceivers.proto @@ -36,7 +36,7 @@ message EponPmOltTransceivers { //Optical power at idle time of channel 2.The unit is 0.01dBm. int32 channel_2_idle_rssi = 11; - //Optical module type.(0:unknown,1:gpon,2:xg-pon,3:xgs-pon,4:gpon-and-xgpon,5:gpon-and-xgspon,-1:invalid） + //Optical module type.(0:unknown,1:epon,2:10g-epon-s,3:10g-epon-a,-1:invalid) int32 module_type = 12; //Optical module subtype diff --git a/Collection Models/Traffic Collection/an-epon-pm-olt-traffic.proto b/Collection Models/Traffic Collection/an-epon-pm-olt-traffic.proto index 3dc17a0e4f7a83f79167413740ef3a682ac403f5..8dc0f31c1e6a998533715ca2a4e481e28cd2b0b3 100644 --- a/Collection Models/Traffic Collection/an-epon-pm-olt-traffic.proto +++ b/Collection Models/Traffic Collection/an-epon-pm-olt-traffic.proto @@ -47,6 +47,33 @@ message EponPmOltTraffics { //Peak receive rate of the EPON port in seconds.The unit is kbps. uint32 port_rx_peak_rate = 15; + + //The number of unicast frame bytes sent by the EPON port . + uint64 port_tx_unicast_bytes = 16; + + //The number of unicast frame bytes received by the EPON port. + uint64 port_rx_unicast_bytes = 17; + + //The number of multicast frame bytes sent by the EPON port. + uint64 port_tx_multicast_bytes = 18; + + //Average transmit unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_unicast_rate = 19; + + //Average receive unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_rx_unicast_rate = 20; + + //Average transmit multicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_multicast_rate = 21; + + //Peak transmit unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_peak_unicast_rate = 22; + + //Peak receive unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_rx_peak_unicast_rate = 23; + + //Peak transmit multicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_peak_multicast_rate = 24; } repeated EponPmOltTraffic pm_olt_traffic = 1; } @@ -99,6 +126,33 @@ message EponPmOltChannelTraffics { //Peak receive rate of the EPON port in seconds.The unit is kbps. uint32 port_rx_peak_rate = 16; + + //The number of unicast frame bytes sent by the EPON port . + uint64 port_tx_unicast_bytes = 17; + + //The number of unicast frame bytes received by the EPON port. + uint64 port_rx_unicast_bytes = 18; + + //The number of multicast frame bytes sent by the EPON port. + uint64 port_tx_multicast_bytes = 19; + + //Average transmit unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_unicast_rate = 20; + + //Average receive unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_rx_unicast_rate = 21; + + //Average transmit multicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_multicast_rate = 22; + + //Peak transmit unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_peak_unicast_rate = 23; + + //Peak receive unicast traffic rate of the EPON port.The unit is kbps. + uint32 port_rx_peak_unicast_rate = 24; + + //Peak transmit multicast traffic rate of the EPON port.The unit is kbps. + uint32 port_tx_peak_multicast_rate = 25; } repeated EponPmOltChannelTraffic pm_olt_channel_traffic =1; } diff --git a/Collection Models/Traffic Collection/an-ethernet-kpi.proto b/Collection Models/Traffic Collection/an-ethernet-kpi.proto index dec4a9ab6ac8c8dd640c41a8c31fc08db49b6d1f..194780ee67432dd4d030964f48f9133b1a6a4364 100644 --- a/Collection Models/Traffic Collection/an-ethernet-kpi.proto +++ b/Collection Models/Traffic Collection/an-ethernet-kpi.proto @@ -74,6 +74,33 @@ message EthernetPortKpiRecords { //Peak receive rate of the Ethernet port in seconds.The unit is kbps. uint64 port_rx_peak_rate = 24; + + //The number of unicast frame bytes sent by the Ethernet port . + uint64 port_tx_unicast_bytes = 25; + + //The number of unicast frame bytes received by the Ethernet port. + uint64 port_rx_unicast_bytes = 26; + + //The number of multicast frame bytes sent by the Ethernet port. + uint64 port_tx_multicast_bytes = 27; + + //Average transmit unicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_tx_unicast_rate = 28; + + //Average receive unicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_rx_unicast_rate = 29; + + //Average transmit multicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_tx_multicast_rate = 30; + + //Peak transmit unicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_tx_peak_unicast_rate = 31; + + //Peak receive unicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_rx_peak_unicast_rate = 32; + + //Peak transmit multicast traffic rate of the Ethernet port.The unit is kbps. + uint32 port_tx_peak_multicast_rate = 33; } repeated EthernetPortKpiRecord ethernet_port_kpi_record = 1; } diff --git a/Collection Models/Traffic Collection/an-gpon-pm-olt-traffic.proto b/Collection Models/Traffic Collection/an-gpon-pm-olt-traffic.proto index 3ca8fcd0367c24f9a1e69be80ef111e96ad54b47..a832c01e5ce352406a1515274b6bf52931154432 100644 --- a/Collection Models/Traffic Collection/an-gpon-pm-olt-traffic.proto +++ b/Collection Models/Traffic Collection/an-gpon-pm-olt-traffic.proto @@ -47,6 +47,33 @@ message GponPmOltTraffics { //Peak receive rate of the GPON port in seconds.The unit is kbps. uint32 port_rx_peak_rate = 15; + + //The number of unicast frame bytes sent by the GPON port . + uint64 port_tx_unicast_bytes = 16; + + //The number of unicast frame bytes received by the GPON port. + uint64 port_rx_unicast_bytes = 17; + + //The number of multicast frame bytes sent by the GPON port. + uint64 port_tx_multicast_bytes = 18; + + //Average transmit unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_unicast_rate = 19; + + //Average receive unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_rx_unicast_rate = 20; + + //Average transmit multicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_multicast_rate = 21; + + //Peak transmit unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_peak_unicast_rate = 22; + + //Peak receive unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_rx_peak_unicast_rate = 23; + + //Peak transmit multicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_peak_multicast_rate = 24; } repeated gponPmOltTraffic pm_olt_traffic = 1; @@ -100,6 +127,33 @@ message GponPmOltChannelTraffics { //Peak receive rate of the GPON port in seconds.The unit is kbps. uint32 port_rx_peak_rate = 16; + + //The number of unicast frame bytes sent by the GPON port . + uint64 port_tx_unicast_bytes = 17; + + //The number of unicast frame bytes received by the GPON port. + uint64 port_rx_unicast_bytes = 18; + + //The number of multicast frame bytes sent by the GPON port. + uint64 port_tx_multicast_bytes = 19; + + //Average transmit unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_unicast_rate = 20; + + //Average receive unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_rx_unicast_rate = 21; + + //Average transmit multicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_multicast_rate = 22; + + //Peak transmit unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_peak_unicast_rate = 23; + + //Peak receive unicast traffic rate of the GPON port.The unit is kbps. + uint32 port_rx_peak_unicast_rate = 24; + + //Peak transmit multicast traffic rate of the GPON port.The unit is kbps. + uint32 port_tx_peak_multicast_rate = 25; } repeated GponPmOltChannelTraffic pm_olt_channel_traffic =1; } diff --git a/Data Header Models/telemetry.proto b/Data Header Models/telemetry.proto new file mode 100644 index 0000000000000000000000000000000000000000..cd8c97adf012c5ca3fa2dfb2df553054b8ac79a4 --- /dev/null +++ b/Data Header Models/telemetry.proto @@ -0,0 +1,27 @@ +syntax = "proto3"; //proto v3. +package telemetry; //package name + +message Telemetry { //telemetry message structure definition. + string node_id_str = 1; //The hostname of the device is the unique identifier of the device in the network, which can be configured and modified by the user. It is encoded as 1 in GPB encoding. + string subscription_id_str = 2; //Subscription name, the subscription name when the subscription is statically configured + string sensor_path = 3; //Subscription path + uint64 collection_id = 4; //Identify sampling rounds + uint64 collection_start_time = 5; //Identify the start time of the sampling round + uint64 msg_timestamp = 6; //Timestamp when this message was generated + TelemetryGPBTable data_gpb = 7; //data carried. + uint64 collection_end_time = 8; //Identify the end time of the sampling round + uint32 current_period = 9; //Sampling accuracy, in milliseconds + string except_desc = 10; //Exception description information, which is used to report exception information when sampling exceptions. + string product_name = 11; //Product name. + Encoding encoding = 12; //Data encoding. + enum Encoding { + Encoding_GPB = 0; + }; +} +message TelemetryGPBTable { //TelemetryGPBTable message structure definition + repeated TelemetryRowGPB row = 1; //Array definition, the identification data is the repetition of the TelemetryRowGPB structure. +} +message TelemetryRowGPB { + uint64 timestamp = 1; //Timestamp at which the current instance was sampled. +bytes content = 11; //The sampled instance data carried is encoded as 11 in GPB encoding. It is necessary to combine the sensor_path field to determine which proto file will be encoded here. +} diff --git "a/GRPC\302\256 Protocol Models/grpc-dialin.proto" "b/GRPC\302\256 Protocol Models/grpc-dialin.proto" new file mode 100644 index 0000000000000000000000000000000000000000..3450933a17395684b661674a2488b8a2803b04c1 --- /dev/null +++ "b/GRPC\302\256 Protocol Models/grpc-dialin.proto" @@ -0,0 +1,77 @@ +syntax = "proto3"; +package dialin; + +service gRPCConfigOper { + rpc Subscribe(SubsArgs) returns(stream SubsReply) {}; + rpc Cancel(CancelArgs) returns(CancelReply) {}; +} + +message Path { + string path = 1; +} + +message SubsArgs { + uint64 request_id = 1; + uint32 encoding = 2; + + repeated Destination destination = 3; + + //Path to a section of operational state of interest (the sensor). + repeated Path path = 5; + + //The accuracy of the collected data reported by the device + //to the collector + uint64 sample_interval = 6; + + //Maximum time interval in seconds that may pass + //between updates from a device to a telemetry collector. + //If this interval expires, but there is no updated data to + //send (such as if suppress_updates has been configured), the + //device must send a telemetry message to the collector. + uint64 heartbeat_interval = 7; + + //Boolean flag to control suppression of redundant + //telemetry updates to the collector platform. If this flag is + //set to TRUE, then the collector will only send an update at + //the configured interval if a subscribed data value has + //changed. Otherwise, the device will not send an update to + //the collector until expiration of the heartbeat interval. + bool suppress_redundant = 8; + + //range "0..63" + //The dscp type represents a Differentiated Services Code Point + //that may be used for marking packets in a traffic stream. + //In the value set and its semantics, this type is equivalent + //to the Dscp textual convention of the SMIv2. + uint32 originated_qos_marking = 9; +} + +message Destination { + // IP address of the telemetry stream destination + string destination_address = 1; + + // Protocol (udp or tcp) port number for the telemetry + // stream destination + uint32 destination_port = 2; +} + +message SubsReply { + uint32 subscription_id = 1; + uint64 request_id = 2; + string response_code = 3; + + //containing the data described by the Telemetry message + //defined in hw_telemetry.proto + bytes message = 4; +} + +message CancelArgs { + uint64 request_id = 1; + uint32 subscription_id = 2; +} + +message CancelReply { + uint64 request_id = 1; + string response_code = 2; + string message = 3; +} diff --git "a/GRPC\302\256 Protocol Models/grpc-dialout.proto" "b/GRPC\302\256 Protocol Models/grpc-dialout.proto" new file mode 100644 index 0000000000000000000000000000000000000000..d5bb503e243eb4a3536e0218abd41863b5179fcb --- /dev/null +++ "b/GRPC\302\256 Protocol Models/grpc-dialout.proto" @@ -0,0 +1,12 @@ +syntax = "proto3"; +package dialout; + +service gRPCDataservice { + rpc dataPublish(stream serviceArgs) returns(stream serviceArgs) {}; +} + +message serviceArgs { + int64 ReqId = 1; + bytes data = 2; + string errors = 3; +}