From aa115821b849b2a521499ada9fb2ed01c15e66d9 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Wed, 23 Jan 2019 15:02:59 +0100
Subject: [PATCH] Minor adjustments
---
.../java/de/ugoe/cs/rwm/mocci/DownScaler.java | 8 -----
.../ugoe/cs/rwm/mocci/InitialDeployment.java | 9 ++---
src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java | 24 +++++++++++--
.../cs/rwm/mocci/RegistryAndLoggerSetup.java | 12 +++++--
.../java/de/ugoe/cs/rwm/mocci/UpScaler.java | 3 --
.../rwm/mocci/DeployHadoopMonitoringTest.java | 33 +++++++++++++++++-
.../de.ugoe.cs.rwm.mocci.connector.dummy.jar | Bin 15301 -> 15305 bytes
7 files changed, 64 insertions(+), 25 deletions(-)
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
index 57468c2..c05d48c 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
@@ -20,20 +20,13 @@ import org.eclipse.cmf.occi.infrastructure.Compute;
import org.eclipse.cmf.occi.infrastructure.Ipnetworkinterface;
import org.eclipse.cmf.occi.infrastructure.Networkinterface;
import org.eclipse.emf.common.util.BasicEList;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.emf.ecore.resource.ResourceSet;
import org.eclipse.emf.ecore.util.EcoreUtil;
import org.eclipse.epsilon.emc.emf.CachedResourceSet;
import org.modmacao.occi.platform.Component;
import de.ugoe.cs.rwm.docci.ModelUtility;
import de.ugoe.cs.rwm.docci.connector.Connector;
-import de.ugoe.cs.rwm.docci.executor.MartExecutor;
-import monitoring.Datagatherer;
-import monitoring.Dataprocessor;
import monitoring.Monitorableproperty;
public class DownScaler extends AbsScaler {
@@ -50,7 +43,6 @@ public class DownScaler extends AbsScaler {
public Resource downScaleNodes() {
CachedResourceSet.getCache().clear();
- EList<EObject> toDelete = new BasicEList<EObject>();
runtimeModel = ModelUtility.loadOCCIintoEMFResource(conn.loadRuntimeModel(runtimePath));
Configuration config = ((Configuration) runtimeModel.getContents().get(0));
boolean downScale = false;
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 ab528c9..8708107 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/InitialDeployment.java
@@ -32,11 +32,6 @@ import de.ugoe.cs.rwm.tocci.TransformatorFactory;
import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
public class InitialDeployment {
- private static String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
- private static String manNWRuntimeId = "75a4639e-9ce7-4058-b859-8a711b0e2e7b";
- private static String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova";
- private static String userData = "I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj";
- private Connector conn;
public static void main (String args[]) {
Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
@@ -46,7 +41,7 @@ public class InitialDeployment {
if(args.length == 0) {
System.out.println("Choosing default initial deployment model");
- occiPath = getModelPath("de/ugoe/cs/rwm/mocci/occi/hadoopClusterNewExtWithMem.occic");
+ occiPath = getModelPath("de/ugoe/cs/rwm/mocci/occi/hadoopClusterCPU.occic");
} else {
System.out.println("Choosing user defined deployment model: " + args[0]);
File occiFile = new File(args[0]);
@@ -61,7 +56,7 @@ public class InitialDeployment {
model = ModelUtility.loadOCCIintoEMFResource(occiPath);
OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
- trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
+ trans2.setTransformationProperties(RegistryAndLoggerSetup.manNWRuntimeId, RegistryAndLoggerSetup.sshKey, RegistryAndLoggerSetup.userData, RegistryAndLoggerSetup.manNWid);
trans2.transform(model, occiPath);
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
index 59fe5b2..a2f9dcd 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
@@ -18,8 +18,11 @@ import org.json.JSONArray;
import de.ugoe.cs.rwm.docci.MartDeployer;
import de.ugoe.cs.rwm.docci.ModelUtility;
import de.ugoe.cs.rwm.docci.connector.Connector;
-import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
+import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
+import de.ugoe.cs.rwm.docci.connector.MartConnector;
import de.ugoe.cs.rwm.docci.executor.MartExecutor;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+
import org.modmacao.occi.platform.Component;
/**Making javadoc happy.
@@ -29,7 +32,7 @@ import org.modmacao.occi.platform.Component;
public class MAPE {
protected static final Path RUNTIMEPATH = Paths.get(System.getProperty("user.home") + "/.rwm/runtime.occic");
static Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
- static MartDeployer deployer = new MartDeployer(conn);
+ //static Connector conn = new MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
static MartExecutor executor = new MartExecutor(conn);
static Resource runtimeModel;
static Component newComp;
@@ -96,7 +99,22 @@ public static Resource plan(String analysis) {
public static void execute(Resource runtimeModel) {
- System.out.println("Execute: Deploying adjusted Model");
+ System.out.println("Execute: Deploying adjusted Model");
+ Path occiPath = RUNTIMEPATH;
+
+ OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ trans2.setTransformationProperties(RegistryAndLoggerSetup.manNWRuntimeId, RegistryAndLoggerSetup.sshKey, RegistryAndLoggerSetup.userData, RegistryAndLoggerSetup.manNWid);
+
+ trans2.transform(runtimeModel, occiPath);
+
+ runtimeModel = ModelUtility.loadOCCIintoEMFResource(occiPath);
+
+ MartDeployer deployer;
+ if(conn instanceof MartConnector) {
+ deployer = new MartDeployer(conn, 100000);
+ } else {
+ deployer = new MartDeployer(conn);
+ }
deployer.deploy(runtimeModel);
if(newComp != null) {
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
index b284bc9..2bfc9d6 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
@@ -25,6 +25,7 @@ import de.ugoe.cs.rwm.cocci.Comparator;
import de.ugoe.cs.rwm.docci.Deployer;
import de.ugoe.cs.rwm.docci.appdeployer.MartAppDeployerSlave;
import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.connector.MartConnector;
import de.ugoe.cs.rwm.docci.deprovisioner.Deprovisioner;
import de.ugoe.cs.rwm.docci.executor.Executor;
import de.ugoe.cs.rwm.docci.provisioner.Provisioner;
@@ -37,11 +38,16 @@ import ossweruntime.OssweruntimePackage;
import workflow.WorkflowPackage;
public class RegistryAndLoggerSetup {
+
+ static String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
+ static String manNWRuntimeId = "75a4639e-9ce7-4058-b859-8a711b0e2e7b";
+ static String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova";
+ static String userData = "I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj";
+
+
public static void setup() {
loggerSetup();
- registrySetup();
-
-
+ registrySetup();
}
private static void loggerSetup() {
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
index bc2b854..cd819d0 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
@@ -11,8 +11,6 @@
package de.ugoe.cs.rwm.mocci;
import java.nio.file.Path;
-import java.util.ArrayList;
-import java.util.List;
import org.eclipse.cmf.occi.core.AttributeState;
import org.eclipse.cmf.occi.core.Configuration;
@@ -25,7 +23,6 @@ import org.eclipse.cmf.occi.infrastructure.Networkinterface;
import org.eclipse.emf.ecore.resource.Resource;
import org.modmacao.occi.platform.Component;
import org.modmacao.occi.platform.Componentlink;
-import org.modmacao.occi.platform.Status;
import org.modmacao.placement.Placementlink;
import de.ugoe.cs.rwm.docci.ModelUtility;
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
index 09eaea7..9cdb034 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
@@ -43,7 +43,38 @@ public class DeployHadoopMonitoringTest {
}
@Test
- public void deployHadoopWithNewMonitoring() {
+ public void deployHadoopWithCPUMonitoring() {
+ CachedResourceSet.getCache().clear();
+ System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
+ Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopClusterCPU.occic"));
+
+ Resource model = ModelUtility.loadOCCIintoEMFResource(occiPath);
+
+
+ Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
+ trans.transform(model, occiPath);
+
+ model = ModelUtility.loadOCCIintoEMFResource(occiPath);
+
+ OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
+
+ trans2.transform(model, occiPath);
+
+ model = ModelUtility.loadOCCIintoEMFResource(occiPath);
+
+
+ Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
+ MartDeployer deployer = new MartDeployer(conn);
+
+ deployer.deploy(model);
+
+ assertTrue(TestUtility.equalsRuntime(model, conn));
+
+ }
+
+ @Test
+ public void deployHadoopWithCPUAndMemMonitoring() {
CachedResourceSet.getCache().clear();
System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopClusterNewExtWithMem.occic"));
diff --git a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar
index 677d116651a2979d8066624e0464f439447c2349..1ef9810d18a9541eeb5fb4aae3db163426b83f56 100644
GIT binary patch
delta 126
zcmX?FezJVSP9t9FGIKw><Xk6b1_p-2$;XUT*^d@@!~pT+PeyhkUrN8Su4D}qc&Z@g
z!QRo9$+Yp{ugwm|PuS7)8Cn}NgY=|ZTdBAjGcXk7l%{9q=~d+B1bDNu0gYx50m6PD
JOT`q#0{}n)Cba+n
delta 131
zcmX?EezbhUP9t84GJU_j<sWa_GcYiOPd;X(%6{O9Z43}k{$yk)YQnP8q(#e=WwmLG
zwpq&xHiiIiW|ql~)>503jgPXUX*RVsW(H}@wzg7nG-hBZ$SF<F%+ssL%?a>kWdoYe
OAOeK_K$e0jhz9_OVku1k
--
GitLab