X-Git-Url: https://gerrit.akraino.org/r/gitweb?a=blobdiff_plain;f=example-apps%2FROBO%2Fbackup_BE%2Fsrc%2Fmain%2Fjava%2Forg%2Fedgegallery%2Fexample_app%2Fservice%2FbackupService.java;h=877835c28038f5c71d8f51d7e706e0120e32f2e8;hb=e6d40ddb2640f434a9d7d7ed99566e5e8fa60cc1;hp=60aebf794006a38cd03428fc193370894a5b27bf;hpb=90720a02fb3c8cc388c82eee0971173c3087ca38;p=ealt-edge.git 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 --- 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 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 backupsList = new ArrayList(); - - 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; }