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

Use a command line argument to specify the configuration file.

Browse source
This commit is contained in:
Michael Lipp 2023-06-06 16:55:40 +02:00
parent ba7147ba0e
commit 351c876024
4 changed files with 337 additions and 309 deletions
Download patch file Download diff file Expand all files Collapse all files

1
org.jdrupes.vmoperator.runner.qemu/build.gradle
View file

@ -14,6 +14,7 @@ dependencies {
implementation 'org.jgrapes:org.jgrapes.http:[3.1.0,4)'
implementation 'org.jgrapes:org.jgrapes.util:[1.28.0,2)'
implementation 'commons-cli:commons-cli:1.5.0'
implementation 'org.freemarker:freemarker:[2.3.32,2.4)'
implementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:[2.15.1,3]'

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

@ -42,6 +42,11 @@ import java.util.Map;
import java.util.Optional;
import java.util.logging.Level;
import java.util.logging.Logger;
import org.apache.commons.cli.CommandLine;
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.runner.qemu.Configuration.BOOT_MODE_SECURE;
import static org.jdrupes.vmoperator.runner.qemu.Configuration.BOOT_MODE_UEFI;
import org.jdrupes.vmoperator.runner.qemu.StateController.State;
@ -160,10 +165,11 @@ public class Runner extends Component {
/**
* Instantiates a new runner.
* @param cmdLine
*
* @throws IOException Signals that an I/O exception has occurred.
*/
public Runner() throws IOException {
public Runner(CommandLine cmdLine) throws IOException {
state = new StateController(this);
mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES,
false);
@ -191,8 +197,7 @@ public class Runner extends Component {
attach(qemuMonitor = new QemuMonitor(channel()));
// Configuration store with file in /etc (default)
File config = new File(System.getProperty(
getClass().getPackageName().toString() + ".config",
File config = new File(cmdLine.getOptionValue('C',
"/etc/vmrunner/config.yaml"));
attach(new YamlConfigurationStore(channel(), config, false));
fire(new WatchFile(config.toPath()));
@ -484,7 +489,13 @@ public class Runner extends Component {
public static void main(String[] args) {
// The Runner is the root component
try {
var app = new Runner();
CommandLineParser parser = new DefaultParser();
// parse the command line arguments
final Options options = new Options();
options.addOption(new Option("C", "config", true, "The confi"
+ "guration file (defaults to /etc/vmrunner/config.yaml)."));
CommandLine cmd = parser.parse(options, args);
var app = new Runner(cmd);
// Prepare Stop
Runtime.getRuntime().addShutdownHook(new Thread(() -> {
@ -498,7 +509,8 @@ public class Runner extends Component {
// Start the application
Components.start(app);
} catch (IOException | InterruptedException e) {
} catch (IOException | InterruptedException
| org.apache.commons.cli.ParseException e) {
Logger.getLogger(Runner.class.getName()).log(Level.SEVERE, e,
() -> "Failed to start runner: " + e.getMessage());
}