Added fallback mode if streaming install fails

Author: OleksandrChaika

Diff for: src/FSM/States/Installing.cpp

@@ -63,8 +63,18 @@ namespace sua {
 
         const auto lastError = ctx.installerAgent->getLastError();
         Logger::error("Installation failed: {}", lastError);
-        send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installFailed", lastError);
-        return FotaEvent::InstallFailed;
+
+        // for download mode transit to fail state
+        if (true == ctx.downloadMode) {
+            send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installFailed", lastError);
+            return FotaEvent::InstallFailed;
+        }
+
+        // for stream mode start again in download mode
+        Logger::info("Trying normal download mode as fallback");
+        send(ctx, IMqttProcessor::TOPIC_FEEDBACK, "installFailedFallback", lastError);
+        ctx.downloadMode = true;
+        return FotaEvent::InstallFailedFallback;
     }
 
 } // namespace sua

Diff for: src/FotaEvent.cpp

@@ -36,7 +36,8 @@ namespace sua {
             { DownloadFailed            , "DownloadFailed"            },
             { InstallStart              , "InstallStart"              },
             { InstallCompleted          , "InstallCompleted"          },
-            { InstallFailed             , "InstallFailed"             }
+            { InstallFailed             , "InstallFailed"             },
+            { InstallFailedFallback     , "InstallFailedFallback"     }
         };
         // clang-format on
 

Diff for: src/FotaEvent.h

@@ -35,6 +35,7 @@ namespace sua {
         InstallStart,
         InstallCompleted,
         InstallFailed,
+        InstallFailedFallback,
         NotUsed,
     };
 

Diff for: src/Mqtt/MqttMessagingProtocolJSON.cpp

@@ -209,6 +209,13 @@ namespace sua {
                 message, ctx.desiredState.installProgressPercentage);
         }
 
+        if(name == "installFailedFallback") {
+            return writeFeedbackWithPayload(ctx.desiredState,
+                "RUNNING", "Self-update agent is performing an OS image update.",
+                "UPDATING", "Install in streaming mode failed, trying in download mode.",
+                message, 0);
+        }
+
         if(name == "currentState") {
             return "";
         }

Diff for: src/Mqtt/MqttMessagingProtocolYAML.cpp

@@ -178,6 +178,14 @@ namespace sua {
             return serialized(base(ctx.desiredState, state));
         }
 
+        if(name == "installFailedFallback") {
+            std::map<std::string, std::string> state;
+            state["state/name"    ] = "failed";
+            state["state/message" ] = "Stream install failed, trying download mode";
+            state["state/techCode"] = "3001";
+            return serialized(base(ctx.desiredState, state));
+        }
+
         if(name == "rejected") {
             std::map<std::string, std::string> state;
             state["state/name"    ] = "failed";

Diff for: src/SelfUpdateAgent.cpp

@@ -68,6 +68,7 @@ namespace sua {
             { FotaEvent::ConnectivityLost       , "Installing"      , "Uninitialized"   },
             { FotaEvent::InstallStart           , "Installing"      , "Installed"        , FotaEvent::InstallCompleted          },
             { FotaEvent::InstallStart           , "Installing"      , "Failed"           , FotaEvent::InstallFailed             },
+            { FotaEvent::InstallStart           , "Installing"      , "Downloading"      , FotaEvent::InstallFailedFallback     },
             // from "Installed"
             { FotaEvent::ConnectivityLost       , "Installed"       , "Uninitialized"   },
             { FotaEvent::Waiting                , "Installed"       , "Idle"            },

Diff for: src/main.cpp

@@ -196,6 +196,7 @@ int main(int argc, char* argv[])
         downloadMode = false;
     } else {
         installerAgent = std::make_shared<sua::DummyRaucInstaller>();
+        downloadMode = true;
     }
 
     // Depending on testing scenario, localhost or ip address of mosquitto container shall be used.

Diff for: utest/TestMqttMessagingProtocolJSON.cpp

@@ -721,6 +721,41 @@ namespace {
         EXPECT_EQ_MULTILINE(result, expected);
     }
 
+    TEST_F(TestMessagingProtocolJSON, createMessage_installFailedFallback)
+    {
+        d.installProgressPercentage = 66;
+
+        const std::string result = ProtocolJSON().createMessage(ctx, "installFailedFallback");
+
+        // clang-format off
+        const std::string expected = R"(
+            {
+                "activityId": "id",
+                "timestamp": 42,
+                "payload": {
+                    "status": "RUNNING",
+                    "message": "Self-update agent is performing an OS image update.",
+                    "actions": [
+                        {
+                            "component": {
+                                "id": "self-update:os-image",
+                                "version": "1.0"
+                            },
+                            "status": "UPDATING",
+                            "progress": 0,
+                            "message": "Install in streaming mode failed, trying in download mode."
+                        }
+                    ]
+                }
+            }
+        )";
+        // clang-format on
+
+        EXPECT_NO_THROW(validateJsonSyntax(expected));
+        EXPECT_NO_THROW(validateJsonSyntax(result));
+        EXPECT_EQ_MULTILINE(result, expected);
+    }
+
     TEST_F(TestMessagingProtocolJSON, createMessage_currentState)
     {
         const std::string result = ProtocolJSON().createMessage(ctx, "currentState");

Diff for: utest/TestMqttMessagingProtocolYAML.cpp

@@ -301,6 +301,31 @@ namespace {
         EXPECT_EQ_MULTILINE(result, expected);
     }
 
+    TEST_F(TestMessagingProtocolYAML, createMessage_installFailedFallback)
+    {
+        const std::string result = sua::MqttMessagingProtocolYAML().createMessage(ctx, "installFailedFallback");
+
+        // clang-format off
+        const std::string expected = R"(
+            apiVersion: sdv.eclipse.org/v1
+            kind: SelfUpdateBundle
+            metadata:
+                name: "self-update-bundle-example"
+            spec:
+                bundleDownloadUrl: "http://url"
+                bundleName: "arm64-bundle"
+                bundleTarget: base
+                bundleVersion: 1.0
+            state:
+                message: "Stream install failed, trying download mode"
+                name: failed
+                techCode: 3001
+        )";
+        // clang-format on
+
+        EXPECT_EQ_MULTILINE(result, expected);
+    }
+
     TEST_F(TestMessagingProtocolYAML, createMessage_updateRejected)
     {
         const std::string result = sua::MqttMessagingProtocolYAML().createMessage(ctx, "rejected");