diff --git a/build.gradle b/build.gradle
index 8d9ff43d2123f48cd65818557bfb7f85c47bb6b5..86eb6f20299f6c72b82a3a0ba7604f5c64c01607 100644
--- a/build.gradle
+++ b/build.gradle
@@ -8,6 +8,12 @@ apply plugin: "com.github.psxpaul.execfork"
apply plugin: 'jacoco'
apply plugin: 'com.github.johnrengelman.shadow'
+ext{
+ //dependencies
+ tocciVersion = '1.0.1'
+ docciVersion = '1.0.1'
+ cocciVersion = '1.0.0'
+}
subprojects {
apply plugin: 'java'
@@ -59,31 +65,19 @@ repositories {
}
}
-dependencies {
- //Nexus
- compile "org.eclipse.uml2:org.eclipse.uml2.uml:4.1.2"
- //runtime?
- compile "org.eclipse.uml2:org.eclipse.uml2.types:1.1.0"
- compile "org.eclipse.uml2:org.eclipse.uml2.common:1.8.2"
- compile group: 'org.eclipse.ocl', name: 'pivot', version: '1.3.0'
-
+dependencies {
//occiware
compile group: 'org.eclipse.cmf.occi', name: 'core', version: '1.0.0'
compile group: 'org.eclipse.cmf.occi', name: 'infrastructure', version: '1.0.0'
- //own
- compile group: 'de.ugoe.cs.rwm', name: 'cocci', version: '1.0.0'
- compile group: 'de.ugoe.cs.rwm', name: 'docci', version: '1.0.0'
- compile group: 'de.ugoe.cs.rwm', name: 'tocci', version: '1.0.0'
- compile group: 'de.ugoe.cs.rwm.mocci', name: 'model', version: '1.0.0'
- //compile project(':de.ugoe.cs.rwm.mocci.model')
- //modmacao
- compile group: 'org.modmacao', name: 'core', version: '1.0.0'
- compile group: 'org.modmacao', name: 'placement', version: '1.0.0'
- compile group: 'org.modmacao.occi', name: 'platform', version: '1.0.0'
- compile group: 'org.modmacao.openstack', name: 'runtime', version: '1.0.0'
- compile group: 'org.modmacao.openstack.swe', name: 'runtime', version: '1.0.0'
- compile group: 'org.modmacao', name: 'ansible', version: '1.0.0'
+ //own
+ compile group: 'de.ugoe.cs.rwm', name: 'cocci', version: cocciVersion
+ compile group: 'de.ugoe.cs.rwm', name: 'docci', version: docciVersion
+ compile group: 'de.ugoe.cs.rwm', name: 'tocci', version: tocciVersion
+ compile group: 'de.ugoe.cs.rwm.pog', name: 'model', version: '1.0.0'
+ //compile group: 'de.ugoe.cs.rwm.mocci', name: 'model', version: '1.0.0'
+ compile project(':de.ugoe.cs.rwm.mocci.model')
+
//maven
compile group: 'log4j', name: 'log4j', version: '1.2.17'
compile group: 'com.google.guava', name: 'guava', version: '25.1-jre'
@@ -92,10 +86,21 @@ dependencies {
compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
+ //Nexus
+ compile "org.eclipse.uml2:org.eclipse.uml2.uml:4.1.2"
+ //runtime?
+ compile "org.eclipse.uml2:org.eclipse.uml2.types:1.1.0"
+ compile "org.eclipse.uml2:org.eclipse.uml2.common:1.8.2"
+ compile group: 'org.eclipse.ocl', name: 'pivot', version: '1.3.0'
+
+ testCompile group: 'org.modmacao', name: 'core', version: '1.0.0'
+ testCompile group: 'org.modmacao', name: 'placement', version: '1.0.0'
+ testCompile group: 'org.modmacao.occi', name: 'platform', version: '1.0.0'
+ testCompile group: 'org.modmacao.openstack', name: 'runtime', version: '1.0.0'
+ testCompile group: 'org.modmacao.openstack.swe', name: 'runtime', version: '1.0.0'
+ testCompile group: 'org.modmacao', name: 'ansible', version: '1.0.0'
+ testCompile group: 'org.eclipse.cmf.occi', name: 'crtp', version: '1.0.0'
testCompile group: 'junit', name: 'junit', version: '4.12'
- compile group: 'de.ugoe.cs.rwm.pog', name: 'model', version: '1.0.0'
- compile group: 'de.ugoe.cs.rwm.pcg', name: 'model', version: '1.0.0'
- //testImplementation 'junit:junit:4.12'
}
@@ -139,7 +144,7 @@ javadoc {
failOnError = true
}
test {
- exclude 'de/ugoe/cs/rwm/mocci/live/**'
+ //exclude 'de/ugoe/cs/rwm/mocci/live/**'
//exclude 'de/ugoe/cs/rwm/mocci/**'
testLogging.showStandardStreams = true
testLogging {
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 a2f9dcd4c3f119727a549daac97269ffa69b1549..ee1d3b92c9eb412ab2369c256d91e3e2e9c71844 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
@@ -13,6 +13,7 @@ package de.ugoe.cs.rwm.mocci;
import java.nio.file.Path;
import java.nio.file.Paths;
import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
import org.json.JSONArray;
import de.ugoe.cs.rwm.docci.MartDeployer;
@@ -102,10 +103,15 @@ public static void execute(Resource runtimeModel) {
System.out.println("Execute: Deploying adjusted Model");
Path occiPath = RUNTIMEPATH;
- OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ OCCI2OPENSTACKTransformator trans2 = new OCCI2OPENSTACKTransformator();
trans2.setTransformationProperties(RegistryAndLoggerSetup.manNWRuntimeId, RegistryAndLoggerSetup.sshKey, RegistryAndLoggerSetup.userData, RegistryAndLoggerSetup.manNWid);
- trans2.transform(runtimeModel, occiPath);
+ try {
+ trans2.transform(runtimeModel, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
runtimeModel = ModelUtility.loadOCCIintoEMFResource(occiPath);
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 2bfc9d684a141e50ac9d863a765f3171a2022a15..af1de574e9820fde3b5605b9f1ed57611a0abcc4 100644
--- a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
@@ -35,7 +35,6 @@ import modmacao.ModmacaoPackage;
import monitoring.MonitoringPackage;
import openstackruntime.OpenstackruntimePackage;
import ossweruntime.OssweruntimePackage;
-import workflow.WorkflowPackage;
public class RegistryAndLoggerSetup {
@@ -56,10 +55,10 @@ public class RegistryAndLoggerSetup {
Logger.getLogger(ModelRetriever.class.getName()).setLevel(Level.OFF);
Logger.getLogger(Comparator.class.getName()).setLevel(Level.OFF);
Logger.getLogger(Provisioner.class.getName()).setLevel(Level.OFF);
- Logger.getLogger(Deployer.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Deployer.class.getName()).setLevel(Level.INFO);
Logger.getLogger(Deprovisioner.class.getName()).setLevel(Level.OFF);
Logger.getLogger(Executor.class.getName()).setLevel(Level.INFO);
- Logger.getLogger(MartAppDeployerSlave.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(MartAppDeployerSlave.class.getName()).setLevel(Level.INFO);
}
private static void registrySetup() {
@@ -70,7 +69,6 @@ public class RegistryAndLoggerSetup {
OpenstackruntimePackage.eINSTANCE.eClass();
PlacementPackage.eINSTANCE.eClass();
- WorkflowPackage.eINSTANCE.eClass();
OssweruntimePackage.eINSTANCE.eClass();
AnsibleconfigurationPackage.eINSTANCE.eClass();
MonitoringPackage.eINSTANCE.eClass();
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 9cdb034ec3c2a56df84414fcc04d8829cb8448b9..f0a517830fe826bba016218d4d704865de45e544 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
@@ -8,6 +8,7 @@ import java.nio.file.Paths;
import org.eclipse.cmf.occi.core.util.OcciRegistry;
import org.eclipse.emf.ecore.resource.Resource;
import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -52,14 +53,24 @@ public class DeployHadoopMonitoringTest {
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
- trans.transform(model, occiPath);
+ try {
+ trans.transform(model, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
model = ModelUtility.loadOCCIintoEMFResource(occiPath);
- OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ OCCI2OPENSTACKTransformator trans2 = new OCCI2OPENSTACKTransformator();
trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
- trans2.transform(model, occiPath);
+ try {
+ trans2.transform(model, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
model = ModelUtility.loadOCCIintoEMFResource(occiPath);
@@ -83,14 +94,24 @@ public class DeployHadoopMonitoringTest {
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
- trans.transform(model, occiPath);
+ try {
+ trans.transform(model, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
model = ModelUtility.loadOCCIintoEMFResource(occiPath);
- OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ OCCI2OPENSTACKTransformator trans2 = new OCCI2OPENSTACKTransformator();
trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
- trans2.transform(model, occiPath);
+ try {
+ trans2.transform(model, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
model = ModelUtility.loadOCCIintoEMFResource(occiPath);
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
index d1cc07030e1c6132129b003fe2bb1666c2ba8062..30f6313344309b2828e0cdd87aedcb331801ebac 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
@@ -11,6 +11,7 @@ import org.apache.log4j.Logger;
import org.apache.log4j.PropertyConfigurator;
import org.eclipse.cmf.occi.core.OCCIPackage;
import org.eclipse.cmf.occi.core.util.OcciRegistry;
+import org.eclipse.cmf.occi.crtp.CrtpPackage;
import org.eclipse.cmf.occi.infrastructure.InfrastructurePackage;
import org.eclipse.emf.ecore.EObject;
import org.eclipse.emf.ecore.resource.Resource;
@@ -36,7 +37,6 @@ import modmacao.ModmacaoPackage;
import monitoring.MonitoringPackage;
import openstackruntime.OpenstackruntimePackage;
import ossweruntime.OssweruntimePackage;
-import workflow.WorkflowPackage;
public class TestUtility {
public static void extensionRegistrySetup() {
@@ -46,12 +46,12 @@ public class TestUtility {
OpenstackruntimePackage.eINSTANCE.eClass();
PlacementPackage.eINSTANCE.eClass();
- WorkflowPackage.eINSTANCE.eClass();
OssweruntimePackage.eINSTANCE.eClass();
AnsibleconfigurationPackage.eINSTANCE.eClass();
MonitoringPackage.eINSTANCE.eClass();
-
+ CrtpPackage.eINSTANCE.eClass();
PlatformPackage.eINSTANCE.eClass();
+
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/platform#",
PlatformPackage.class.getClassLoader().getResource("model/platform.occie").toString());
@@ -67,15 +67,14 @@ public class TestUtility {
InfrastructurePackage.class.getClassLoader().getResource("model/Infrastructure.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/core#",
OCCIPackage.class.getClassLoader().getResource("model/Core.occie").toString());
- OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/workflow#",
- OCCIPackage.class.getClassLoader().getResource("model/workflow.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/swe#",
OCCIPackage.class.getClassLoader().getResource("model/ossweruntime.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/ansible#",
OCCIPackage.class.getClassLoader().getResource("model/ansibleconfiguration.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
-
+ OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#",
+ OCCIPackage.class.getClassLoader().getResource("model/crtp.occie").toString());
}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
index 4ca86bcc7579c43fd056a4ad79ad24adda1fef6b..05d0a16e1cebc86d853b19d89b1015d09b3d21d7 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
@@ -6,6 +6,7 @@ import java.nio.file.Path;
import java.nio.file.Paths;
import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.eclipse.epsilon.eol.exceptions.EolRuntimeException;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -45,12 +46,22 @@ public class DeployHadoopMonitoringTestLive {
Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopClusterNewExtWithMem.occic"));
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
- trans.transform(occiPath, occiPath);
+ try {
+ trans.transform(occiPath, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
- OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ OCCI2OPENSTACKTransformator trans2 = new OCCI2OPENSTACKTransformator();
trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
- trans2.transform(occiPath, occiPath);
+ try {
+ trans2.transform(occiPath, occiPath);
+ } catch (EolRuntimeException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
Connector conn = new MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
diff --git a/src/test/resources/occi/hadoopClusterCPU.occic b/src/test/resources/occi/hadoopClusterCPU.occic
index 64b7410ed9fa51fbe002e808439a26049b8f5d53..9974f732279f7342b26da33e4c76053c890137ef 100644
--- a/src/test/resources/occi/hadoopClusterCPU.occic
+++ b/src/test/resources/occi/hadoopClusterCPU.occic
@@ -73,7 +73,7 @@
<attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
</links>
</resources>
- <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="Hadoopcluster" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" occiAppName="" occiAppState="deployed">
+ <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="Hadoopcluster" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" occiAppName="" occiAppState="undeployed">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
<attributes name="occi.core.id" value="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d"/>
<attributes name="occi.core.title" value="Hadoopcluster"/>
@@ -236,7 +236,7 @@
<attributes name="occi.core.title" value="link2"/>
</links>
</resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" rlinks="//@resources.9/@links.1 //@resources.10/@links.1" occiComputeHostname="monVM">
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" rlinks="//@resources.9/@links.1 //@resources.10/@links.1" occiComputeState="active" occiComputeHostname="monVM">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
<attributes name="occi.core.id" value="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea"/>
<attributes name="occi.core.title" value="MonVm"/>
@@ -261,7 +261,7 @@
</parts>
</links>
</resources>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.4/@links.1">
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" occiNetworkState="active" rlinks="//@resources.11/@links.0 //@resources.4/@links.1">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
<attributes name="occi.core.id" value="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a"/>
<attributes name="occi.core.title" value="MonitoringNetwork"/>