mnl/VM-Operator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 4 Wiki Activity Actions

Feature/web gui2 (#16)
Some checks failed
Java CI with Gradle / build (push) Has been cancelled
Details

Browse source 
Add oveview and enhance.
This commit is contained in:
Michael N. Lipp 2023-10-30 23:10:26 +01:00 • committed by GitHub
parent 8567a2f052
commit 6f45e7982a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
32 changed files with 1382 additions and 250 deletions
Download patch file Download diff file Expand all files Collapse all files

9
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Configuration.java
View file

@ -28,6 +28,7 @@ import java.util.Set;
import java.util.UUID;
import java.util.logging.Level;
import java.util.logging.Logger;
import static org.jdrupes.vmoperator.common.Constants.APP_NAME;
import org.jdrupes.vmoperator.common.Convertions;
import org.jdrupes.vmoperator.util.Dto;
import org.jdrupes.vmoperator.util.FsdUtils;
@ -272,7 +273,7 @@ public class Configuration implements Dto {
private boolean checkRuntimeDir() {
// Runtime directory (sockets etc.)
if (runtimeDir == null) {
var appDir = FsdUtils.runtimeDir(Runner.APP_NAME.replace("-", ""));
var appDir = FsdUtils.runtimeDir(APP_NAME.replace("-", ""));
if (!Files.exists(appDir) && appDir.toFile().mkdirs()) {
try {
// When appDir is derived from XDG_RUNTIME_DIR
@ -288,7 +289,7 @@ public class Configuration implements Dto {
runtimeDir));
}
}
runtimeDir = FsdUtils.runtimeDir(Runner.APP_NAME.replace("-", ""))
runtimeDir = FsdUtils.runtimeDir(APP_NAME.replace("-", ""))
.resolve(vm.name);
runtimeDir.toFile().mkdir();
swtpmSocket = runtimeDir.resolve("swtpm-sock");
@ -308,8 +309,8 @@ public class Configuration implements Dto {
private boolean checkDataDir() {
// Data directory
if (dataDir == null) {
dataDir = FsdUtils.dataHome(Runner.APP_NAME.replace("-", ""))
.resolve(vm.name);
dataDir
= FsdUtils.dataHome(APP_NAME.replace("-", "")).resolve(vm.name);
}
if (!Files.exists(dataDir)) {
dataDir.toFile().mkdirs();

5
org.jdrupes.vmoperator.runner.qemu/src/org/jdrupes/vmoperator/runner/qemu/Runner.java
View file

@ -50,6 +50,7 @@ import org.apache.commons.cli.CommandLineParser;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.Options;
import static org.jdrupes.vmoperator.common.Constants.APP_NAME;
import org.jdrupes.vmoperator.runner.qemu.commands.QmpCont;
import org.jdrupes.vmoperator.runner.qemu.events.MonitorCommand;
import org.jdrupes.vmoperator.runner.qemu.events.QmpConfigured;
@ -178,8 +179,6 @@ import org.jgrapes.util.events.WatchFile;
"PMD.DataflowAnomalyAnalysis" })
public class Runner extends Component {
/** The Constant APP_NAME. */
public static final String APP_NAME = "vm-runner";
private static final String TEMPLATE_DIR
= "/opt/" + APP_NAME.replace("-", "") + "/templates";
private static final String DEFAULT_TEMPLATE
@ -609,7 +608,7 @@ public class Runner extends Component {
static {
try {
InputStream props;
var path = FsdUtils.findConfigFile(Runner.APP_NAME.replace("-", ""),
var path = FsdUtils.findConfigFile(APP_NAME.replace("-", ""),
"logging.properties");
if (path.isPresent()) {
props = Files.newInputStream(path.get());