3.2.1 to main (#935)

* Making test config field optional. (#928)

* backport: model_number from DeviceInfo (#932) (#933)

* backport: model_number from DeviceInfo

Co-authored-by: Brendan O'Bra <brendan@obrafamily.org>

---------

Co-authored-by: Maggie Choy <maggie98choy@yahoo.com>
Co-authored-by: Vinod Sathyaseelan <Vinod_sathyaseelan@comcast.com>
Co-authored-by: Brendan O'Bra <brendan@obrafamily.org>

Author: 4 people

.github/workflows/Build.yml

@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main", "3.1.rc" ]
+    branches: [ "main", "3.2.rc" ]
 
 env:
   CARGO_TERM_COLOR: always

core/sdk/src/api/manifest/ripple_manifest_loader.rs

@@ -38,12 +38,13 @@ pub struct RippleManifestConfig {
 }
 
 #[derive(Clone, Debug, Deserialize, Default)]
+#[serde(default)]
 struct DefaultManifestConfig {
     device: String,
     extn: String,
     tag: Option<String>,
-    test_device: String,
-    test_extn: String,
+    test_device: Option<String>,
+    test_extn: Option<String>,
 }
 
 #[derive(Clone, Debug, Deserialize, Default)]
@@ -354,13 +355,17 @@ impl RippleConfigLoader {
         };
 
         let test_path = if is_extn {
-            self.manifest_config.default.test_extn.as_str()
+            self.manifest_config.default.test_extn.as_deref()
         } else {
-            self.manifest_config.default.test_device.as_str()
+            self.manifest_config.default.test_device.as_deref()
         };
 
-        let test_path_resolved = if !test_path.is_empty() {
-            Some(self.resolve_path(test_path))
+        let test_path_resolved = if let Some(path) = test_path {
+            if !path.is_empty() {
+                Some(self.resolve_path(path))
+            } else {
+                None
+            }
         } else {
             None
         };

device/thunder_ripple_sdk/src/processors/thunder_device_info.rs

@@ -273,18 +273,19 @@ impl ThunderDeviceInfoRequestProcessor {
         let resp = state
             .get_thunder_client()
             .call(DeviceCallRequest {
-                method: ThunderPlugin::System.method("getSystemVersions"),
+                method: ThunderPlugin::System.method("getDeviceInfo"),
                 params: None,
             })
             .await;
         info!("{}", resp.message);
-        let resp = resp.message.get("stbVersion");
-        if resp.is_none() {
-            return "NA".to_owned();
-        }
-        let resp = resp.unwrap().as_str().unwrap().trim_matches('"');
-        let split_string: Vec<&str> = resp.split('_').collect();
-        String::from(split_string[0])
+
+        let model_number = resp
+            .message
+            .get("model_number")
+            .and_then(|v| v.as_str())
+            .unwrap_or("NA");
+
+        model_number.to_owned()
     }
 
     async fn get_model(state: &CachedState) -> String {