diff --git a/README.md b/README.md index 65ad87dee410d3df2644808124f3bd709720cd04..dbac22d48f59f80f10c1e2e1cc37480800c71384 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,6 @@ # MOCCI [](https://gitlab.gwdg.de/rwm/de.ugoe.cs.rwm.mocci/commits/master) +[](https://gitlab.gwdg.de/rwm/de.ugoe.cs.rwm.mocci/commits/master) MOCCI is an extension for the [Open Cloud Computing Interface (OCCI)](http://occi-wg.org/about/specification/) to enable a model-driven management of monitoring devices in the cloud, as well as storing their results within an OCCI-compliant runtime model. Together with other tools from the OCCI ecosystem it provides a testing and execution environment for self-adaptive systems with an EMF-based architecture runtime model ([Snapshot in JSON format](./doc/browser.png)). In the following you will find a getting started guide in which a preconfigured VirtualBox image is downloaded to perform example scenarios and an tutorial on how to enrich existing OCCI models with monitoring functionality. Moreover, an introduction to MOCCI's components is provided, as well as links and description on how to integrate MOCCI with other pre-existing tooling from the OCCI ecosystem. The paper submitted to this artifact and the VirtualBox image can be found [here](https://owncloud.gwdg.de/index.php/s/5u2ddnyyNlzecM5) with the password being mocci. diff --git a/build.gradle b/build.gradle index c93c8d3589c3738b39c1a0238c3fbd863ae689a1..d877423417fa77b3a9c15d4edc81edc7bd6ccb5d 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ -apply plugin: "com.github.psxpaul.execfork" apply plugin: 'jacoco' +apply plugin: "com.github.psxpaul.execfork" apply plugin: 'com.github.johnrengelman.shadow' ext{ @@ -121,7 +121,6 @@ dependencies { compile "org.eclipse.uml2:org.eclipse.uml2.common:1.8.2" compile group: 'org.eclipse.ocl', name: 'pivot', version: '1.3.0' - testCompile group: 'junit', name: 'junit', version: '4.12' } diff --git a/config/checkstyle/checkstyle.xml b/config/checkstyle/checkstyle.xml index fd085c685a238ee1d01b370d1596f2c8095d6cb6..dfb6e35546c792eb2acfc9236ba9469c0c763ca4 100644 --- a/config/checkstyle/checkstyle.xml +++ b/config/checkstyle/checkstyle.xml @@ -4,9 +4,6 @@ "http://checkstyle.sourceforge.net/dtds/configuration_1_3.dtd"> <module name="Checker"> <property name="charset" value="UTF-8"/> - <module name="JavadocPackage"/> - - <module name="TreeWalker"> <module name="RegexpSinglelineJava"> <property name="format" value="^\t* "/> diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/package-info.java b/src/main/java/de/ugoe/cs/rwm/mocci/package-info.java index 2bfc2dbd8043e3ba777821b400a8bb26d36a0bc0..9e91f34adb2f8e450569c3ad09f5467494c24da4 100644 --- a/src/main/java/de/ugoe/cs/rwm/mocci/package-info.java +++ b/src/main/java/de/ugoe/cs/rwm/mocci/package-info.java @@ -1,6 +1,3 @@ -/** - * - */ /** * Main package that includes util classes as well as the monitoring interface. * 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 e8b1024541b7c8908f55f9822df5a8b59179d30e..72bba2b93f1340ad74d3b6c025338dfd5657b518 100644 --- a/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java +++ b/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java @@ -76,4 +76,27 @@ public class MapeTest { assertTrue(TestUtility.equalsRuntime(MAPE.runtimeModel, MAPE.conn)); } + @Test + public void Iterations() { + int iterations = 20; + int count = 0; + int interval = 1000; + while (count < iterations) { + try { + System.out.println("\n--------------------Waiting for new MAPE-K Cycle: Sleeping " + interval + + "--------------------"); + Thread.sleep(interval); + + Monitor monitor = MAPE.monitor(); + String analysis = MAPE.analyze(monitor); + MAPE.runtimeModel = MAPE.plan(analysis); + MAPE.execute(MAPE.runtimeModel); + count++; + } catch (InterruptedException e) { + e.printStackTrace(); + } + + } + } + } diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java new file mode 100644 index 0000000000000000000000000000000000000000..b6a9aa21a2a9c4e6493d763f95ebedd96f143434 --- /dev/null +++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java @@ -0,0 +1,10 @@ +/** + * + */ +/** + * Main package that includes MOCCI live tests. + * + * @author erbel + * + */ +package de.ugoe.cs.rwm.mocci.live; 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 1ef9810d18a9541eeb5fb4aae3db163426b83f56..85e5c798dfe9fcca9d13102397bc19d58d03104a 100644 Binary files a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar and b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.dummy.jar differ