From 25be63da6c89b24d19d03b9e594c5da087259a22 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Wed, 23 Jan 2019 11:58:41 +0100
Subject: [PATCH] Added command line arguments fo initialdeployment
---
.../ugoe/cs/rwm/mocci/InitialDeployment.java | 18 ++++++++++++------
.../java/de/ugoe/cs/rwm/mocci/MapeTest.java | 2 +-
2 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java b/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
index 35ff940..4ef926f 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
@@ -17,6 +17,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.net.URL;
import java.nio.file.Path;
+import java.nio.file.Paths;
import org.eclipse.emf.ecore.resource.Resource;
@@ -41,12 +42,17 @@ public class InitialDeployment {
Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
//Connector conn = new MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
RegistryAndLoggerSetup.setup();
- deploy(conn);
- }
-
- public static void deploy(Connector conn) {
- System.out.println("Initial Deployment");
- Path occiPath = getModelPath("de/ugoe/cs/rwm/mocci/occi/hadoopClusterNewExtWithMem.occic");
+ Path occiPath;
+
+ if(args.length == 0) {
+ System.out.println("Choosing default initial deployment model");
+ occiPath = getModelPath("de/ugoe/cs/rwm/mocci/occi/hadoopClusterNewExtWithMem.occic");
+ } else {
+ System.out.println("Choosing user defined deployment model: " + args[0]);
+ File occiFile = new File(args[0]);
+ occiPath = occiFile.toPath().toAbsolutePath();
+ }
+
Resource model = ModelUtility.loadOCCIintoEMFResource(occiPath);
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java
index 7b3e969..1b6dc89 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java
@@ -36,7 +36,7 @@ public class MapeTest {
MartDeployer deployer = new MartDeployer(conn);
deployer.deploy(occiPath);
- InitialDeployment.deploy(conn);
+ InitialDeployment.main(new String[0]);
}
@Test
--
GitLab