From ba7b262323ed6d31ccfb6791296ea27da20b77ab Mon Sep 17 00:00:00 2001 From: Orne Brocaar Date: Wed, 14 Jun 2023 13:07:09 +0100 Subject: [PATCH] Change enabled_class > class_enabled for consistency. --- api/proto/api/device.proto | 4 ++-- api/proto/integration/integration.proto | 2 +- api/rust/proto/chirpstack/api/device.proto | 4 ++-- api/rust/proto/chirpstack/integration/integration.proto | 2 +- chirpstack/src/api/device.rs | 2 +- chirpstack/src/downlink/data.rs | 2 +- chirpstack/src/downlink/tx_ack.rs | 6 +++--- chirpstack/src/maccommand/dev_status.rs | 2 +- chirpstack/src/maccommand/notify_new_end_device.rs | 4 ++-- chirpstack/src/uplink/data.rs | 4 ++-- chirpstack/src/uplink/join.rs | 2 +- chirpstack/src/uplink/join_sns.rs | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/api/proto/api/device.proto b/api/proto/api/device.proto index 6b0eb1ec..bdd8796f 100644 --- a/api/proto/api/device.proto +++ b/api/proto/api/device.proto @@ -290,8 +290,8 @@ message GetDeviceResponse { // Device status. DeviceStatus device_status = 5; - // Enabled class. - common.DeviceClass enabled_class = 6; + // Enabled device class. + common.DeviceClass class_enabled = 6; } message UpdateDeviceRequest { diff --git a/api/proto/integration/integration.proto b/api/proto/integration/integration.proto index 1e91e18f..93ddc020 100644 --- a/api/proto/integration/integration.proto +++ b/api/proto/integration/integration.proto @@ -84,7 +84,7 @@ message DeviceInfo { string dev_eui = 8; // Device class. - common.DeviceClass device_enabled_class = 10; + common.DeviceClass device_class_enabled = 10; // Device-profile and device tags. map tags = 9; diff --git a/api/rust/proto/chirpstack/api/device.proto b/api/rust/proto/chirpstack/api/device.proto index 6b0eb1ec..bdd8796f 100644 --- a/api/rust/proto/chirpstack/api/device.proto +++ b/api/rust/proto/chirpstack/api/device.proto @@ -290,8 +290,8 @@ message GetDeviceResponse { // Device status. DeviceStatus device_status = 5; - // Enabled class. - common.DeviceClass enabled_class = 6; + // Enabled device class. + common.DeviceClass class_enabled = 6; } message UpdateDeviceRequest { diff --git a/api/rust/proto/chirpstack/integration/integration.proto b/api/rust/proto/chirpstack/integration/integration.proto index 1e91e18f..93ddc020 100644 --- a/api/rust/proto/chirpstack/integration/integration.proto +++ b/api/rust/proto/chirpstack/integration/integration.proto @@ -84,7 +84,7 @@ message DeviceInfo { string dev_eui = 8; // Device class. - common.DeviceClass device_enabled_class = 10; + common.DeviceClass device_class_enabled = 10; // Device-profile and device tags. map tags = 9; diff --git a/chirpstack/src/api/device.rs b/chirpstack/src/api/device.rs index 1eb8f996..d890ba3f 100644 --- a/chirpstack/src/api/device.rs +++ b/chirpstack/src/api/device.rs @@ -132,7 +132,7 @@ impl DeviceService for Device { }), false => None, }, - enabled_class: d.enabled_class.to_proto().into(), + class_enabled: d.enabled_class.to_proto().into(), }); resp.metadata_mut() .insert("x-log-dev_eui", req.dev_eui.parse().unwrap()); diff --git a/chirpstack/src/downlink/data.rs b/chirpstack/src/downlink/data.rs index 8f816382..5310ebd2 100644 --- a/chirpstack/src/downlink/data.rs +++ b/chirpstack/src/downlink/data.rs @@ -431,7 +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(), + device_class_enabled: self.device.enabled_class.to_proto().into(), dev_eui: self.device.dev_eui.to_string(), tags: { let mut tags = (*self.device_profile.tags).clone(); diff --git a/chirpstack/src/downlink/tx_ack.rs b/chirpstack/src/downlink/tx_ack.rs index ed7eca8f..30439c75 100644 --- a/chirpstack/src/downlink/tx_ack.rs +++ b/chirpstack/src/downlink/tx_ack.rs @@ -454,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }), @@ -503,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }), @@ -552,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }), diff --git a/chirpstack/src/maccommand/dev_status.rs b/chirpstack/src/maccommand/dev_status.rs index feb3bc21..644a5016 100644 --- a/chirpstack/src/maccommand/dev_status.rs +++ b/chirpstack/src/maccommand/dev_status.rs @@ -63,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }), diff --git a/chirpstack/src/maccommand/notify_new_end_device.rs b/chirpstack/src/maccommand/notify_new_end_device.rs index ab0780cd..23515d46 100644 --- a/chirpstack/src/maccommand/notify_new_end_device.rs +++ b/chirpstack/src/maccommand/notify_new_end_device.rs @@ -33,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags: { let mut tags = (*dp.tags).clone(); @@ -152,7 +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(), + device_class_enabled: common::DeviceClass::ClassA.into(), dev_eui: dev.dev_eui.to_string(), tags: [ ("dp_tag".to_string(), "dp_value".to_string()), diff --git a/chirpstack/src/uplink/data.rs b/chirpstack/src/uplink/data.rs index 1d6f595f..283b4182 100644 --- a/chirpstack/src/uplink/data.rs +++ b/chirpstack/src/uplink/data.rs @@ -400,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }); @@ -1153,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }), diff --git a/chirpstack/src/uplink/join.rs b/chirpstack/src/uplink/join.rs index a3111b97..3a382e22 100644 --- a/chirpstack/src/uplink/join.rs +++ b/chirpstack/src/uplink/join.rs @@ -317,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, }); diff --git a/chirpstack/src/uplink/join_sns.rs b/chirpstack/src/uplink/join_sns.rs index 162ded4b..61cef44b 100644 --- a/chirpstack/src/uplink/join_sns.rs +++ b/chirpstack/src/uplink/join_sns.rs @@ -185,7 +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(), + device_class_enabled: dev.enabled_class.to_proto().into(), dev_eui: dev.dev_eui.to_string(), tags, });