Code Review
/
ealt-edge.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Deleted unused import pkg
[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
..
10906d3
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;
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.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.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 {
@Service
public class backupService {
@@
-23,21
+29,11
@@
public class backupService {
}
public List<EALTEdgeBackup> getBackupTables() {
}
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>();
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;
}
return backupsList;
}