From 655080678d269eeab2eabd047ef97142c8f6ecbe Mon Sep 17 00:00:00 2001
From: Pierre Charton <p.charton@dimsi.fr>
Date: Thu, 7 Nov 2024 10:09:57 +0100
Subject: [PATCH] Bug on list of vm on the instances

---
 .../cloudstack/backup/backroll/BackrollClient.java     | 10 ++++++----
 ui/src/components/view/ListResourceTable.vue           |  2 +-
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
index 8f6f55fadd3..469a354a2f2 100644
--- a/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
+++ b/plugins/backup/backroll/src/main/java/org/apache/cloudstack/backup/backroll/BackrollClient.java
@@ -40,7 +40,6 @@ import org.apache.cloudstack.backup.backroll.model.BackrollTaskStatus;
 import org.apache.cloudstack.backup.backroll.model.BackrollVmBackup;
 import org.apache.cloudstack.backup.backroll.model.response.BackrollTaskRequestResponse;
 import org.apache.cloudstack.backup.backroll.model.response.TaskState;
-import org.apache.cloudstack.backup.backroll.model.response.TaskStateResponse;
 import org.apache.cloudstack.backup.backroll.model.response.api.LoginApiResponse;
 import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollArchiveResponse;
 import org.apache.cloudstack.backup.backroll.model.response.archive.BackrollBackupsFromVMResponse;
@@ -223,9 +222,12 @@ public class BackrollClient {
             response.close();
             String urlToRequest = requestResponse.location.replace("/api/v1", "");
             result = waitGet(urlToRequest);
-            TaskStateResponse taskResponse = new ObjectMapper().readValue(result, TaskStateResponse.class);
-            logger.debug("RESTORE {}", taskResponse.state);
-            isRestoreOk = taskResponse.state.equals(TaskState.SUCCESS);
+
+            if(result.contains("SUCCESS")) {
+                logger.debug("RESTORE SUCCESS");
+                isRestoreOk = true;
+            }
+
         } catch (final NotOkBodyException e) {
             return false;
         } catch (final IOException | InterruptedException e) {
diff --git a/ui/src/components/view/ListResourceTable.vue b/ui/src/components/view/ListResourceTable.vue
index a95927f00cf..f8fdc5b5ada 100644
--- a/ui/src/components/view/ListResourceTable.vue
+++ b/ui/src/components/view/ListResourceTable.vue
@@ -51,7 +51,7 @@
           </template>
 
           <template v-else-if="column.key === 'size' || column.key === 'virtualsize'">
-            {{ bytesToHumanReadableSize(text) }}
+            {{ $bytesToHumanReadableSize(text) }}
           </template>
 
           <template v-else>