Skip to content
This repository has been archived by the owner on Dec 18, 2024. It is now read-only.

Commit

Permalink
Remove dummy VSS signals, adding some databroker version to VSS tree …
Browse files Browse the repository at this point in the history 
…instead

Signed-off-by: Sebastian Schildt <[email protected]>
  • Loading branch information
@SebastianSchildt
SebastianSchildt committed Sep 29, 2023
1 parent aa9df3d commit f716273
Showing 1 changed file with 79 additions and 133 deletions.
212 changes: 79 additions & 133 deletions kuksa_databroker/databroker/src/main.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,86 +31,6 @@ use clap::{Arg, ArgAction, Command};

use databroker::{broker, grpc, permissions, vss};

// Hardcoded datapoints
const DATAPOINTS: &[(
&str,
broker::DataType,
broker::ChangeType,
broker::EntryType,
&str,
)] = &[
(
"Vehicle.Cabin.Seat.Row1.Pos1.Position",
broker::DataType::Uint32,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Vehicle cabin seat position. Row 1 Position 1",
),
(
"Vehicle.Cabin.Seat.Row1.Pos2.Position",
broker::DataType::Uint32,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Vehicle cabin seat position. Row 1 Position 2",
),
(
"Vehicle.Speed",
broker::DataType::Float,
broker::ChangeType::Continuous,
broker::EntryType::Sensor,
"Vehicle speed",
),
(
"Vehicle.ADAS.ABS.Error",
broker::DataType::String,
broker::ChangeType::OnChange,
broker::EntryType::Attribute,
"ADAS ABS error message",
),
(
"Vehicle.ADAS.ABS.IsActive",
broker::DataType::Bool,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Whether ADAS ABS is active",
),
(
"Vehicle.ADAS.ABS.IsEngaged",
broker::DataType::Bool,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Whether ADAS ABS is engaged",
),
(
"Vehicle.ADAS.CruiseControl.Error",
broker::DataType::String,
broker::ChangeType::OnChange,
broker::EntryType::Attribute,
"ADAS Cruise control error message",
),
(
"Vehicle.ADAS.CruiseControl.IsActive",
broker::DataType::Bool,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Whether ADAS Cruise control is active",
),
(
"Vehicle.ADAS.CruiseControl.SpeedSet",
broker::DataType::Bool,
broker::ChangeType::OnChange,
broker::EntryType::Actuator,
"Whether ADAS Cruise control has the speed set",
),
(
"Vehicle.TestArray",
broker::DataType::StringArray,
broker::ChangeType::OnChange,
broker::EntryType::Sensor,
"Run of the mill test array",
),
];

async fn shutdown_handler() {
let mut sigint =
signal(SignalKind::interrupt()).expect("failed to setup SIGINT signal handler");
Expand All @@ -125,6 +45,60 @@ async fn shutdown_handler() {
};
}

async fn add_kuksa_attribute(
database: &broker::AuthorizedAccess<'_, '_>,
attribute: String,
value: String,
description: String,
) {
debug!("Adding attribute {}", attribute);

match database
.add_entry(
attribute.clone(),
databroker::broker::DataType::String,
databroker::broker::ChangeType::OnChange,
databroker::broker::EntryType::Attribute,
description,
None,
)
.await
{
Ok(id) => {
let ids = [(
id,
broker::EntryUpdate {
datapoint: Some(broker::Datapoint {
ts: std::time::SystemTime::now(),
value: broker::types::DataValue::String(value),
}),
path: None,
actuator_target: None,
entry_type: None,
data_type: None,
description: None,
allowed: None,
},
)];
if let Err(errors) = database.update_entries(ids).await {
// There's only one error (since we're only trying to set one)
if let Some(error) = errors.get(0) {
info!("Failed to set value for {}: {:?}", attribute, error.1);
}
}
}
Err(RegistrationError::PermissionDenied) => {
error!("Failed to add entry {attribute}: Permission denied")
}
Err(RegistrationError::PermissionExpired) => {
error!("Failed to add entry {attribute}: Permission expired")
}
Err(RegistrationError::ValidationError) => {
error!("Failed to add entry {attribute}: Validation failed")
}
}
}

async fn read_metadata_file<'a, 'b>(
database: &broker::AuthorizedAccess<'_, '_>,
filename: &str,
Expand Down Expand Up @@ -264,14 +238,6 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
.long("disable-authorization")
.help("Disable authorization")
.action(ArgAction::SetTrue),
)
.arg(
Arg::new("dummy-metadata")
.display_order(10)
.long("dummy-metadata")
.action(ArgAction::SetTrue)
.help("Populate data broker with dummy metadata")
.required(false),
);

#[cfg(feature = "tls")]
Expand Down Expand Up @@ -320,51 +286,31 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
let broker = broker::DataBroker::new(version);
let database = broker.authorized_access(&permissions::ALLOW_ALL);

if args.contains_id("dummy-metadata") {
info!("Populating (hardcoded) metadata");
for (name, data_type, change_type, entry_type, description) in DATAPOINTS {
if let Ok(id) = database
.add_entry(
name.to_string(),
data_type.clone(),
change_type.clone(),
entry_type.clone(),
description.to_string(),
None,
)
.await
{
if name == &"Vehicle.TestArray" {
match database
.update_entries([(
id,
broker::EntryUpdate {
path: None,
datapoint: Some(broker::Datapoint {
ts: std::time::SystemTime::now(),
value: databroker::broker::DataValue::StringArray(vec![
String::from("yes"),
String::from("no"),
String::from("maybe"),
String::from("nah"),
]),
}),
actuator_target: None,
entry_type: None,
data_type: None,
description: None,
allowed: None,
},
)])
.await
{
Ok(_) => {}
Err(e) => println!("{e:?}"),
}
}
}
}
}
add_kuksa_attribute(
&database,
"Kuksa.Databroker.GitVersion".to_owned(),
option_env!("VERGEN_GIT_SEMVER_LIGHTWEIGHT")
.unwrap_or("N/A")
.to_owned(),
"Databroker version as reported by GIT".to_owned(),
)
.await;

add_kuksa_attribute(
&database,
"Kuksa.Databroker.CargoVersion".to_owned(),
option_env!("CARGO_PKG_VERSION").unwrap_or("N/A").to_owned(),
"Databroker version as reported by GIT".to_owned(),
)
.await;

add_kuksa_attribute(
&database,
"Kuksa.Databroker.CommitSha".to_owned(),
option_env!("VERGEN_GIT_SHA").unwrap_or("N/A").to_owned(),
"Commit SHA of current version".to_owned(),
)
.await;

if let Some(metadata_filenames) = args.get_many::<String>("vss-file") {
for filename in metadata_filenames {
Expand Down

0 comments on commit f716273

Please sign in to comment.