EG version upgrade to 1.3

[ealt-edge.git] / example-apps / ROBO / backup_BE / src / main / java / org / edgegallery / example_app / service / backupService.java

diff --git a/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/backupService.java b/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/backupService.java
index 60aebf7..877835c 100644 (file)
--- a/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/backupService.java
+++ b/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/backupService.java
@@ -1,11 +1,17 @@
 package org.edgegallery.example_app.service;
 
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.StringTokenizer;
+
+import org.apache.commons.lang.StringUtils;
 import org.edgegallery.example_app.model.EALTEdgeBackup;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.edgegallery.example_app.util.ShellCommand;
 import org.springframework.stereotype.Service;
+import org.edgegallery.example_app.common.*;
 
 @Service
 public class backupService {
@@ -14,7 +20,9 @@ public class backupService {
     private ShellCommand ShellCommands;
 
     public String create_backup(String backupname, String namespace) {
-        String command = "velero backup create " + backupname + " --include-namespaces " + namespace;
+        String ip = System.getenv("HOSTIP");
+        String command =
+                "sshpass ssh root@" + ip + " velero backup create " + backupname + " --include-namespaces " + namespace;
 
         String output = ShellCommands.executeCommand(command);
 
@@ -23,21 +31,11 @@ public class backupService {
     }
 
     public List<EALTEdgeBackup> getBackupTables() {
+        String ip = System.getenv("HOSTIP");
+        String command = "sshpass ssh root@" + ip + " velero get backups";
 
-        EALTEdgeBackup backup = new EALTEdgeBackup();
-        String command = "velero get backups";
-
-        String output = ShellCommands.executeCommand(command);
-
-        //System.out.println(output);
         List<EALTEdgeBackup> backupsList = new ArrayList<EALTEdgeBackup>();
-
-        String list = ShellCommands.parseResult(output);
-
-        //TODO: after parse the result, need to fill info in backup node in list
-        backup.setName("backup1");
-
-        backupsList.add(backup);
+        backupsList = ShellCommands.executeBackupCommand(command);
 
         return backupsList;
     }