Add enabled class to DeviceInfo in events.

api/proto/api/device.proto

@@ -167,17 +167,6 @@ service DeviceService {
   }
 }
 
-enum DeviceClass {
-  // Class-A.
-  A = 0;
-
-  // Class-B.
-  B = 1;
-
-  // Class-C.
-  C = 2;
-}
-
 message Device {
   // DevEUI (EUI64).
   string dev_eui = 1;
@@ -302,7 +291,7 @@ message GetDeviceResponse {
   DeviceStatus device_status = 5;
 
   // Enabled class.
-  DeviceClass enabled_class = 6;
+  common.DeviceClass enabled_class = 6;
 }
 
 message UpdateDeviceRequest {

api/proto/common/common.proto

@@ -144,7 +144,8 @@ enum Aggregation {
 }
 
 enum MetricKind {
-    // Incrementing counters that never decrease (these are not reset on each reading).
+  // Incrementing counters that never decrease (these are not reset on each
+  // reading).
   COUNTER = 0;
 
   // Counters that do get reset upon reading.
@@ -201,3 +202,14 @@ message MetricDataset {
   // Each value index corresponds with the same timestamp index of the Metric.
   repeated float data = 2;
 }
+
+enum DeviceClass {
+  // Class-A.
+  CLASS_A = 0;
+
+  // Class-B.
+  CLASS_B = 1;
+
+  // Class-C.
+  CLASS_C = 2;
+}

api/proto/integration/integration.proto

@@ -83,6 +83,9 @@ message DeviceInfo {
   // Device EUI.
   string dev_eui = 8;
 
+  // Device class.
+  common.DeviceClass device_enabled_class = 10;
+
   // Device-profile and device tags.
   map<string, string> tags = 9;
 }

api/rust/proto/chirpstack/api/device.proto

@@ -167,17 +167,6 @@ service DeviceService {
   }
 }
 
-enum DeviceClass {
-  // Class-A.
-  A = 0;
-
-  // Class-B.
-  B = 1;
-
-  // Class-C.
-  C = 2;
-}
-
 message Device {
   // DevEUI (EUI64).
   string dev_eui = 1;
@@ -302,7 +291,7 @@ message GetDeviceResponse {
   DeviceStatus device_status = 5;
 
   // Enabled class.
-  DeviceClass enabled_class = 6;
+  common.DeviceClass enabled_class = 6;
 }
 
 message UpdateDeviceRequest {

api/rust/proto/chirpstack/common/common.proto

@@ -144,7 +144,8 @@ enum Aggregation {
 }
 
 enum MetricKind {
-    // Incrementing counters that never decrease (these are not reset on each reading).
+  // Incrementing counters that never decrease (these are not reset on each
+  // reading).
   COUNTER = 0;
 
   // Counters that do get reset upon reading.
@@ -201,3 +202,14 @@ message MetricDataset {
   // Each value index corresponds with the same timestamp index of the Metric.
   repeated float data = 2;
 }
+
+enum DeviceClass {
+  // Class-A.
+  CLASS_A = 0;
+
+  // Class-B.
+  CLASS_B = 1;
+
+  // Class-C.
+  CLASS_C = 2;
+}

api/rust/proto/chirpstack/integration/integration.proto

@@ -83,6 +83,9 @@ message DeviceInfo {
   // Device EUI.
   string dev_eui = 8;
 
+  // Device class.
+  common.DeviceClass device_enabled_class = 10;
+
   // Device-profile and device tags.
   map<string, string> tags = 9;
 }

chirpstack/src/api/helpers.rs

@@ -249,12 +249,12 @@ impl FromProto<lrwn::RelayModeActivation> for api::RelayModeActivation {
     }
 }
 
-impl ToProto<api::DeviceClass> for DeviceClass {
-    fn to_proto(self) -> api::DeviceClass {
+impl ToProto<common::DeviceClass> for DeviceClass {
+    fn to_proto(self) -> common::DeviceClass {
         match self {
-            DeviceClass::A => api::DeviceClass::A,
-            DeviceClass::B => api::DeviceClass::B,
-            DeviceClass::C => api::DeviceClass::C,
+            DeviceClass::A => common::DeviceClass::ClassA,
+            DeviceClass::B => common::DeviceClass::ClassB,
+            DeviceClass::C => common::DeviceClass::ClassC,
         }
     }
 }

chirpstack/src/downlink/data.rs

@@ -8,7 +8,7 @@ use rand::Rng;
 use tracing::{error, span, trace, warn, Instrument, Level};
 
 use crate::api::backend::get_async_receiver;
-use crate::api::helpers::FromProto;
+use crate::api::helpers::{FromProto, ToProto};
 use crate::backend::roaming;
 use crate::downlink::{classb, helpers, tx_ack};
 use crate::gpstime::{ToDateTime, ToGpsTime};
@@ -431,6 +431,7 @@ impl Data {
                 device_profile_id: self.device_profile.id.to_string(),
                 device_profile_name: self.device_profile.name.clone(),
                 device_name: self.device.name.clone(),
+                device_enabled_class: self.device.enabled_class.to_proto().into(),
                 dev_eui: self.device.dev_eui.to_string(),
                 tags: {
                     let mut tags = (*self.device_profile.tags).clone();

chirpstack/src/downlink/tx_ack.rs

@@ -454,6 +454,7 @@ impl TxAck {
                 device_profile_id: dp.id.to_string(),
                 device_profile_name: dp.name.clone(),
                 device_name: dev.name.clone(),
+                device_enabled_class: dev.enabled_class.to_proto().into(),
                 dev_eui: dev.dev_eui.to_string(),
                 tags,
             }),
@@ -502,6 +503,7 @@ impl TxAck {
                 device_profile_id: dp.id.to_string(),
                 device_profile_name: dp.name.clone(),
                 device_name: dev.name.clone(),
+                device_enabled_class: dev.enabled_class.to_proto().into(),
                 dev_eui: dev.dev_eui.to_string(),
                 tags,
             }),
@@ -550,6 +552,7 @@ impl TxAck {
                 device_profile_id: dp.id.to_string(),
                 device_profile_name: dp.name.clone(),
                 device_name: dev.name.clone(),
+                device_enabled_class: dev.enabled_class.to_proto().into(),
                 dev_eui: dev.dev_eui.to_string(),
                 tags,
             }),

chirpstack/src/maccommand/dev_status.rs

@@ -3,6 +3,7 @@ use bigdecimal::BigDecimal;
 use chrono::{DateTime, Utc};
 use tracing::info;
 
+use crate::api::helpers::ToProto;
 use crate::integration;
 use crate::storage::{application, device, device_profile, tenant};
 use crate::uplink::{helpers, UplinkFrameSet};
@@ -62,6 +63,7 @@ pub async fn handle(
                     device_profile_id: dp.id.to_string(),
                     device_profile_name: dp.name.clone(),
                     device_name: dev.name.clone(),
+                    device_enabled_class: dev.enabled_class.to_proto().into(),
                     dev_eui: dev.dev_eui.to_string(),
                     tags,
                 }),

chirpstack/src/maccommand/notify_new_end_device.rs

@@ -2,6 +2,7 @@ use anyhow::Result;
 use chrono::Utc;
 use tracing::info;
 
+use crate::api::helpers::ToProto;
 use crate::integration;
 use crate::storage::{application, device, device_profile, tenant};
 use chirpstack_api::integration as integration_pb;
@@ -32,6 +33,7 @@ pub async fn handle(
         device_profile_id: dp.id.to_string(),
         device_profile_name: dp.name.clone(),
         device_name: dev.name.clone(),
+        device_enabled_class: dev.enabled_class.to_proto().into(),
         dev_eui: dev.dev_eui.to_string(),
         tags: {
             let mut tags = (*dp.tags).clone();
@@ -74,6 +76,8 @@ mod test {
     use tokio::time::sleep;
     use uuid::Uuid;
 
+    use chirpstack_api::common;
+
     use crate::storage::fields;
     use crate::test;
 
@@ -148,6 +152,7 @@ mod test {
                     device_profile_id: dp.id.to_string(),
                     device_profile_name: "dp".to_string(),
                     device_name: "dev".to_string(),
+                    device_enabled_class: common::DeviceClass::ClassA.into(),
                     dev_eui: dev.dev_eui.to_string(),
                     tags: [
                         ("dp_tag".to_string(), "dp_value".to_string()),

chirpstack/src/uplink/data.rs

@@ -400,6 +400,7 @@ impl Data {
             device_profile_id: dp.id.to_string(),
             device_profile_name: dp.name.clone(),
             device_name: dev.name.clone(),
+            device_enabled_class: dev.enabled_class.to_proto().into(),
             dev_eui: dev.dev_eui.to_string(),
             tags,
         });
@@ -1152,6 +1153,7 @@ impl Data {
                     device_profile_id: dp.id.to_string(),
                     device_profile_name: dp.name.clone(),
                     device_name: dev.name.clone(),
+                    device_enabled_class: dev.enabled_class.to_proto().into(),
                     dev_eui: dev.dev_eui.to_string(),
                     tags,
                 }),

chirpstack/src/uplink/join.rs

@@ -16,7 +16,8 @@ use super::{
     filter_rx_info_by_region_config_id, filter_rx_info_by_tenant_id, helpers, RelayContext,
     UplinkFrameSet,
 };
-use crate::api::backend::get_async_receiver;
+
+use crate::api::{backend::get_async_receiver, helpers::ToProto};
 use crate::backend::{joinserver, keywrap, roaming};
 use crate::storage::device_session;
 use crate::storage::{
@@ -316,6 +317,7 @@ impl JoinRequest {
             device_profile_id: dp.id.to_string(),
             device_profile_name: dp.name.clone(),
             device_name: dev.name.clone(),
+            device_enabled_class: dev.enabled_class.to_proto().into(),
             dev_eui: dev.dev_eui.to_string(),
             tags,
         });

chirpstack/src/uplink/join_sns.rs

@@ -5,6 +5,7 @@ use chrono::{DateTime, Local, Utc};
 use tracing::{span, trace, Instrument, Level};
 
 use super::{helpers, UplinkFrameSet};
+use crate::api::helpers::ToProto;
 use crate::backend::{joinserver, keywrap, roaming};
 use crate::storage::{
     application,
@@ -184,6 +185,7 @@ impl JoinRequest {
             device_profile_id: dp.id.to_string(),
             device_profile_name: dp.name.clone(),
             device_name: dev.name.clone(),
+            device_enabled_class: dev.enabled_class.to_proto().into(),
             dev_eui: dev.dev_eui.to_string(),
             tags,
         });