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
EG version upgrade to 1.3
[ealt-edge.git]
/
example-apps
/
ROBO
/
backup_BE
/
src
/
main
/
java
/
org
/
edgegallery
/
example_app
/
service
/
restoreService.java
diff --git
a/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/restoreService.java
b/example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/restoreService.java
index
f340e96
..
b981e9f
100644
(file)
--- a/
example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/restoreService.java
+++ b/
example-apps/ROBO/backup_BE/src/main/java/org/edgegallery/example_app/service/restoreService.java
@@
-1,7
+1,13
@@
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.common.Constants;
import org.edgegallery.example_app.model.EALTEdgeBackup;
import org.edgegallery.example_app.model.EALTEdgeRestore;
import org.edgegallery.example_app.util.ShellCommand;
import org.edgegallery.example_app.model.EALTEdgeBackup;
import org.edgegallery.example_app.model.EALTEdgeRestore;
import org.edgegallery.example_app.util.ShellCommand;
@@
-15,29
+21,27
@@
public class restoreService {
ShellCommand shellCommand;
public String create_restore(String restorename, String backupname) {
ShellCommand shellCommand;
public String create_restore(String restorename, String backupname) {
- String command = "velero restore create " + restorename + " --from-backup " + backupname;
+ String ip = System.getenv("HOSTIP");
+ String command = "sshpass ssh root@" + ip + " velero restore create " + restorename + " --from-backup " +
+ backupname;
String output = shellCommand.executeCommand(command);
System.out.println(output);
return "success";
}
String output = shellCommand.executeCommand(command);
System.out.println(output);
return "success";
}
-
+
+ /**
+ * get restore table and parse
+ * @return
+ */
public List<EALTEdgeRestore> getRestoreTables() {
public List<EALTEdgeRestore> getRestoreTables() {
- EALTEdgeRestore restoreDetails = new EALTEdgeRestore();
- String command = "velero get restores";
-
- String output = shellCommand.executeCommand(command);
+ String ip = System.getenv("HOSTIP");
+ String command = "sshpass ssh root@" + ip + " velero get restores";
- //System.out.println(output);
List<EALTEdgeRestore> restoresList = new ArrayList<EALTEdgeRestore>();
List<EALTEdgeRestore> restoresList = new ArrayList<EALTEdgeRestore>();
+ restoresList = shellCommand.executeRestoreCommand(command);
- String list = shellCommand.parseResult(output);
-
- //TODO: after parse the result, need to fill info in backup node in list
- restoreDetails.setName("restore1");
-
- restoresList.add(restoreDetails);
return restoresList;
}
}
return restoresList;
}
}