Digital Twin Graph

eclipse-ibeji · May 8, 2024 · 0b5b675 · 0b5b675
1 parent 07d51b2
commit 0b5b675
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/core/module/digital_twin_graph/src/digital_twin_graph_impl.rs b/core/module/digital_twin_graph/src/digital_twin_graph_impl.rs
@@ -86,15 +86,14 @@ impl DigitalTwinGraphImpl {
             let mut client =
                 DigitalTwinRegistryClient::connect(self.digital_twin_registry_uri.to_string())
                     .await
-                    .map_err(|error| format!("{error}"))?;
+                    .map_err(|error| tonic::Status::internal(format!("{error}")))?;
 
             let request =
                 tonic::Request::new(FindByModelIdRequest { model_id: model_id.to_string() });
 
-            client.find_by_model_id(request).await.map_err(|error| error.to_string())
+            client.find_by_model_id(request).await
         })
-        .await
-        .map_err(tonic::Status::internal)?
+        .await?
         .into_inner();
 
         Ok(response
@@ -129,16 +128,15 @@ impl DigitalTwinGraphImpl {
             let mut client =
                 DigitalTwinRegistryClient::connect(self.digital_twin_registry_uri.to_string())
                     .await
-                    .map_err(|error| format!("{error}"))?;
+                    .map_err(|error| tonic::Status::internal(format!("{error}")))?;
 
             let request = tonic::Request::new(FindByInstanceIdRequest {
                 instance_id: instance_id.to_string(),
             });
 
-            client.find_by_instance_id(request).await.map_err(|error| error.to_string())
+            client.find_by_instance_id(request).await
         })
-        .await
-        .map_err(tonic::Status::internal)?
+        .await?
         .into_inner();
 
         Ok(response

diff --git a/digital-twin-model/src/sdv_v1.rs b/digital-twin-model/src/sdv_v1.rs
@@ -167,6 +167,7 @@ pub mod basic_airbag_seat_massager {
             value = "crate::sdv_v1::basic_airbag_seat_massager::ID.to_string()"
         ))]
         pub model_id: String,
+        pub sequence_names: crate::sdv_v1::seat_massager::sequence_names::TYPE,
     }
 }
 
@@ -399,6 +400,7 @@ pub mod premium_airbag_seat_massager {
             value = "crate::sdv_v1::premium_airbag_seat_massager::ID.to_string()"
         ))]
         pub model_id: String,
+        pub sequence_names: crate::sdv_v1::seat_massager::sequence_names::TYPE,
     }
 }
 
@@ -459,7 +461,7 @@ pub mod seat_massager {
                 value = "crate::sdv_v1::seat_massager::sequence_names::ID.to_string()"
             ))]
             pub model_id: String,
-            pub sequence_names: Vec<String>,
+            pub value: Vec<String>,
         }
     }
 

diff --git a/samples/digital_twin_graph/seat_massager_provider/src/main.rs b/samples/digital_twin_graph/seat_massager_provider/src/main.rs
@@ -58,6 +58,10 @@ fn create_provider_state() -> ProviderState {
     let front_left_airbag_seat_massager: sdv::premium_airbag_seat_massager::TYPE =
         sdv::premium_airbag_seat_massager::TYPE {
             instance_id: front_left_airbag_seat_massager_instance_id.clone(),
+            sequence_names: sdv::seat_massager::sequence_names::TYPE {
+                value: Vec::<String>::new(),
+                ..Default::default()
+            },
             ..Default::default()
         };
 
@@ -66,13 +70,21 @@ fn create_provider_state() -> ProviderState {
     let front_right_airbag_seat_massager: sdv::premium_airbag_seat_massager::TYPE =
         sdv::premium_airbag_seat_massager::TYPE {
             instance_id: front_right_airbag_seat_massager_instance_id.clone(),
+            sequence_names: sdv::seat_massager::sequence_names::TYPE {
+                value: Vec::<String>::new(),
+                ..Default::default()
+            },
             ..Default::default()
         };
 
     let back_left_airbag_seat_massager_instance_id = "back_left_airbag_seat_massager".to_string();
     let back_left_airbag_seat_massager: sdv::basic_airbag_seat_massager::TYPE =
         sdv::basic_airbag_seat_massager::TYPE {
             instance_id: back_left_airbag_seat_massager_instance_id.clone(),
+            sequence_names: sdv::seat_massager::sequence_names::TYPE {
+                value: Vec::<String>::new(),
+                ..Default::default()
+            },
             ..Default::default()
         };
 
@@ -81,13 +93,21 @@ fn create_provider_state() -> ProviderState {
     let back_center_airbag_seat_massager: sdv::basic_airbag_seat_massager::TYPE =
         sdv::basic_airbag_seat_massager::TYPE {
             instance_id: back_center_airbag_seat_massager_instance_id.clone(),
+            sequence_names: sdv::seat_massager::sequence_names::TYPE {
+                value: Vec::<String>::new(),
+                ..Default::default()
+            },
             ..Default::default()
         };
 
     let back_right_airbag_seat_massager_instance_id = "back_right_airbag_seat_massager".to_string();
     let back_right_airbag_seat_massager: sdv::basic_airbag_seat_massager::TYPE =
         sdv::basic_airbag_seat_massager::TYPE {
             instance_id: back_right_airbag_seat_massager_instance_id.clone(),
+            sequence_names: sdv::seat_massager::sequence_names::TYPE {
+                value: Vec::<String>::new(),
+                ..Default::default()
+            },
             ..Default::default()
         };