diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e8c143f59f7f625da9d9e7f2858e46485cae0b72..e8895216fd3c0c3af4c4522334775f41b7deb42e 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=de.ugoe.cs.rwm.mocci.connector
+connection.project.dir=
eclipse.preferences.version=1
diff --git a/build.gradle b/build.gradle
index 8ce0ed2f5dcbf6c82c77a2a07c2f1f44d11cd4ec..83368c430e50340b3233be8bd55e088cd3e00ee4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -17,6 +17,10 @@ subprojects {
}
+ sourceCompatibility = 1.8
+ targetCompatibility = 1.8
+
+
buildscript {
repositories {
maven {
@@ -50,10 +54,6 @@ repositories {
maven {
url "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/"
}
-
- flatDir {
- dirs 'lib'
- }
}
dependencies {
@@ -63,40 +63,34 @@ dependencies {
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'
+
//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'
- compile group: 'org.eclipse.cmf.occi', name: 'crtp', version: '1.0.0'
-
- //own
- 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'
- compile group: 'de.ugoe.cs.rwm', name: 'tocci', 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.mocci', 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')
//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'
+ compile group: 'org.modmacao', name: 'ansible', version: '1.0.0'
//maven
- //compile group: 'org.eclipse.epsilon', name: 'epsilon-core', version: '1.4.0'
- //compile group: 'org.eclipse.epsilon', name: 'epsilon-emf', version: '1.4.0'
compile group: 'log4j', name: 'log4j', version: '1.2.17'
compile group: 'com.google.guava', name: 'guava', version: '25.1-jre'
compile group: 'org.apache.logging.log4j', name: 'log4j-slf4j-impl', version: '2.11.0'
compile "org.eclipse.core:org.eclipse.core.runtime:3.7.0"
+ compile group: 'com.googlecode.json-simple', name: 'json-simple', version: '1.1.1'
compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
- compile group: 'org.json', name: 'json', version: '20180130'
- compile group: 'commons-codec', name: 'commons-codec', version: '1.9'
-
- compile project(':de.ugoe.cs.rwm.mocci.model')
+
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', name: 'tocci', version: '1.0.0'
//testImplementation 'junit:junit:4.12'
}
@@ -116,7 +110,7 @@ project(':de.ugoe.cs.rwm.mocci.connector') {
project(':de.ugoe.cs.rwm.mocci.examples') {
dependencies {
- compile project(':de.ugoe.cs.rwm.mocci.model')
+ //compile project(':de.ugoe.cs.rwm.mocci.model')
}
}
diff --git a/de.ugoe.cs.rwm.mocci.connector/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.connector/.settings/org.eclipse.buildship.core.prefs
index e8895216fd3c0c3af4c4522334775f41b7deb42e..b1886adb46c085de842f1283c1a3c25151bfc988 100644
--- a/de.ugoe.cs.rwm.mocci.connector/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.connector/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=
+connection.project.dir=..
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF b/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF
index 40cc25edcd7e8bca493dc3de9287058059e0582b..898e623900e6da9c5a47c38ae7c0998f6870cf79 100644
--- a/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF
+++ b/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.slf4j.api,
org.eclipse.cmf.occi.core,
- de.ugoe.cs.rwm.mocci.model
+ de.ugoe.cs.rwm.mocci.model,
+ org.modmacao.occi.platform
Export-Package: de.ugoe.cs.rwm.mocci.connector
diff --git a/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore b/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore
new file mode 100644
index 0000000000000000000000000000000000000000..fd04598cccd1eb791debf5b0edfff26368dbb294
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore
@@ -0,0 +1 @@
+/de/
diff --git a/de.ugoe.cs.rwm.mocci.connector/build.gradle b/de.ugoe.cs.rwm.mocci.connector/build.gradle
index d55654d6ae775426711286860fed48f22d60bde1..d234050ca877d143c95878fb1c8609bd13aa8cbd 100644
--- a/de.ugoe.cs.rwm.mocci.connector/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.connector/build.gradle
@@ -33,6 +33,7 @@ dependencies {
compile group: 'org.eclipse.cmf.occi', name: 'core', version: '1.0.0'
compile group: 'org.modmacao.occi', name: 'platform', version: '1.0.0'
compile group: 'org.modmacao', name: 'cm', version: '1.0.0'
+ compile group: 'org.modmacao.core', name: 'connector', version : '1.0.0'
compile group: 'commons-io', name: 'commons-io', version: '2.6'
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
index 9fdbe72f9d56edeb78e710d1e1f5fcf43b8cc5df..e5a46b8ba42e6f6d5a8f5a93667c0441bd5156de 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java
@@ -10,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -68,12 +68,12 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
/**
* EFactory method for OCCI kind:
* - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: monitoringattribute
- * - title: MonitoringAttribute Mixin
+ * - term: monitoringproperty
+ * - title: MonitoringProperty Mixin
*/
@Override
- public monitoring.Monitoringattribute createMonitoringattribute() {
- return new MonitoringattributeConnector();
+ public monitoring.Monitoringproperty createMonitoringproperty() {
+ return new MonitoringpropertyConnector();
}
}
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
index 7465d060f44ee8c67a305d94207b74e793e3cf52..50bcc3671d7aa4b9dc704b118d91e435c3532586 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
@@ -10,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -98,34 +98,19 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
// Datagatherer actions.
//
- // Start of user code Datagatherer_Kind_Start_action
- /**
- * Implement OCCI action:
- * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: start
- * - title: Start the application.
- */
- @Override
- public void start()
- {
- LOGGER.debug("Action start() called on " + this);
-
- // TODO: Implement how to start this datagatherer.
- }
- // End of user code
- // Start of user code Datagatherer_Kind_Stop_action
+ // Start of user code Datagatherer_Kind_undeploy_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: stop
- * - title: Stop the application.
+ * - term: undeploy
+ * - title:
*/
@Override
- public void stop()
+ public void undeploy()
{
- LOGGER.debug("Action stop() called on " + this);
+ LOGGER.debug("Action undeploy() called on " + this);
- // TODO: Implement how to stop this datagatherer.
+ // TODO: Implement how to undeploy this datagatherer.
}
// End of user code
// Start of user code Datagatherer_Kind_deploy_action
@@ -158,19 +143,34 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
// TODO: Implement how to configure this datagatherer.
}
// End of user code
- // Start of user code Datagatherer_Kind_undeploy_action
+ // Start of user code Datagatherer_Kind_Start_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: undeploy
- * - title:
+ * - term: start
+ * - title: Start the application.
*/
@Override
- public void undeploy()
+ public void start()
{
- LOGGER.debug("Action undeploy() called on " + this);
+ LOGGER.debug("Action start() called on " + this);
- // TODO: Implement how to undeploy this datagatherer.
+ // TODO: Implement how to start this datagatherer.
+ }
+ // End of user code
+ // Start of user code Datagatherer_Kind_Stop_action
+ /**
+ * Implement OCCI action:
+ * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+ * - term: stop
+ * - title: Stop the application.
+ */
+ @Override
+ public void stop()
+ {
+ LOGGER.debug("Action stop() called on " + this);
+
+ // TODO: Implement how to stop this datagatherer.
}
// End of user code
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringattributeConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
similarity index 63%
rename from de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringattributeConnector.java
rename to de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
index bb74ef38a06d54b45b238b46d825246f2f9e0e8e..c25839d26d3d07f39b51746b82e6ab739d3ae33b 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringattributeConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
@@ -10,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -22,21 +22,21 @@ import org.slf4j.LoggerFactory;
/**
* Connector implementation for the OCCI kind:
* - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: monitoringattribute
- * - title: MonitoringAttribute Mixin
+ * - term: monitoringproperty
+ * - title: MonitoringProperty Mixin
*/
-public class MonitoringattributeConnector extends monitoring.impl.MonitoringattributeImpl
+public class MonitoringpropertyConnector extends monitoring.impl.MonitoringpropertyImpl
{
/**
* Initialize the logger.
*/
- private static Logger LOGGER = LoggerFactory.getLogger(MonitoringattributeConnector.class);
+ private static Logger LOGGER = LoggerFactory.getLogger(MonitoringpropertyConnector.class);
- // Start of user code Monitoringattributeconnector_constructor
+ // Start of user code Monitoringpropertyconnector_constructor
/**
- * Constructs a monitoringattribute connector.
+ * Constructs a monitoringproperty connector.
*/
- MonitoringattributeConnector()
+ MonitoringpropertyConnector()
{
LOGGER.debug("Constructor called on " + this);
// TODO: Implement this constructor.
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
index 89c22c85288ef31bea5c9223d0ca36e65a47c9c1..68922e707cd671f4c5b9a3957758835a437df2ff 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java
@@ -10,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -98,34 +98,19 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
// Processor actions.
//
- // Start of user code Processor_Kind_Start_action
- /**
- * Implement OCCI action:
- * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: start
- * - title: Start the application.
- */
- @Override
- public void start()
- {
- LOGGER.debug("Action start() called on " + this);
-
- // TODO: Implement how to start this processor.
- }
- // End of user code
- // Start of user code Processor_Kind_Stop_action
+ // Start of user code Processor_Kind_undeploy_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: stop
- * - title: Stop the application.
+ * - term: undeploy
+ * - title:
*/
@Override
- public void stop()
+ public void undeploy()
{
- LOGGER.debug("Action stop() called on " + this);
+ LOGGER.debug("Action undeploy() called on " + this);
- // TODO: Implement how to stop this processor.
+ // TODO: Implement how to undeploy this processor.
}
// End of user code
// Start of user code Processor_Kind_deploy_action
@@ -158,19 +143,34 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
// TODO: Implement how to configure this processor.
}
// End of user code
- // Start of user code Processor_Kind_undeploy_action
+ // Start of user code Processor_Kind_Start_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: undeploy
- * - title:
+ * - term: start
+ * - title: Start the application.
*/
@Override
- public void undeploy()
+ public void start()
{
- LOGGER.debug("Action undeploy() called on " + this);
+ LOGGER.debug("Action start() called on " + this);
- // TODO: Implement how to undeploy this processor.
+ // TODO: Implement how to start this processor.
+ }
+ // End of user code
+ // Start of user code Processor_Kind_Stop_action
+ /**
+ * Implement OCCI action:
+ * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+ * - term: stop
+ * - title: Stop the application.
+ */
+ @Override
+ public void stop()
+ {
+ LOGGER.debug("Action stop() called on " + this);
+
+ // TODO: Implement how to stop this processor.
}
// End of user code
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
index 321b1052a24d85daa00e00210e49c29cbeffe5f5..145283706d65aa26e92efaf7614d2f19170b36a4 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/PublisherConnector.java
@@ -10,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -98,34 +98,19 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
// Publisher actions.
//
- // Start of user code Publisher_Kind_Start_action
- /**
- * Implement OCCI action:
- * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: start
- * - title: Start the application.
- */
- @Override
- public void start()
- {
- LOGGER.debug("Action start() called on " + this);
-
- // TODO: Implement how to start this publisher.
- }
- // End of user code
- // Start of user code Publisher_Kind_Stop_action
+ // Start of user code Publisher_Kind_undeploy_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: stop
- * - title: Stop the application.
+ * - term: undeploy
+ * - title:
*/
@Override
- public void stop()
+ public void undeploy()
{
- LOGGER.debug("Action stop() called on " + this);
+ LOGGER.debug("Action undeploy() called on " + this);
- // TODO: Implement how to stop this publisher.
+ // TODO: Implement how to undeploy this publisher.
}
// End of user code
// Start of user code Publisher_Kind_deploy_action
@@ -158,19 +143,34 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
// TODO: Implement how to configure this publisher.
}
// End of user code
- // Start of user code Publisher_Kind_undeploy_action
+ // Start of user code Publisher_Kind_Start_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: undeploy
- * - title:
+ * - term: start
+ * - title: Start the application.
*/
@Override
- public void undeploy()
+ public void start()
{
- LOGGER.debug("Action undeploy() called on " + this);
+ LOGGER.debug("Action start() called on " + this);
- // TODO: Implement how to undeploy this publisher.
+ // TODO: Implement how to start this publisher.
+ }
+ // End of user code
+ // Start of user code Publisher_Kind_Stop_action
+ /**
+ * Implement OCCI action:
+ * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+ * - term: stop
+ * - title: Stop the application.
+ */
+ @Override
+ public void stop()
+ {
+ LOGGER.debug("Action stop() called on " + this);
+
+ // TODO: Implement how to stop this publisher.
}
// End of user code
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
index 7a7a7a579f16c2ddcfa4d8319c320c15bb0218ce..918b868b42bfe01907ecfff087d66b2fa425ea92 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java
@@ -10,10 +10,20 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * Generated at Mon Dec 03 15:37:54 CET 2018 from platform:/resource/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.modmacao.cm.ConfigurationManagementTool;
+import org.modmacao.cm.ansible.AnsibleCMTool;
+import org.modmacao.core.connector.ApplicationConnector;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +36,11 @@ import org.slf4j.LoggerFactory;
* - title: Sensor Component
*/
public class SensorConnector extends monitoring.impl.SensorImpl
+//public class SensorConnector extends ApplicationConnector
{
+
+ private ConfigurationManagementTool cmtool = new AnsibleCMTool();
+
/**
* Initialize the logger.
*/
@@ -98,82 +112,262 @@ public class SensorConnector extends monitoring.impl.SensorImpl
// Sensor actions.
//
- // Start of user code Sensor_Kind_Stop_action
+ // Start of user code Sensor_Kind_deploy_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: stop
- * - title: Stop the application.
+ * - term: deploy
+ * - title:
*/
@Override
- public void stop()
+ public void deploy()
{
- LOGGER.debug("Action stop() called on " + this);
+ int status = -1;
+ LOGGER.debug("Action deploy() called on " + this);
- // TODO: Implement how to stop this sensor.
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
+
+ case Status.UNDEPLOYED_VALUE:
+ LOGGER.debug("Fire transition(state=undeployed, action=\"deploy\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.deploy();
+ }
+
+ status = cmtool.deploy(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.DEPLOYED))
+ setOcciAppState(Status.DEPLOYED);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
- // Start of user code Sensor_Kind_Start_action
+ // Start of user code Sensor_Kind_undeploy_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: start
- * - title: Start the application.
+ * - term: undeploy
+ * - title:
*/
@Override
- public void start()
+ public void undeploy()
{
- LOGGER.debug("Action start() called on " + this);
+ int status = -1;
+ LOGGER.debug("Action undeploy() called on " + this);
- // TODO: Implement how to start this sensor.
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+ LOGGER.debug("Fire transition(state=active, action=\"undeploy\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.stop();
+ }
+ this.stop();
+
+ for (Component component: this.getConnectedComponents()) {
+ component.undeploy();
+ }
+ status = cmtool.undeploy(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.UNDEPLOYED))
+ setOcciAppState(Status.UNDEPLOYED);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+ case Status.INACTIVE_VALUE:
+ LOGGER.debug("Fire transition(state=inactive, action=\"undeploy\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.undeploy();
+ }
+ status = cmtool.undeploy(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.UNDEPLOYED))
+ setOcciAppState(Status.UNDEPLOYED);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+ case Status.DEPLOYED_VALUE:
+ LOGGER.debug("Fire transition(state=deployed, action=\"undeploy\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.undeploy();
+ }
+ status = cmtool.undeploy(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.UNDEPLOYED))
+ setOcciAppState(Status.UNDEPLOYED);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+ case Status.ERROR_VALUE:
+ LOGGER.debug("Fire transition(state=error, action=\"undeploy\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.undeploy();
+ }
+ status = cmtool.undeploy(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.UNDEPLOYED))
+ setOcciAppState(Status.UNDEPLOYED);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
- // Start of user code Sensor_Kind_deploy_action
+ // Start of user code Sensor_Kind_Stop_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: deploy
- * - title:
+ * - term: stop
+ * - title: Stop the application.
*/
@Override
- public void deploy()
+ public void stop()
{
- LOGGER.debug("Action deploy() called on " + this);
+ int status = -1;
+ LOGGER.debug("Action stop() called on " + this);
+
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
- // TODO: Implement how to deploy this sensor.
+ case Status.ACTIVE_VALUE:
+ LOGGER.debug("Fire transition(state=active, action=\"stop\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.stop();
+ }
+ status = cmtool.stop(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.INACTIVE))
+ setOcciAppState(Status.INACTIVE);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
+
+ // TODO: Implement how to stop this sensor.
}
// End of user code
- // Start of user code Sensor_Kind_undeploy_action
+ // Start of user code Sensor_Kind_configure_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: undeploy
+ * - term: configure
* - title:
*/
@Override
- public void undeploy()
+ public void configure()
{
- LOGGER.debug("Action undeploy() called on " + this);
+ int status = -1;
+ LOGGER.debug("Action configure() called on " + this);
+
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
- // TODO: Implement how to undeploy this sensor.
+ case Status.DEPLOYED_VALUE:
+ LOGGER.debug("Fire transition(state=deployed, action=\"configure\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.configure();
+ }
+
+ status = cmtool.configure(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.INACTIVE))
+ setOcciAppState(Status.INACTIVE);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
- // Start of user code Sensor_Kind_configure_action
+ // Start of user code Sensor_Kind_Start_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: configure
- * - title:
+ * - term: start
+ * - title: Start the application.
*/
@Override
- public void configure()
+ public void start()
{
- LOGGER.debug("Action configure() called on " + this);
+ int status = -1;
+ LOGGER.debug("Action start() called on " + this);
+
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
+
+ case Status.INACTIVE_VALUE:
+ LOGGER.debug("Fire transition(state=inactive, action=\"start\")...");
+ for (Component component: this.getConnectedComponents()) {
+ component.start();
+ }
+ status = cmtool.start(this);
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.ACTIVE))
+ setOcciAppState(Status.ACTIVE);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
- // TODO: Implement how to configure this sensor.
+
+ case Status.UNDEPLOYED_VALUE:
+ LOGGER.debug("Fire transition(state=undeployed, action=\"start\")...");
+ // First deploy components
+ for (Component component: this.getConnectedComponents()) {
+ component.deploy();
+ }
+ this.deploy();
+
+ // then configure them
+ for (Component component: this.getConnectedComponents()) {
+ component.configure();
+ }
+ this.configure();
+
+ // then start them
+ for (Component component: this.getConnectedComponents()) {
+ component.start();
+ }
+ status = cmtool.start(this);
+
+ if (status == 0 && assertCompsStatusEquals(getConnectedComponents(), Status.ACTIVE))
+ setOcciAppState(Status.ACTIVE);
+ else
+ setOcciAppState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
+ private List<Component> getConnectedComponents() {
+ LinkedList<Component> connectedComponents = new LinkedList<Component>();
+ for (Link link: this.getLinks()) {
+ if (link instanceof Componentlink) {
+ connectedComponents.add((Component) link.getTarget());
+ }
+ }
+ return connectedComponents;
+ }
+
+ private boolean assertCompsStatusEquals(List<Component> components, Status status) {
+ for (Component component: components) {
+ if (component.getOcciComponentState().getValue() != status.getValue()) {
+ LOGGER.debug("Missmatching state of component " + component.getTitle() + " detected. "
+ + "Expected " + status.getName() + " but was "
+ + component.getOcciComponentState().getName() + ".");
+ return false;
+ }
+ }
+ return true;
+}
}
diff --git a/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
index 1752c9353159a3382e3f642e31d09b45ee82f7c4..b1886adb46c085de842f1283c1a3c25151bfc988 100644
--- a/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.examples/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
+connection.project.dir=..
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/DeployHadoopMonitoringTest.java b/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/DeployHadoopMonitoringTest.java
index f1a28f5e29b5b31e1d9ce824544bcca28bbd4941..faf50950ede4e3cf0b406ebf616b716c270fdcab 100644
--- a/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/DeployHadoopMonitoringTest.java
+++ b/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/DeployHadoopMonitoringTest.java
@@ -69,21 +69,8 @@ public class DeployHadoopMonitoringTest {
}
-
@Test
- public void resolveProxies() {
- System.out.println("HALLO");
- System.out.println(OCCIPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
-
-
- MonitoringPackage.eINSTANCE.eClass();
-
-
- OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
- MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
-
- System.out.println(EPackage.Registry.INSTANCE.get(MonitoringPackage.eNS_URI));
-
+public void resolveProxies() {
Path newOCCI = Paths.get(de.ugoe.cs.rwm.docci.ModelUtility.getPathToResource("occi/hadoopClusterNewExt.occic"));
diff --git a/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/TestUtility.java b/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/TestUtility.java
index affab297b6eb8147c14a60232731e2f01cab6a78..cf12fecc9f3e20f5ac4ced235b2f23168164f411 100644
--- a/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/TestUtility.java
+++ b/de.ugoe.cs.rwm.mocci.examples/src/test/java/de/ugoe/cs/rwm/mocci/examples/TestUtility.java
@@ -43,6 +43,10 @@ public class TestUtility {
WorkflowPackage.eINSTANCE.eClass();
OssweruntimePackage.eINSTANCE.eClass();
AnsibleconfigurationPackage.eINSTANCE.eClass();
+
+
+
+
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/modmacao#",
ModmacaoPackage.class.getClassLoader().getResource("model/modmacao.occie").toString());
diff --git a/de.ugoe.cs.rwm.mocci.examples/src/test/resources/occi/hadoopClusterNewExt.occic b/de.ugoe.cs.rwm.mocci.examples/src/test/resources/occi/hadoopClusterNewExt.occic
index 007729bbd188dd1510d1cedbc1f0dc47159877cc..fafebb0111797ff5a375d2cded1e5364934c5aa7 100644
--- a/de.ugoe.cs.rwm.mocci.examples/src/test/resources/occi/hadoopClusterNewExt.occic
+++ b/de.ugoe.cs.rwm.mocci.examples/src/test/resources/occi/hadoopClusterNewExt.occic
@@ -9,21 +9,7 @@
<use href="http://schemas.modmacao.org/modmacao#/"/>
<use href="http://schemas.modmacao.org/openstack/swe#/"/>
<use href="http://schemas.ugoe.cs.rwm/monitoring#/"/>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590" title="management" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/" rlinks="//@resources.1/@links.0 //@resources.5/@links.0" occiNetworkState="active">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
- <attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590"/>
- <attributes name="occi.core.title" value="management"/>
- <attributes name="occi.core.summary" value=""/>
- <attributes name="occi.network.vlan" value="0"/>
- <attributes name="occi.network.label" value=""/>
- <attributes name="occi.network.state" value="active"/>
- <attributes name="occi.network.state.message" value=""/>
- <parts>
- <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
- <attributes name="openstack.runtime.id" value="718eaf4e-cc2b-4f19-9347-8ba8a045c515"/>
- </parts>
- </resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.3/@links.0 //@resources.2/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.2/@links.0 //@resources.1/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
<attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce"/>
<attributes name="occi.core.title" value="hadoop-master"/>
@@ -47,18 +33,7 @@
<parts>
<mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
</parts>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag" title="link1" location="/networkinterface/urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag/" target="//@resources.0" occiNetworkinterfaceInterface="" occiNetworkinterfaceMac="" occiNetworkinterfaceStateMessage="">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
- <attributes name="occi.core.id" value="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag"/>
- <attributes name="occi.core.title" value="link1"/>
- <attributes name="occi.networkinterface.address" value="10.0.0.25"/>
- <attributes name="occi.networkinterface.gateway" value="10.0.0.254"/>
- <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
- <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.25" occiNetworkinterfaceGateway="10.0.0.254">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
- </parts>
- </links>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.7">
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.6">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
<attributes name="occi.core.id" value="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
<attributes name="occi.core.title" value="link3"/>
@@ -67,6 +42,15 @@
<mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
</parts>
</links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d" title="monNwLink" target="//@resources.12" occiNetworkinterfaceInterface="100.254.1.35" occiNetworkinterfaceMac="">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d"/>
+ <attributes name="occi.core.title" value="monNwLink"/>
+ <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
</resources>
<resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896" title="Wordcount" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
@@ -76,13 +60,13 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.0"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.1">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.0">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929"/>
<attributes name="occi.core.title" value="link1"/>
</links>
</resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.4/@links.0" occiComponentStateMessage="">
+ <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.3/@links.0 //@resources.8/@links.0" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897"/>
<attributes name="occi.core.title" value="hMaster"/>
@@ -90,30 +74,35 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.1"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.1">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.0">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928"/>
<attributes name="occi.core.title" value="link1"/>
<attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
<attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
</links>
+ <links id="urn:uuid:ebf794ac-30aa-4955-b421-62cc794d6654" title="link2" target="//@resources.12">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ebf794ac-30aa-4955-b421-62cc794d6654"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </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">
<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"/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.3">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.2">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef"/>
<attributes name="occi.core.title" value="ComponentLink"/>
</links>
- <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.6">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.5">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1"/>
<attributes name="occi.core.title" value="link4"/>
</links>
</resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.6/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
<attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
<attributes name="occi.core.title" value="hadoop-worker-1"/>
@@ -137,24 +126,7 @@
<parts>
<mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
</parts>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah" title="link1" location="/networkinterface/urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah/" target="//@resources.0" occiNetworkinterfaceInterface="" occiNetworkinterfaceMac="" occiNetworkinterfaceStateMessage="">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
- <attributes name="occi.core.id" value="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah"/>
- <attributes name="occi.core.title" value="link1"/>
- <attributes name="occi.networkinterface.interface" value=""/>
- <attributes name="occi.networkinterface.mac" value=""/>
- <attributes name="occi.networkinterface.state" value="active"/>
- <attributes name="occi.networkinterface.state.message" value=""/>
- <attributes name="occi.networkinterface.address" value="10.0.0.15"/>
- <attributes name="occi.networkinterface.gateway" value="10.0.0.254"/>
- <attributes name="occi.networkinterface.allocation" value="dynamic"/>
- <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
- <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
- <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.15" occiNetworkinterfaceGateway="10.0.0.254">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
- </parts>
- </links>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.7">
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.6">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
<attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
<attributes name="occi.core.title" value="link2"/>
@@ -164,7 +136,7 @@
</parts>
</links>
</resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.4/@links.1" occiComponentStateMessage="">
+ <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.3/@links.1" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
<attributes name="occi.core.title" value="Worker"/>
@@ -172,14 +144,14 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.2"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.5">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.4">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917"/>
<attributes name="occi.core.title" value="link1"/>
<attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
</links>
</resources>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.1/@links.1 //@resources.5/@links.1" occiNetworkState="active">
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.0/@links.0 //@resources.4/@links.0" occiNetworkState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
<attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
<attributes name="occi.core.title" value="hNetwork"/>
@@ -193,10 +165,10 @@
<attributes name="occi.network.address" value="10.254.1.1/24"/>
</parts>
</resources>
- <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="resource10">
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor">
<kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
<attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
- <attributes name="occi.core.title" value="resource10"/>
+ <attributes name="occi.core.title" value="Sensor"/>
<attributes name="occi.core.summary" value=""/>
<attributes name="occi.sensor.timebase" value=""/>
<attributes name="occi.sensor.timestart" value=""/>
@@ -204,42 +176,100 @@
<attributes name="occi.sensor.period" value=""/>
<attributes name="occi.sensor.granularity" value=""/>
<attributes name="occi.sensor.accuracy" value=""/>
- <attributes name="occi.component.state" value=""/>
- <attributes name="occi.component.message" value=""/>
- <attributes name="occi.component.state.message" value=""/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1">
+ <attributes name="occi.app.state" value="undeployed"/>
+ <attributes name="occi.app.state.message" value=""/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
<attributes name="occi.core.title" value="link1"/>
</links>
- <links xsi:type="placement:Placementlink" id="urn:uuid:c10d9e3e-fc69-45c7-bf3b-855b9e33efce" title="link2">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" target="//@resources.9">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" target="//@resources.10">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
+ <attributes name="occi.core.title" value="link3"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" rlinks="//@resources.7/@links.0 //@resources.9/@links.0">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
+ <attributes name="occi.core.id" value="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48"/>
+ <attributes name="occi.core.title" value="DataGatherer"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.2">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:c10d9e3e-fc69-45c7-bf3b-855b9e33efce"/>
+ <attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
+ <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
+ <attributes name="occi.core.title" value="Processor"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" target="//@resources.8">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
<attributes name="occi.core.title" value="link2"/>
</links>
</resources>
- <resources xsi:type="monitoring:Sensor" id="urn:uuid:54d120dc-a2cd-43c1-acc1-54a86be23863" title="resource11" location="">
- <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
- <attributes name="occi.core.id" value="urn:uuid:54d120dc-a2cd-43c1-acc1-54a86be23863"/>
- <attributes name="occi.core.title" value="resource11"/>
- <attributes name="occi.core.summary" value=""/>
- <attributes name="occi.sensor.timebase" value=""/>
- <attributes name="occi.sensor.timestart" value=""/>
- <attributes name="occi.sensor.timestop" value=""/>
- <attributes name="occi.sensor.period" value=""/>
- <attributes name="occi.sensor.granularity" value=""/>
- <attributes name="occi.sensor.accuracy" value=""/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:1ce660ef-24b1-4d9c-a46b-ba91ce864179" title="link1">
+ <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" rlinks="//@resources.7/@links.2">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
+ <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
+ <attributes name="occi.core.title" value="Publisher"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" target="//@resources.9">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:1ce660ef-24b1-4d9c-a46b-ba91ce864179"/>
+ <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
<attributes name="occi.core.title" value="link1"/>
</links>
- <links xsi:type="placement:Placementlink" id="urn:uuid:33b4e50b-77db-47d5-b77b-8f07d9c03b55" title="link2">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" target="//@resources.11">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:33b4e50b-77db-47d5-b77b-8f07d9c03b55"/>
+ <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
<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" occiComputeState="inactive">
+ <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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.compute.architecture" value="x86"/>
+ <attributes name="occi.compute.cores" value="2"/>
+ <attributes name="occi.compute.hostname" value="hadoop-worker-1"/>
+ <attributes name="occi.compute.share" value="0"/>
+ <attributes name="occi.compute.speed" value="0"/>
+ <attributes name="occi.compute.memory" value="4096"/>
+ <attributes name="occi.compute.state" value="active"/>
+ <attributes name="occi.compute.state.message" value=""/>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed" title="link1" target="//@resources.12">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.25">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.2/@links.1 //@resources.0/@links.1" occiNetworkState="inactive">
+ <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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.network.vlan" value="0"/>
+ <attributes name="occi.network.label" value=""/>
+ <attributes name="occi.network.state" value="active"/>
+ <attributes name="occi.network.state.message" value=""/>
+ <parts>
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="100.254.1.1/24"/>
+ </parts>
+ </resources>
<mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
<mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
<mixins name="hWorker" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker"/>
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.model.edit/.settings/org.eclipse.buildship.core.prefs
index 1752c9353159a3382e3f642e31d09b45ee82f7c4..b1886adb46c085de842f1283c1a3c25151bfc988 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.model.edit/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
+connection.project.dir=..
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/build/resources/main/plugin.properties b/de.ugoe.cs.rwm.mocci.model.edit/build/resources/main/plugin.properties
index 44ac0a6bd8592f3b7bd7eaf34c85b39412dcf9f2..797626398c73ecf9b3fd41dfee05a47696d8b2cb 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/build/resources/main/plugin.properties
+++ b/de.ugoe.cs.rwm.mocci.model.edit/build/resources/main/plugin.properties
@@ -49,3 +49,6 @@ _UI_Datagatherer_occiCollectorGranularity_feature = Occi Collector Granularity
_UI_Datagatherer_occiCollectorAccuracy_feature = Occi Collector Accuracy
_UI_Monitoringattribute_monitoringAttributeName_feature = Monitoring Attribute Name
_UI_Monitoringattribute_monitoringAttributeValue_feature = Monitoring Attribute Value
+_UI_Monitoringproperty_type = Monitoringproperty
+_UI_Monitoringproperty_monitoringAttributeName_feature = Monitoring Attribute Name
+_UI_Monitoringproperty_monitoringAttributeValue_feature = Monitoring Attribute Value
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitoringproperty.gif b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitoringproperty.gif
new file mode 100644
index 0000000000000000000000000000000000000000..10d222998af0a3a571390bae7e117c9964ec1562
Binary files /dev/null and b/de.ugoe.cs.rwm.mocci.model.edit/icons/full/obj16/Monitoringproperty.gif differ
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
index 44ac0a6bd8592f3b7bd7eaf34c85b39412dcf9f2..797626398c73ecf9b3fd41dfee05a47696d8b2cb 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
+++ b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
@@ -49,3 +49,6 @@ _UI_Datagatherer_occiCollectorGranularity_feature = Occi Collector Granularity
_UI_Datagatherer_occiCollectorAccuracy_feature = Occi Collector Accuracy
_UI_Monitoringattribute_monitoringAttributeName_feature = Monitoring Attribute Name
_UI_Monitoringattribute_monitoringAttributeValue_feature = Monitoring Attribute Value
+_UI_Monitoringproperty_type = Monitoringproperty
+_UI_Monitoringproperty_monitoringAttributeName_feature = Monitoring Attribute Name
+_UI_Monitoringproperty_monitoringAttributeValue_feature = Monitoring Attribute Value
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
index b23afa977b3f78fa8ad9cd52487eadb2740642b0..b9a91f9a78274263da3149ad0f2dff7bf09056aa 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/DatagathererItemProvider.java
@@ -196,7 +196,7 @@ public class DatagathererItemProvider extends ComponentItemProvider {
newChildDescriptors.add
(createChildParameter
(OCCIPackage.Literals.ENTITY__PARTS,
- MonitoringFactory.eINSTANCE.createMonitoringattribute()));
+ MonitoringFactory.eINSTANCE.createMonitoringproperty()));
}
/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
index 7e01ba55a180a6cbb2ab9362532ff56d264e583f..62a7c898bf6695d59cea31aa9ce9d7aec5062e54 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringItemProviderAdapterFactory.java
@@ -174,26 +174,26 @@ public class MonitoringItemProviderAdapterFactory extends MonitoringAdapterFacto
}
/**
- * This keeps track of the one adapter used for all {@link monitoring.Monitoringattribute} instances.
+ * This keeps track of the one adapter used for all {@link monitoring.Monitoringproperty} instances.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected MonitoringattributeItemProvider monitoringattributeItemProvider;
+ protected MonitoringpropertyItemProvider monitoringpropertyItemProvider;
/**
- * This creates an adapter for a {@link monitoring.Monitoringattribute}.
+ * This creates an adapter for a {@link monitoring.Monitoringproperty}.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
- public Adapter createMonitoringattributeAdapter() {
- if (monitoringattributeItemProvider == null) {
- monitoringattributeItemProvider = new MonitoringattributeItemProvider(this);
+ public Adapter createMonitoringpropertyAdapter() {
+ if (monitoringpropertyItemProvider == null) {
+ monitoringpropertyItemProvider = new MonitoringpropertyItemProvider(this);
}
- return monitoringattributeItemProvider;
+ return monitoringpropertyItemProvider;
}
/**
@@ -299,7 +299,7 @@ public class MonitoringItemProviderAdapterFactory extends MonitoringAdapterFacto
if (datagathererItemProvider != null) datagathererItemProvider.dispose();
if (processorItemProvider != null) processorItemProvider.dispose();
if (publisherItemProvider != null) publisherItemProvider.dispose();
- if (monitoringattributeItemProvider != null) monitoringattributeItemProvider.dispose();
+ if (monitoringpropertyItemProvider != null) monitoringpropertyItemProvider.dispose();
}
}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringattributeItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
similarity index 79%
rename from de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringattributeItemProvider.java
rename to de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
index 9b1253bec522cb6d3006cb5ccd18f3df69a995f7..4ea0ab15a710371f133d7f6c35a1aa212644fab8 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringattributeItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
@@ -17,7 +17,7 @@ import java.util.Collection;
import java.util.List;
import monitoring.MonitoringPackage;
-import monitoring.Monitoringattribute;
+import monitoring.Monitoringproperty;
import org.eclipse.cmf.occi.core.provider.MixinBaseItemProvider;
@@ -32,19 +32,19 @@ import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
import org.eclipse.emf.edit.provider.ViewerNotification;
/**
- * This is the item provider adapter for a {@link monitoring.Monitoringattribute} object.
+ * This is the item provider adapter for a {@link monitoring.Monitoringproperty} object.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
-public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
+public class MonitoringpropertyItemProvider extends MixinBaseItemProvider {
/**
* This constructs an instance from a factory and a notifier.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public MonitoringattributeItemProvider(AdapterFactory adapterFactory) {
+ public MonitoringpropertyItemProvider(AdapterFactory adapterFactory) {
super(adapterFactory);
}
@@ -76,9 +76,9 @@ public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Monitoringattribute_monitoringAttributeName_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Monitoringattribute_monitoringAttributeName_feature", "_UI_Monitoringattribute_type"),
- MonitoringPackage.Literals.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME,
+ getString("_UI_Monitoringproperty_monitoringAttributeName_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringAttributeName_feature", "_UI_Monitoringproperty_type"),
+ MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME,
true,
false,
false,
@@ -98,9 +98,9 @@ public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Monitoringattribute_monitoringAttributeValue_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Monitoringattribute_monitoringAttributeValue_feature", "_UI_Monitoringattribute_type"),
- MonitoringPackage.Literals.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE,
+ getString("_UI_Monitoringproperty_monitoringAttributeValue_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringAttributeValue_feature", "_UI_Monitoringproperty_type"),
+ MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE,
true,
false,
false,
@@ -110,14 +110,14 @@ public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
}
/**
- * This returns Monitoringattribute.gif.
+ * This returns Monitoringproperty.gif.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
@Override
public Object getImage(Object object) {
- return overlayImage(object, getResourceLocator().getImage("full/obj16/Monitoringattribute"));
+ return overlayImage(object, getResourceLocator().getImage("full/obj16/Monitoringproperty"));
}
/**
@@ -128,10 +128,10 @@ public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
*/
@Override
public String getText(Object object) {
- String label = ((Monitoringattribute)object).getMonitoringAttributeName();
+ String label = ((Monitoringproperty)object).getMonitoringAttributeName();
return label == null || label.length() == 0 ?
- getString("_UI_Monitoringattribute_type") :
- getString("_UI_Monitoringattribute_type") + " " + label;
+ getString("_UI_Monitoringproperty_type") :
+ getString("_UI_Monitoringproperty_type") + " " + label;
}
@@ -146,9 +146,9 @@ public class MonitoringattributeItemProvider extends MixinBaseItemProvider {
public void notifyChanged(Notification notification) {
updateChildren(notification);
- switch (notification.getFeatureID(Monitoringattribute.class)) {
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME:
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE:
+ switch (notification.getFeatureID(Monitoringproperty.class)) {
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java
index 07646b2158791df2ae0cbbe12ebc5383aca43426..77368a3e93c16dc2e05672c986aec0cacb1d5c78 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/ProcessorItemProvider.java
@@ -115,7 +115,7 @@ public class ProcessorItemProvider extends ComponentItemProvider {
newChildDescriptors.add
(createChildParameter
(OCCIPackage.Literals.ENTITY__PARTS,
- MonitoringFactory.eINSTANCE.createMonitoringattribute()));
+ MonitoringFactory.eINSTANCE.createMonitoringproperty()));
}
/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java
index 04ca9c0eb19ce91277e5081256909d7465fc288f..f3221a3eda4097f73b22d2aeef253051ac52110f 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/PublisherItemProvider.java
@@ -114,7 +114,7 @@ public class PublisherItemProvider extends ComponentItemProvider {
newChildDescriptors.add
(createChildParameter
(OCCIPackage.Literals.ENTITY__PARTS,
- MonitoringFactory.eINSTANCE.createMonitoringattribute()));
+ MonitoringFactory.eINSTANCE.createMonitoringproperty()));
}
/**
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
index b7daa998bbac528b87141dba1f4491bad7cf88a7..dd1ac913555a277a9269632b2f124ca573c03240 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/SensorItemProvider.java
@@ -269,7 +269,7 @@ public class SensorItemProvider extends ApplicationItemProvider {
newChildDescriptors.add
(createChildParameter
(OCCIPackage.Literals.ENTITY__PARTS,
- MonitoringFactory.eINSTANCE.createMonitoringattribute()));
+ MonitoringFactory.eINSTANCE.createMonitoringproperty()));
}
/**
diff --git a/de.ugoe.cs.rwm.mocci.model/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.model/.settings/org.eclipse.buildship.core.prefs
index 1752c9353159a3382e3f642e31d09b45ee82f7c4..b1886adb46c085de842f1283c1a3c25151bfc988 100644
--- a/de.ugoe.cs.rwm.mocci.model/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.model/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
+connection.project.dir=..
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.model/build.properties b/de.ugoe.cs.rwm.mocci.model/build.properties
index 42472361fcc5fe81719fe81371c11d135032a2a0..b802ca66f0c51d452f7a4a7a52e343f4b289ca50 100644
--- a/de.ugoe.cs.rwm.mocci.model/build.properties
+++ b/de.ugoe.cs.rwm.mocci.model/build.properties
@@ -18,4 +18,15 @@ bin.includes = .,\
plugin.xml,\
plugin.properties,\
src-gen/monitoring/,\
- bin/monitoring/
+ bin/monitoring/,\
+ settings.gradle,\
+ representations.aird,\
+ build.properties,\
+ build.gradle,\
+ build/,\
+ README.md,\
+ .settings/,\
+ .project,\
+ .gradle/,\
+ .classpath,\
+ .gitignore
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
index a7dd3fa10ddb3ff7b150f9ec1f9740d201a626d2..479a9581be5acf06582572a43c05196b830a4b73 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
@@ -88,7 +88,7 @@
<details key="documentation" value="Publisher Resource"/>
</eAnnotations>
</eClassifiers>
- <eClassifiers xsi:type="ecore:EClass" name="Monitoringattribute" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//MixinBase">
+ <eClassifiers xsi:type="ecore:EClass" name="Monitoringproperty" eSuperTypes="platform:/plugin/org.eclipse.cmf.occi.core/model/OCCI.ecore#//MixinBase">
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore">
<details key="constraints" value="appliesConstraint"/>
</eAnnotations>
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
index ff66d1c2d2d020bfde866c8bb188ed6f53697c92..43cd2f47575a3ae34c2bba402cec2f76f1f9b925 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
@@ -55,12 +55,12 @@
<ecoreClass href="monitoring.ecore#//Publisher"/>
</genClasses>
<genClasses>
- <ecoreClass href="monitoring.ecore#//Monitoringattribute"/>
+ <ecoreClass href="monitoring.ecore#//Monitoringproperty"/>
<genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringattribute/monitoringAttributeName"/>
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringAttributeName"/>
</genFeatures>
<genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringattribute/monitoringAttributeValue"/>
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringAttributeValue"/>
</genFeatures>
</genClasses>
</genPackages>
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
index fb4f3f3eeb983c071dcdccfe752b603ca808da36..72dcb46435b2e6f7ced8a5635a5ba709752d9b97 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
@@ -3,18 +3,18 @@
<import href="http://schemas.modmacao.org/occi/platform#/"/>
<import href="http://schemas.ogf.org/occi/core#/"/>
<kinds name="Sensor" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Sensor Component">
- <attributes name="occi.sensor.timebase" mutable="true" description="Base time reference (ISO8601)" type="//@types.0"/>
- <attributes name="occi.sensor.timestart" mutable="true" description="Start time offset (seconds)" type="//@types.1"/>
- <attributes name="occi.sensor.timestop" mutable="true" type="//@types.1"/>
- <attributes name="occi.sensor.period" mutable="true" required="true" description="Time between two following measurements (seconds)" type="//@types.1"/>
- <attributes name="occi.sensor.granularity" mutable="true" description="Granularity of time measument (seconds)" type="//@types.1"/>
- <attributes name="occi.sensor.accuracy" mutable="true" description="Accuracy of time measument (seconds)" type="//@types.1"/>
+ <attributes name="occi.sensor.timebase" description="Base time reference (ISO8601)" type="//@types.0"/>
+ <attributes name="occi.sensor.timestart" description="Start time offset (seconds)" type="//@types.1"/>
+ <attributes name="occi.sensor.timestop" type="//@types.1"/>
+ <attributes name="occi.sensor.period" required="true" description="Time between two following measurements (seconds)" type="//@types.1"/>
+ <attributes name="occi.sensor.granularity" description="Granularity of time measument (seconds)" type="//@types.1"/>
+ <attributes name="occi.sensor.accuracy" description="Accuracy of time measument (seconds)" type="//@types.1"/>
<parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']"/>
</kinds>
<kinds name="DataGatherer" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="DataGatherer Resource">
- <attributes name="occi.collector.period" mutable="true" required="true" description="Time between two following measurements (seconds)." type="//@types.1"/>
- <attributes name="occi.collector.granularity" mutable="true" description="Granularity of time measurement (seconds)." type="//@types.1"/>
- <attributes name="occi.collector.accuracy" mutable="true" description="Accuracy of time measurement (seconds)." type="//@types.1"/>
+ <attributes name="occi.collector.period" required="true" description="Time between two following measurements (seconds)." type="//@types.1"/>
+ <attributes name="occi.collector.granularity" description="Granularity of time measurement (seconds)." type="//@types.1"/>
+ <attributes name="occi.collector.accuracy" description="Accuracy of time measurement (seconds)." type="//@types.1"/>
<parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
</kinds>
<kinds name="Processor" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Processor Resource">
@@ -23,9 +23,9 @@
<kinds name="Publisher" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Publisher Resource">
<parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
</kinds>
- <mixins name="MonitoringAttribute" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitoringAttribute Mixin">
+ <mixins name="MonitoringProperty" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitoringProperty Mixin">
<attributes name="monitoring.attribute.name" mutable="false" required="true" type="//@types.2"/>
- <attributes name="monitoring.attribute.value" mutable="true" required="true" type="//@types.2"/>
+ <attributes name="monitoring.attribute.value" required="true" type="//@types.2"/>
<applies href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']"/>
</mixins>
<types xsi:type="occi:StringType" name="DateTime" pattern="^(\d{4}((-)?(0[1-9]|1[0-2])((-)?(0[1-9]|[1-2][0-9]|3[0-1])(T(24:00(:00(\.[0]+)?)?|(([0-1][0-9]|2[0-3])(:)[0-5][0-9])((:)[0-5][0-9](\.[\d]+)?)?)((\+|-)(14:00|(0[0-9]|1[0-3])(:)[0-5][0-9])|Z))?)?)?)$"/>
diff --git a/de.ugoe.cs.rwm.mocci.model/plugin.xml b/de.ugoe.cs.rwm.mocci.model/plugin.xml
index 0fd3ade4e21072b3ba1fe27033ca6ebbda914e00..7aff45899be7c93a903820e383e3587f052c6e37 100644
--- a/de.ugoe.cs.rwm.mocci.model/plugin.xml
+++ b/de.ugoe.cs.rwm.mocci.model/plugin.xml
@@ -21,7 +21,7 @@
<!-- Define URI mapping. -->
<extension point="org.eclipse.emf.ecore.uri_mapping">
- <mapping source="http://schemas.ugoe.cs.rwm/monitoring" target="platform:/plugin/de.ugoe.cs.rwm.mocci/model/monitoring.occie"/>
+ <mapping source="http://schemas.ugoe.cs.rwm/monitoring" target="platform:/plugin/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie"/>
</extension>
<!-- Register the parser for .monitoring files. -->
@@ -54,8 +54,7 @@
<!-- @generated monitoring -->
<package
uri="http://schemas.ugoe.cs.rwm/monitoring/ecore"
- class="monitoring.MonitoringPackage"
- genModel ="model/monitoring.genmodel"/>
+ class="monitoring.MonitoringPackage"/>
</extension>
</plugin>
diff --git a/de.ugoe.cs.rwm.mocci.model/representations.aird b/de.ugoe.cs.rwm.mocci.model/representations.aird
index e688b4cd791ffe7cfa6d45525a0fdd544309f47a..6ebc18ad594d7fe35751a4a4fb70a733e69ea893 100644
--- a/de.ugoe.cs.rwm.mocci.model/representations.aird
+++ b/de.ugoe.cs.rwm.mocci.model/representations.aird
@@ -9,11 +9,11 @@
<semanticResources>model/monitoring.occie</semanticResources>
<semanticResources>http://schemas.modmacao.org/occi/platform</semanticResources>
<semanticResources>http://schemas.ogf.org/occi/core</semanticResources>
- <semanticResources>model/monitoring.ecore</semanticResources>
- <semanticResources>model/monitoring.genmodel</semanticResources>
<semanticResources>build/resources/main/model/monitoring.ecore</semanticResources>
<semanticResources>build/resources/main/model/monitoring.genmodel</semanticResources>
<semanticResources>build/resources/main/model/monitoring.occie</semanticResources>
+ <semanticResources>model/monitoring.ecore</semanticResources>
+ <semanticResources>model/monitoring.genmodel</semanticResources>
<ownedViews xmi:type="viewpoint:DView" xmi:id="_y2oZQPcHEeiCiOA5ZDMQdg">
<viewpoint xmi:type="description:Viewpoint" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']"/>
<ownedRepresentationDescriptors xmi:type="viewpoint:DRepresentationDescriptor" xmi:id="_zR2VoPcHEeiCiOA5ZDMQdg" name="new Extension diagram" repPath="#_zIRi4PcHEeiCiOA5ZDMQdg">
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
index a57f7aef122a8642b3e2528a460484d6ad69204b..f696b65843593e5d8e6c203830a1b119ea5f8d99 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringFactory.java
@@ -68,13 +68,13 @@ public interface MonitoringFactory extends EFactory {
Publisher createPublisher();
/**
- * Returns a new object of class '<em>Monitoringattribute</em>'.
+ * Returns a new object of class '<em>Monitoringproperty</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return a new object of class '<em>Monitoringattribute</em>'.
+ * @return a new object of class '<em>Monitoringproperty</em>'.
* @generated
*/
- Monitoringattribute createMonitoringattribute();
+ Monitoringproperty createMonitoringproperty();
/**
* Returns the package supported by this factory.
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
index 7cd12959c7117a4eecbd16eb63e03d6f75ea2e36..f8dcb04ef2881a079a8bf0851f80694d23cea8c5 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
@@ -1048,14 +1048,14 @@ public interface MonitoringPackage extends EPackage {
int PUBLISHER_OPERATION_COUNT = PlatformPackage.COMPONENT_OPERATION_COUNT + 0;
/**
- * The meta object id for the '{@link monitoring.impl.MonitoringattributeImpl <em>Monitoringattribute</em>}' class.
+ * The meta object id for the '{@link monitoring.impl.MonitoringpropertyImpl <em>Monitoringproperty</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see monitoring.impl.MonitoringattributeImpl
- * @see monitoring.impl.MonitoringPackageImpl#getMonitoringattribute()
+ * @see monitoring.impl.MonitoringpropertyImpl
+ * @see monitoring.impl.MonitoringPackageImpl#getMonitoringproperty()
* @generated
*/
- int MONITORINGATTRIBUTE = 4;
+ int MONITORINGPROPERTY = 4;
/**
* The feature id for the '<em><b>Mixin</b></em>' reference.
@@ -1064,7 +1064,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE__MIXIN = OCCIPackage.MIXIN_BASE__MIXIN;
+ int MONITORINGPROPERTY__MIXIN = OCCIPackage.MIXIN_BASE__MIXIN;
/**
* The feature id for the '<em><b>Entity</b></em>' container reference.
@@ -1073,7 +1073,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE__ENTITY = OCCIPackage.MIXIN_BASE__ENTITY;
+ int MONITORINGPROPERTY__ENTITY = OCCIPackage.MIXIN_BASE__ENTITY;
/**
* The feature id for the '<em><b>Attributes</b></em>' containment reference list.
@@ -1082,7 +1082,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE__ATTRIBUTES = OCCIPackage.MIXIN_BASE__ATTRIBUTES;
+ int MONITORINGPROPERTY__ATTRIBUTES = OCCIPackage.MIXIN_BASE__ATTRIBUTES;
/**
* The feature id for the '<em><b>Monitoring Attribute Name</b></em>' attribute.
@@ -1091,7 +1091,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
+ int MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
/**
* The feature id for the '<em><b>Monitoring Attribute Value</b></em>' attribute.
@@ -1100,16 +1100,16 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
+ int MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
/**
- * The number of structural features of the '<em>Monitoringattribute</em>' class.
+ * The number of structural features of the '<em>Monitoringproperty</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 2;
+ int MONITORINGPROPERTY_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 2;
/**
* The operation id for the '<em>Applies Constraint</em>' operation.
@@ -1118,16 +1118,16 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 0;
+ int MONITORINGPROPERTY___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 0;
/**
- * The number of operations of the '<em>Monitoringattribute</em>' class.
+ * The number of operations of the '<em>Monitoringproperty</em>' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int MONITORINGATTRIBUTE_OPERATION_COUNT = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 1;
+ int MONITORINGPROPERTY_OPERATION_COUNT = OCCIPackage.MIXIN_BASE_OPERATION_COUNT + 1;
/**
* The meta object id for the '<em>Date Time</em>' data type.
@@ -1300,46 +1300,46 @@ public interface MonitoringPackage extends EPackage {
EClass getPublisher();
/**
- * Returns the meta object for class '{@link monitoring.Monitoringattribute <em>Monitoringattribute</em>}'.
+ * Returns the meta object for class '{@link monitoring.Monitoringproperty <em>Monitoringproperty</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for class '<em>Monitoringattribute</em>'.
- * @see monitoring.Monitoringattribute
+ * @return the meta object for class '<em>Monitoringproperty</em>'.
+ * @see monitoring.Monitoringproperty
* @generated
*/
- EClass getMonitoringattribute();
+ EClass getMonitoringproperty();
/**
- * Returns the meta object for the attribute '{@link monitoring.Monitoringattribute#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}'.
+ * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Monitoring Attribute Name</em>'.
- * @see monitoring.Monitoringattribute#getMonitoringAttributeName()
- * @see #getMonitoringattribute()
+ * @see monitoring.Monitoringproperty#getMonitoringAttributeName()
+ * @see #getMonitoringproperty()
* @generated
*/
- EAttribute getMonitoringattribute_MonitoringAttributeName();
+ EAttribute getMonitoringproperty_MonitoringAttributeName();
/**
- * Returns the meta object for the attribute '{@link monitoring.Monitoringattribute#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}'.
+ * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the attribute '<em>Monitoring Attribute Value</em>'.
- * @see monitoring.Monitoringattribute#getMonitoringAttributeValue()
- * @see #getMonitoringattribute()
+ * @see monitoring.Monitoringproperty#getMonitoringAttributeValue()
+ * @see #getMonitoringproperty()
* @generated
*/
- EAttribute getMonitoringattribute_MonitoringAttributeValue();
+ EAttribute getMonitoringproperty_MonitoringAttributeValue();
/**
- * Returns the meta object for the '{@link monitoring.Monitoringattribute#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Applies Constraint</em>}' operation.
+ * Returns the meta object for the '{@link monitoring.Monitoringproperty#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Applies Constraint</em>}' operation.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @return the meta object for the '<em>Applies Constraint</em>' operation.
- * @see monitoring.Monitoringattribute#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
+ * @see monitoring.Monitoringproperty#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map)
* @generated
*/
- EOperation getMonitoringattribute__AppliesConstraint__DiagnosticChain_Map();
+ EOperation getMonitoringproperty__AppliesConstraint__DiagnosticChain_Map();
/**
* Returns the meta object for data type '{@link java.lang.String <em>Date Time</em>}'.
@@ -1511,14 +1511,14 @@ public interface MonitoringPackage extends EPackage {
EClass PUBLISHER = eINSTANCE.getPublisher();
/**
- * The meta object literal for the '{@link monitoring.impl.MonitoringattributeImpl <em>Monitoringattribute</em>}' class.
+ * The meta object literal for the '{@link monitoring.impl.MonitoringpropertyImpl <em>Monitoringproperty</em>}' class.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see monitoring.impl.MonitoringattributeImpl
- * @see monitoring.impl.MonitoringPackageImpl#getMonitoringattribute()
+ * @see monitoring.impl.MonitoringpropertyImpl
+ * @see monitoring.impl.MonitoringPackageImpl#getMonitoringproperty()
* @generated
*/
- EClass MONITORINGATTRIBUTE = eINSTANCE.getMonitoringattribute();
+ EClass MONITORINGPROPERTY = eINSTANCE.getMonitoringproperty();
/**
* The meta object literal for the '<em><b>Monitoring Attribute Name</b></em>' attribute feature.
@@ -1526,7 +1526,7 @@ public interface MonitoringPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EAttribute MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME = eINSTANCE.getMonitoringattribute_MonitoringAttributeName();
+ EAttribute MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME = eINSTANCE.getMonitoringproperty_MonitoringAttributeName();
/**
* The meta object literal for the '<em><b>Monitoring Attribute Value</b></em>' attribute feature.
@@ -1534,7 +1534,7 @@ public interface MonitoringPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EAttribute MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE = eINSTANCE.getMonitoringattribute_MonitoringAttributeValue();
+ EAttribute MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE = eINSTANCE.getMonitoringproperty_MonitoringAttributeValue();
/**
* The meta object literal for the '<em><b>Applies Constraint</b></em>' operation.
@@ -1542,7 +1542,7 @@ public interface MonitoringPackage extends EPackage {
* <!-- end-user-doc -->
* @generated
*/
- EOperation MONITORINGATTRIBUTE___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMonitoringattribute__AppliesConstraint__DiagnosticChain_Map();
+ EOperation MONITORINGPROPERTY___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP = eINSTANCE.getMonitoringproperty__AppliesConstraint__DiagnosticChain_Map();
/**
* The meta object literal for the '<em>Date Time</em>' data type.
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
index 262d509e0abe1edfe1e79a29092a3be5531c23fd..a001adc87f51e034330d1881eed31eecc89b0bca 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringTables.java
@@ -68,11 +68,11 @@ public class MonitoringTables
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.NsURIPackageId PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore = org.eclipse.ocl.pivot.ids.IdManager.getNsURIPackageId("http://schemas.ugoe.cs.rwm/monitoring/ecore", null, monitoring.MonitoringPackage.eINSTANCE);
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Class = monitoring.MonitoringTables.PACKid_$metamodel$.getClassId("Class", 0);
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Entity = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ogf_org_s_occi_s_core_s_ecore.getClassId("Entity", 0);
- public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Monitoringattribute = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Monitoringattribute", 0);
+ public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.ClassId CLSSid_Monitoringproperty = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getClassId("Monitoringproperty", 0);
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.DataTypeId DATAid_DateTime = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getDataTypeId("DateTime", 0);
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.ids.DataTypeId DATAid_Second = monitoring.MonitoringTables.PACKid_http_c_s_s_schemas_ugoe_cs_rwm_s_monitoring_s_ecore.getDataTypeId("Second", 0);
public static final /*@NonInvalid*/ org.eclipse.ocl.pivot.values.IntegerValue INT_0 = org.eclipse.ocl.pivot.utilities.ValueUtil.integerValueOf("0");
- public static final /*@NonInvalid*/ java.lang.String STR_Monitoringattribute_c_c_appliesConstraint = "Monitoringattribute::appliesConstraint";
+ public static final /*@NonInvalid*/ java.lang.String STR_Monitoringproperty_c_c_appliesConstraint = "Monitoringproperty::appliesConstraint";
/**
* The type parameters for templated types and operations.
@@ -104,7 +104,7 @@ public class MonitoringTables
public static final /*@NonNull*/ EcoreExecutorType _Datagatherer = new EcoreExecutorType(MonitoringPackage.Literals.DATAGATHERER, PACKAGE, 0);
public static final /*@NonNull*/ EcoreExecutorType _DateTime = new EcoreExecutorType("DateTime", PACKAGE, 0);
- public static final /*@NonNull*/ EcoreExecutorType _Monitoringattribute = new EcoreExecutorType(MonitoringPackage.Literals.MONITORINGATTRIBUTE, PACKAGE, 0);
+ public static final /*@NonNull*/ EcoreExecutorType _Monitoringproperty = new EcoreExecutorType(MonitoringPackage.Literals.MONITORINGPROPERTY, PACKAGE, 0);
public static final /*@NonNull*/ EcoreExecutorType _Processor = new EcoreExecutorType(MonitoringPackage.Literals.PROCESSOR, PACKAGE, 0);
public static final /*@NonNull*/ EcoreExecutorType _Publisher = new EcoreExecutorType(MonitoringPackage.Literals.PUBLISHER, PACKAGE, 0);
public static final /*@NonNull*/ EcoreExecutorType _Second = new EcoreExecutorType("Second", PACKAGE, 0);
@@ -114,7 +114,7 @@ public class MonitoringTables
private static final /*@NonNull*/ EcoreExecutorType /*@NonNull*/ [] types = {
_Datagatherer,
_DateTime,
- _Monitoringattribute,
+ _Monitoringproperty,
_Processor,
_Publisher,
_Second,
@@ -155,10 +155,10 @@ public class MonitoringTables
private static final /*@NonNull*/ ExecutorFragment _DateTime__DateTime = new ExecutorFragment(Types._DateTime, MonitoringTables.Types._DateTime);
private static final /*@NonNull*/ ExecutorFragment _DateTime__OclAny = new ExecutorFragment(Types._DateTime, OCLstdlibTables.Types._OclAny);
- private static final /*@NonNull*/ ExecutorFragment _Monitoringattribute__MixinBase = new ExecutorFragment(Types._Monitoringattribute, OCCITables.Types._MixinBase);
- private static final /*@NonNull*/ ExecutorFragment _Monitoringattribute__Monitoringattribute = new ExecutorFragment(Types._Monitoringattribute, MonitoringTables.Types._Monitoringattribute);
- private static final /*@NonNull*/ ExecutorFragment _Monitoringattribute__OclAny = new ExecutorFragment(Types._Monitoringattribute, OCLstdlibTables.Types._OclAny);
- private static final /*@NonNull*/ ExecutorFragment _Monitoringattribute__OclElement = new ExecutorFragment(Types._Monitoringattribute, OCLstdlibTables.Types._OclElement);
+ private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__MixinBase = new ExecutorFragment(Types._Monitoringproperty, OCCITables.Types._MixinBase);
+ private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__Monitoringproperty = new ExecutorFragment(Types._Monitoringproperty, MonitoringTables.Types._Monitoringproperty);
+ private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__OclAny = new ExecutorFragment(Types._Monitoringproperty, OCLstdlibTables.Types._OclAny);
+ private static final /*@NonNull*/ ExecutorFragment _Monitoringproperty__OclElement = new ExecutorFragment(Types._Monitoringproperty, OCLstdlibTables.Types._OclElement);
private static final /*@NonNull*/ ExecutorFragment _Processor__Component = new ExecutorFragment(Types._Processor, PlatformTables.Types._Component);
private static final /*@NonNull*/ ExecutorFragment _Processor__Entity = new ExecutorFragment(Types._Processor, OCCITables.Types._Entity);
@@ -348,8 +348,8 @@ public class MonitoringTables
public static final /*@NonNull*/ ExecutorProperty _Datagatherer__occiCollectorGranularity = new EcoreExecutorProperty(MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_GRANULARITY, Types._Datagatherer, 1);
public static final /*@NonNull*/ ExecutorProperty _Datagatherer__occiCollectorPeriod = new EcoreExecutorProperty(MonitoringPackage.Literals.DATAGATHERER__OCCI_COLLECTOR_PERIOD, Types._Datagatherer, 2);
- public static final /*@NonNull*/ ExecutorProperty _Monitoringattribute__monitoringAttributeName = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME, Types._Monitoringattribute, 0);
- public static final /*@NonNull*/ ExecutorProperty _Monitoringattribute__monitoringAttributeValue = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE, Types._Monitoringattribute, 1);
+ public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringAttributeName = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME, Types._Monitoringproperty, 0);
+ public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringAttributeValue = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE, Types._Monitoringproperty, 1);
public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorAccuracy = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_ACCURACY, Types._Sensor, 0);
public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorGranularity = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_GRANULARITY, Types._Sensor, 1);
@@ -394,14 +394,14 @@ public class MonitoringTables
};
private static final int /*@NonNull*/ [] __DateTime = { 1,1 };
- private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Monitoringattribute =
+ private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Monitoringproperty =
{
- Fragments._Monitoringattribute__OclAny /* 0 */,
- Fragments._Monitoringattribute__OclElement /* 1 */,
- Fragments._Monitoringattribute__MixinBase /* 2 */,
- Fragments._Monitoringattribute__Monitoringattribute /* 3 */
+ Fragments._Monitoringproperty__OclAny /* 0 */,
+ Fragments._Monitoringproperty__OclElement /* 1 */,
+ Fragments._Monitoringproperty__MixinBase /* 2 */,
+ Fragments._Monitoringproperty__Monitoringproperty /* 3 */
};
- private static final int /*@NonNull*/ [] __Monitoringattribute = { 1,1,1,1 };
+ private static final int /*@NonNull*/ [] __Monitoringproperty = { 1,1,1,1 };
private static final /*@NonNull*/ ExecutorFragment /*@NonNull*/ [] _Processor =
{
@@ -458,7 +458,7 @@ public class MonitoringTables
static {
Types._Datagatherer.initFragments(_Datagatherer, __Datagatherer);
Types._DateTime.initFragments(_DateTime, __DateTime);
- Types._Monitoringattribute.initFragments(_Monitoringattribute, __Monitoringattribute);
+ Types._Monitoringproperty.initFragments(_Monitoringproperty, __Monitoringproperty);
Types._Processor.initFragments(_Processor, __Processor);
Types._Publisher.initFragments(_Publisher, __Publisher);
Types._Second.initFragments(_Second, __Second);
@@ -548,9 +548,9 @@ public class MonitoringTables
OCLstdlibTables.Operations._OclAny__toString /* toString() */
};
- private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringattribute__Monitoringattribute = {};
- private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringattribute__MixinBase = {};
- private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringattribute__OclAny = {
+ private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__Monitoringproperty = {};
+ private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__MixinBase = {};
+ private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__OclAny = {
OCLstdlibTables.Operations._OclAny___lt__gt_ /* _'<>'(OclSelf[?]) */,
OCLstdlibTables.Operations._OclAny___eq_ /* _'='(OclSelf[?]) */,
OCLstdlibTables.Operations._OclAny__oclAsSet /* oclAsSet() */,
@@ -567,7 +567,7 @@ public class MonitoringTables
OCLstdlibTables.Operations._OclAny__oclTypes /* oclTypes() */,
OCLstdlibTables.Operations._OclAny__toString /* toString() */
};
- private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringattribute__OclElement = {
+ private static final /*@NonNull*/ ExecutorOperation /*@NonNull*/ [] _Monitoringproperty__OclElement = {
OCLstdlibTables.Operations._OclElement__allInstances /* allInstances() */,
OCLstdlibTables.Operations._OclElement__oclAsModelType /* oclAsModelType(TT)(TT[?]) */,
OCLstdlibTables.Operations._OclElement__oclContainer /* oclContainer() */,
@@ -817,10 +817,10 @@ public class MonitoringTables
Fragments._DateTime__DateTime.initOperations(_DateTime__DateTime);
Fragments._DateTime__OclAny.initOperations(_DateTime__OclAny);
- Fragments._Monitoringattribute__MixinBase.initOperations(_Monitoringattribute__MixinBase);
- Fragments._Monitoringattribute__Monitoringattribute.initOperations(_Monitoringattribute__Monitoringattribute);
- Fragments._Monitoringattribute__OclAny.initOperations(_Monitoringattribute__OclAny);
- Fragments._Monitoringattribute__OclElement.initOperations(_Monitoringattribute__OclElement);
+ Fragments._Monitoringproperty__MixinBase.initOperations(_Monitoringproperty__MixinBase);
+ Fragments._Monitoringproperty__Monitoringproperty.initOperations(_Monitoringproperty__Monitoringproperty);
+ Fragments._Monitoringproperty__OclAny.initOperations(_Monitoringproperty__OclAny);
+ Fragments._Monitoringproperty__OclElement.initOperations(_Monitoringproperty__OclElement);
Fragments._Processor__Component.initOperations(_Processor__Component);
Fragments._Processor__Entity.initOperations(_Processor__Entity);
@@ -877,9 +877,9 @@ public class MonitoringTables
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _DateTime = {};
- private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Monitoringattribute = {
- MonitoringTables.Properties._Monitoringattribute__monitoringAttributeName,
- MonitoringTables.Properties._Monitoringattribute__monitoringAttributeValue
+ private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Monitoringproperty = {
+ MonitoringTables.Properties._Monitoringproperty__monitoringAttributeName,
+ MonitoringTables.Properties._Monitoringproperty__monitoringAttributeValue
};
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Processor = {};
@@ -905,7 +905,7 @@ public class MonitoringTables
static {
Fragments._Datagatherer__Datagatherer.initProperties(_Datagatherer);
Fragments._DateTime__DateTime.initProperties(_DateTime);
- Fragments._Monitoringattribute__Monitoringattribute.initProperties(_Monitoringattribute);
+ Fragments._Monitoringproperty__Monitoringproperty.initProperties(_Monitoringproperty);
Fragments._Processor__Processor.initProperties(_Processor);
Fragments._Publisher__Publisher.initProperties(_Publisher);
Fragments._Second__Second.initProperties(_Second);
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
new file mode 100644
index 0000000000000000000000000000000000000000..1d558817b525d52cd797428878042eb474ce89bb
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
@@ -0,0 +1,99 @@
+/**
+ * Copyright (c) 2015-2017 Obeo, Inria
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * - William Piers <william.piers@obeo.fr>
+ * - Philippe Merle <philippe.merle@inria.fr>
+ * - Faiez Zalila <faiez.zalila@inria.fr>
+ */
+package monitoring;
+
+import java.util.Map;
+
+import org.eclipse.cmf.occi.core.MixinBase;
+
+import org.eclipse.emf.common.util.DiagnosticChain;
+
+/**
+ * <!-- begin-user-doc -->
+ * A representation of the model object '<em><b>Monitoringproperty</b></em>'.
+ * <!-- end-user-doc -->
+ *
+ * <p>
+ * The following features are supported:
+ * </p>
+ * <ul>
+ * <li>{@link monitoring.Monitoringproperty#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}</li>
+ * <li>{@link monitoring.Monitoringproperty#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}</li>
+ * </ul>
+ *
+ * @see monitoring.MonitoringPackage#getMonitoringproperty()
+ * @model annotation="http://www.eclipse.org/emf/2002/Ecore constraints='appliesConstraint'"
+ * @generated
+ */
+public interface Monitoringproperty extends MixinBase {
+ /**
+ * Returns the value of the '<em><b>Monitoring Attribute Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ *
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Monitoring Attribute Name</em>' attribute.
+ * @see #setMonitoringAttributeName(String)
+ * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringAttributeName()
+ * @model dataType="monitoring.String" required="true"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringAttributeName'"
+ * @generated
+ */
+ String getMonitoringAttributeName();
+
+ /**
+ * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Monitoring Attribute Name</em>' attribute.
+ * @see #getMonitoringAttributeName()
+ * @generated
+ */
+ void setMonitoringAttributeName(String value);
+
+ /**
+ * Returns the value of the '<em><b>Monitoring Attribute Value</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ *
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Monitoring Attribute Value</em>' attribute.
+ * @see #setMonitoringAttributeValue(String)
+ * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringAttributeValue()
+ * @model dataType="monitoring.String" required="true"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringAttributeValue'"
+ * @generated
+ */
+ String getMonitoringAttributeValue();
+
+ /**
+ * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Monitoring Attribute Value</em>' attribute.
+ * @see #getMonitoringAttributeValue()
+ * @generated
+ */
+ void setMonitoringAttributeValue(String value);
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @model annotation="http://www.eclipse.org/emf/2002/GenModel body='/**\n *\n * inv appliesConstraint:\n * let\n * severity : Integer[1] = \'Monitoringproperty::appliesConstraint\'.getSeverity()\n * in\n * if severity <= 0\n * then true\n * else\n * let\n * result : occi::Boolean[1] = self.entity.oclIsKindOf(occi::Entity)\n * in\n * \'Monitoringproperty::appliesConstraint\'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)\n * endif\n \052/\nfinal /*@NonInvalid\052/ <%org.eclipse.ocl.pivot.evaluation.Executor%> executor = <%org.eclipse.ocl.pivot.internal.utilities.PivotUtilInternal%>.getExecutor(this);\nfinal /*@NonInvalid\052/ <%org.eclipse.ocl.pivot.ids.IdResolver%> idResolver = executor.getIdResolver();\nfinal /*@NonInvalid\052/ <%org.eclipse.ocl.pivot.values.IntegerValue%> severity_0 = <%org.eclipse.ocl.pivot.library.string.CGStringGetSeverityOperation%>.INSTANCE.evaluate(executor, <%monitoring.MonitoringTables%>.STR_Monitoringproperty_c_c_appliesConstraint);\nfinal /*@NonInvalid\052/ boolean le = <%org.eclipse.ocl.pivot.library.oclany.OclComparableLessThanEqualOperation%>.INSTANCE.evaluate(executor, severity_0, <%monitoring.MonitoringTables%>.INT_0).booleanValue();\n/*@NonInvalid\052/ boolean symbol_0;\nif (le) {\n\tsymbol_0 = <%org.eclipse.ocl.pivot.utilities.ValueUtil%>.TRUE_VALUE;\n}\nelse {\n\tfinal /*@NonInvalid\052/ <%org.eclipse.ocl.pivot.Class%> TYP_occi_c_c_Entity = idResolver.getClass(<%monitoring.MonitoringTables%>.CLSSid_Entity, null);\n\tfinal /*@NonInvalid\052/ <%org.eclipse.cmf.occi.core.Entity%> entity = this.getEntity();\n\tfinal /*@NonInvalid\052/ boolean result = <%org.eclipse.ocl.pivot.library.oclany.OclAnyOclIsKindOfOperation%>.INSTANCE.evaluate(executor, entity, TYP_occi_c_c_Entity).booleanValue();\n\tfinal /*@NonInvalid\052/ boolean logDiagnostic = <%org.eclipse.ocl.pivot.library.string.CGStringLogDiagnosticOperation%>.INSTANCE.evaluate(executor, <%org.eclipse.ocl.pivot.ids.TypeId%>.BOOLEAN, <%monitoring.MonitoringTables%>.STR_Monitoringproperty_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, <%monitoring.MonitoringTables%>.INT_0).booleanValue();\n\tsymbol_0 = logDiagnostic;\n}\nreturn Boolean.TRUE == symbol_0;'"
+ * @generated
+ */
+ boolean appliesConstraint(DiagnosticChain diagnostics, Map<Object, Object> context);
+
+} // Monitoringproperty
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
index 9a5fec31d8013e3cb0d8217258fdacb6d763d564..9396d0875f8ace642354d48badf63ecc3b446b03 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringFactoryImpl.java
@@ -71,7 +71,7 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
case MonitoringPackage.DATAGATHERER: return createDatagatherer();
case MonitoringPackage.PROCESSOR: return createProcessor();
case MonitoringPackage.PUBLISHER: return createPublisher();
- case MonitoringPackage.MONITORINGATTRIBUTE: return createMonitoringattribute();
+ case MonitoringPackage.MONITORINGPROPERTY: return createMonitoringproperty();
default:
throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
}
@@ -160,9 +160,9 @@ public class MonitoringFactoryImpl extends EFactoryImpl implements MonitoringFac
* <!-- end-user-doc -->
* @generated
*/
- public Monitoringattribute createMonitoringattribute() {
- MonitoringattributeImpl monitoringattribute = new MonitoringattributeImpl();
- return monitoringattribute;
+ public Monitoringproperty createMonitoringproperty() {
+ MonitoringpropertyImpl monitoringproperty = new MonitoringpropertyImpl();
+ return monitoringproperty;
}
/**
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
index 0b2140d70372d458be36839ceb49bd489268d361..301584d6817c8057bc8f06b3c22978fb843efe91 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringPackageImpl.java
@@ -16,6 +16,7 @@ import monitoring.Datagatherer;
import monitoring.MonitoringFactory;
import monitoring.MonitoringPackage;
import monitoring.Monitoringattribute;
+import monitoring.Monitoringproperty;
import monitoring.Processor;
import monitoring.Publisher;
import monitoring.Sensor;
@@ -76,7 +77,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- private EClass monitoringattributeEClass = null;
+ private EClass monitoringpropertyEClass = null;
/**
* <!-- begin-user-doc -->
@@ -295,8 +296,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EClass getMonitoringattribute() {
- return monitoringattributeEClass;
+ public EClass getMonitoringproperty() {
+ return monitoringpropertyEClass;
}
/**
@@ -304,8 +305,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getMonitoringattribute_MonitoringAttributeName() {
- return (EAttribute)monitoringattributeEClass.getEStructuralFeatures().get(0);
+ public EAttribute getMonitoringproperty_MonitoringAttributeName() {
+ return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(0);
}
/**
@@ -313,8 +314,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getMonitoringattribute_MonitoringAttributeValue() {
- return (EAttribute)monitoringattributeEClass.getEStructuralFeatures().get(1);
+ public EAttribute getMonitoringproperty_MonitoringAttributeValue() {
+ return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(1);
}
/**
@@ -322,8 +323,8 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EOperation getMonitoringattribute__AppliesConstraint__DiagnosticChain_Map() {
- return monitoringattributeEClass.getEOperations().get(0);
+ public EOperation getMonitoringproperty__AppliesConstraint__DiagnosticChain_Map() {
+ return monitoringpropertyEClass.getEOperations().get(0);
}
/**
@@ -398,10 +399,10 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
publisherEClass = createEClass(PUBLISHER);
- monitoringattributeEClass = createEClass(MONITORINGATTRIBUTE);
- createEAttribute(monitoringattributeEClass, MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME);
- createEAttribute(monitoringattributeEClass, MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE);
- createEOperation(monitoringattributeEClass, MONITORINGATTRIBUTE___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
+ monitoringpropertyEClass = createEClass(MONITORINGPROPERTY);
+ createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME);
+ createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE);
+ createEOperation(monitoringpropertyEClass, MONITORINGPROPERTY___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
// Create data types
dateTimeEDataType = createEDataType(DATE_TIME);
@@ -445,7 +446,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
datagathererEClass.getESuperTypes().add(thePlatformPackage.getComponent());
processorEClass.getESuperTypes().add(thePlatformPackage.getComponent());
publisherEClass.getESuperTypes().add(thePlatformPackage.getComponent());
- monitoringattributeEClass.getESuperTypes().add(theOCCIPackage.getMixinBase());
+ monitoringpropertyEClass.getESuperTypes().add(theOCCIPackage.getMixinBase());
// Initialize classes, features, and operations; add parameters
initEClass(sensorEClass, Sensor.class, "Sensor", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
@@ -465,11 +466,11 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
initEClass(publisherEClass, Publisher.class, "Publisher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEClass(monitoringattributeEClass, Monitoringattribute.class, "Monitoringattribute", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
- initEAttribute(getMonitoringattribute_MonitoringAttributeName(), this.getString(), "monitoringAttributeName", null, 1, 1, Monitoringattribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- initEAttribute(getMonitoringattribute_MonitoringAttributeValue(), this.getString(), "monitoringAttributeValue", null, 1, 1, Monitoringattribute.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEClass(monitoringpropertyEClass, Monitoringproperty.class, "Monitoringproperty", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
+ initEAttribute(getMonitoringproperty_MonitoringAttributeName(), this.getString(), "monitoringAttributeName", null, 1, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMonitoringproperty_MonitoringAttributeValue(), this.getString(), "monitoringAttributeValue", null, 1, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
- EOperation op = initEOperation(getMonitoringattribute__AppliesConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "appliesConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
+ EOperation op = initEOperation(getMonitoringproperty__AppliesConstraint__DiagnosticChain_Map(), ecorePackage.getEBoolean(), "appliesConstraint", 0, 1, IS_UNIQUE, IS_ORDERED);
addEParameter(op, ecorePackage.getEDiagnosticChain(), "diagnostics", 0, 1, IS_UNIQUE, IS_ORDERED);
EGenericType g1 = createEGenericType(ecorePackage.getEMap());
EGenericType g2 = createEGenericType(ecorePackage.getEJavaObject());
@@ -507,7 +508,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
new String[] {
});
addAnnotation
- (monitoringattributeEClass,
+ (monitoringpropertyEClass,
source,
new String[] {
"constraints", "appliesConstraint"
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringattributeImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
similarity index 80%
rename from de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringattributeImpl.java
rename to de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
index 2f0af1739cc6f466053b03ef768abd6034d23620..ba9b37a497214ac1ceb143e739a05fbf1f54fb9a 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringattributeImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
@@ -18,7 +18,7 @@ import java.util.Map;
import monitoring.MonitoringPackage;
import monitoring.MonitoringTables;
-import monitoring.Monitoringattribute;
+import monitoring.Monitoringproperty;
import org.eclipse.cmf.occi.core.Entity;
@@ -52,19 +52,19 @@ import org.eclipse.ocl.pivot.values.IntegerValue;
/**
* <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Monitoringattribute</b></em>'.
+ * An implementation of the model object '<em><b>Monitoringproperty</b></em>'.
* <!-- end-user-doc -->
* <p>
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link monitoring.impl.MonitoringattributeImpl#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}</li>
- * <li>{@link monitoring.impl.MonitoringattributeImpl#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}</li>
+ * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}</li>
+ * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}</li>
* </ul>
*
* @generated
*/
-public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoringattribute {
+public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringproperty {
/**
* The default value of the '{@link #getMonitoringAttributeName() <em>Monitoring Attribute Name</em>}' attribute.
* <!-- begin-user-doc -->
@@ -110,7 +110,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
* <!-- end-user-doc -->
* @generated
*/
- protected MonitoringattributeImpl() {
+ protected MonitoringpropertyImpl() {
super();
}
@@ -121,7 +121,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
*/
@Override
protected EClass eStaticClass() {
- return MonitoringPackage.Literals.MONITORINGATTRIBUTE;
+ return MonitoringPackage.Literals.MONITORINGPROPERTY;
}
/**
@@ -142,7 +142,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
String oldMonitoringAttributeName = monitoringAttributeName;
monitoringAttributeName = newMonitoringAttributeName;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME, oldMonitoringAttributeName, monitoringAttributeName));
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME, oldMonitoringAttributeName, monitoringAttributeName));
}
/**
@@ -163,7 +163,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
String oldMonitoringAttributeValue = monitoringAttributeValue;
monitoringAttributeValue = newMonitoringAttributeValue;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE, oldMonitoringAttributeValue, monitoringAttributeValue));
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE, oldMonitoringAttributeValue, monitoringAttributeValue));
}
/**
@@ -176,7 +176,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
*
* inv appliesConstraint:
* let
- * severity : Integer[1] = 'Monitoringattribute::appliesConstraint'.getSeverity()
+ * severity : Integer[1] = 'Monitoringproperty::appliesConstraint'.getSeverity()
* in
* if severity <= 0
* then true
@@ -184,12 +184,12 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
* let
* result : occi::Boolean[1] = self.entity.oclIsKindOf(occi::Entity)
* in
- * 'Monitoringattribute::appliesConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
+ * 'Monitoringproperty::appliesConstraint'.logDiagnostic(self, null, diagnostics, context, null, severity, result, 0)
* endif
*/
final /*@NonInvalid*/ Executor executor = PivotUtilInternal.getExecutor(this);
final /*@NonInvalid*/ IdResolver idResolver = executor.getIdResolver();
- final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Monitoringattribute_c_c_appliesConstraint);
+ final /*@NonInvalid*/ IntegerValue severity_0 = CGStringGetSeverityOperation.INSTANCE.evaluate(executor, MonitoringTables.STR_Monitoringproperty_c_c_appliesConstraint);
final /*@NonInvalid*/ boolean le = OclComparableLessThanEqualOperation.INSTANCE.evaluate(executor, severity_0, MonitoringTables.INT_0).booleanValue();
/*@NonInvalid*/ boolean symbol_0;
if (le) {
@@ -199,7 +199,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
final /*@NonInvalid*/ org.eclipse.ocl.pivot.Class TYP_occi_c_c_Entity = idResolver.getClass(MonitoringTables.CLSSid_Entity, null);
final /*@NonInvalid*/ Entity entity = this.getEntity();
final /*@NonInvalid*/ boolean result = OclAnyOclIsKindOfOperation.INSTANCE.evaluate(executor, entity, TYP_occi_c_c_Entity).booleanValue();
- final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Monitoringattribute_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
+ final /*@NonInvalid*/ boolean logDiagnostic = CGStringLogDiagnosticOperation.INSTANCE.evaluate(executor, TypeId.BOOLEAN, MonitoringTables.STR_Monitoringproperty_c_c_appliesConstraint, this, (Object)null, diagnostics, context, (Object)null, severity_0, result, MonitoringTables.INT_0).booleanValue();
symbol_0 = logDiagnostic;
}
return Boolean.TRUE == symbol_0;
@@ -213,9 +213,9 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
return getMonitoringAttributeName();
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
return getMonitoringAttributeValue();
}
return super.eGet(featureID, resolve, coreType);
@@ -229,10 +229,10 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
setMonitoringAttributeName((String)newValue);
return;
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
setMonitoringAttributeValue((String)newValue);
return;
}
@@ -247,10 +247,10 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
setMonitoringAttributeName(MONITORING_ATTRIBUTE_NAME_EDEFAULT);
return;
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
setMonitoringAttributeValue(MONITORING_ATTRIBUTE_VALUE_EDEFAULT);
return;
}
@@ -265,9 +265,9 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
return MONITORING_ATTRIBUTE_NAME_EDEFAULT == null ? monitoringAttributeName != null : !MONITORING_ATTRIBUTE_NAME_EDEFAULT.equals(monitoringAttributeName);
- case MonitoringPackage.MONITORINGATTRIBUTE__MONITORING_ATTRIBUTE_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
return MONITORING_ATTRIBUTE_VALUE_EDEFAULT == null ? monitoringAttributeValue != null : !MONITORING_ATTRIBUTE_VALUE_EDEFAULT.equals(monitoringAttributeValue);
}
return super.eIsSet(featureID);
@@ -282,7 +282,7 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
@SuppressWarnings("unchecked")
public Object eInvoke(int operationID, EList<?> arguments) throws InvocationTargetException {
switch (operationID) {
- case MonitoringPackage.MONITORINGATTRIBUTE___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
+ case MonitoringPackage.MONITORINGPROPERTY___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP:
return appliesConstraint((DiagnosticChain)arguments.get(0), (Map<Object, Object>)arguments.get(1));
}
return super.eInvoke(operationID, arguments);
@@ -306,4 +306,4 @@ public class MonitoringattributeImpl extends MixinBaseImpl implements Monitoring
return result.toString();
}
-} //MonitoringattributeImpl
+} //MonitoringpropertyImpl
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
index 83858f6b73d681fad95eda1df4b77a5a342b2977..4d4ea009088e51ba94d52b679f54b3c4a34554cd 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringAdapterFactory.java
@@ -101,8 +101,8 @@ public class MonitoringAdapterFactory extends AdapterFactoryImpl {
return createPublisherAdapter();
}
@Override
- public Adapter caseMonitoringattribute(Monitoringattribute object) {
- return createMonitoringattributeAdapter();
+ public Adapter caseMonitoringproperty(Monitoringproperty object) {
+ return createMonitoringpropertyAdapter();
}
@Override
public Adapter caseEntity(Entity object) {
@@ -201,16 +201,16 @@ public class MonitoringAdapterFactory extends AdapterFactoryImpl {
}
/**
- * Creates a new adapter for an object of class '{@link monitoring.Monitoringattribute <em>Monitoringattribute</em>}'.
+ * Creates a new adapter for an object of class '{@link monitoring.Monitoringproperty <em>Monitoringproperty</em>}'.
* <!-- begin-user-doc -->
* This default implementation returns null so that we can easily ignore cases;
* it's useful to ignore a case when inheritance will catch all the cases anyway.
* <!-- end-user-doc -->
* @return the new adapter.
- * @see monitoring.Monitoringattribute
+ * @see monitoring.Monitoringproperty
* @generated
*/
- public Adapter createMonitoringattributeAdapter() {
+ public Adapter createMonitoringpropertyAdapter() {
return null;
}
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
index e60e54fac18795ff03104d79f62330e2e39c78b3..554dde0106179a572d58992b1dc93138c37cb422 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringSwitch.java
@@ -119,10 +119,10 @@ public class MonitoringSwitch<T> extends Switch<T> {
if (result == null) result = defaultCase(theEObject);
return result;
}
- case MonitoringPackage.MONITORINGATTRIBUTE: {
- Monitoringattribute monitoringattribute = (Monitoringattribute)theEObject;
- T result = caseMonitoringattribute(monitoringattribute);
- if (result == null) result = caseMixinBase(monitoringattribute);
+ case MonitoringPackage.MONITORINGPROPERTY: {
+ Monitoringproperty monitoringproperty = (Monitoringproperty)theEObject;
+ T result = caseMonitoringproperty(monitoringproperty);
+ if (result == null) result = caseMixinBase(monitoringproperty);
if (result == null) result = defaultCase(theEObject);
return result;
}
@@ -191,17 +191,17 @@ public class MonitoringSwitch<T> extends Switch<T> {
}
/**
- * Returns the result of interpreting the object as an instance of '<em>Monitoringattribute</em>'.
+ * Returns the result of interpreting the object as an instance of '<em>Monitoringproperty</em>'.
* <!-- begin-user-doc -->
* This implementation returns null;
* returning a non-null result will terminate the switch.
* <!-- end-user-doc -->
* @param object the target of the switch.
- * @return the result of interpreting the object as an instance of '<em>Monitoringattribute</em>'.
+ * @return the result of interpreting the object as an instance of '<em>Monitoringproperty</em>'.
* @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
* @generated
*/
- public T caseMonitoringattribute(Monitoringattribute object) {
+ public T caseMonitoringproperty(Monitoringproperty object) {
return null;
}
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
index 0c37c984418bed1df4da8501c0bcbf2b9692f4db..f053ade82b1fe90dd3f09439cd983ff290952d01 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/util/MonitoringValidator.java
@@ -54,12 +54,12 @@ public class MonitoringValidator extends EObjectValidator {
public static final String DIAGNOSTIC_SOURCE = "monitoring";
/**
- * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Applies Constraint' of 'Monitoringattribute'.
+ * The {@link org.eclipse.emf.common.util.Diagnostic#getCode() code} for constraint 'Applies Constraint' of 'Monitoringproperty'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public static final int MONITORINGATTRIBUTE__APPLIES_CONSTRAINT = 1;
+ public static final int MONITORINGPROPERTY__APPLIES_CONSTRAINT = 1;
/**
* A constant with a fixed name that can be used as the base value for additional hand written constants.
@@ -124,8 +124,8 @@ public class MonitoringValidator extends EObjectValidator {
return validateProcessor((Processor)value, diagnostics, context);
case MonitoringPackage.PUBLISHER:
return validatePublisher((Publisher)value, diagnostics, context);
- case MonitoringPackage.MONITORINGATTRIBUTE:
- return validateMonitoringattribute((Monitoringattribute)value, diagnostics, context);
+ case MonitoringPackage.MONITORINGPROPERTY:
+ return validateMonitoringproperty((Monitoringproperty)value, diagnostics, context);
case MonitoringPackage.DATE_TIME:
return validateDateTime((String)value, diagnostics, context);
case MonitoringPackage.SECOND:
@@ -234,28 +234,28 @@ public class MonitoringValidator extends EObjectValidator {
* <!-- end-user-doc -->
* @generated
*/
- public boolean validateMonitoringattribute(Monitoringattribute monitoringattribute, DiagnosticChain diagnostics, Map<Object, Object> context) {
- if (!validate_NoCircularContainment(monitoringattribute, diagnostics, context)) return false;
- boolean result = validate_EveryMultiplicityConforms(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryDataValueConforms(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryProxyResolves(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_UniqueID(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryKeyUnique(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(monitoringattribute, diagnostics, context);
- if (result || diagnostics != null) result &= validateMonitoringattribute_appliesConstraint(monitoringattribute, diagnostics, context);
+ public boolean validateMonitoringproperty(Monitoringproperty monitoringproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ if (!validate_NoCircularContainment(monitoringproperty, diagnostics, context)) return false;
+ boolean result = validate_EveryMultiplicityConforms(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryDataValueConforms(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryReferenceIsContained(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryBidirectionalReferenceIsPaired(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryProxyResolves(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_UniqueID(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryKeyUnique(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validate_EveryMapEntryUnique(monitoringproperty, diagnostics, context);
+ if (result || diagnostics != null) result &= validateMonitoringproperty_appliesConstraint(monitoringproperty, diagnostics, context);
return result;
}
/**
- * Validates the appliesConstraint constraint of '<em>Monitoringattribute</em>'.
+ * Validates the appliesConstraint constraint of '<em>Monitoringproperty</em>'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- public boolean validateMonitoringattribute_appliesConstraint(Monitoringattribute monitoringattribute, DiagnosticChain diagnostics, Map<Object, Object> context) {
- return monitoringattribute.appliesConstraint(diagnostics, context);
+ public boolean validateMonitoringproperty_appliesConstraint(Monitoringproperty monitoringproperty, DiagnosticChain diagnostics, Map<Object, Object> context) {
+ return monitoringproperty.appliesConstraint(diagnostics, context);
}
/**
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 1a338603d480ca3c8aa14bb396ad15b372ce3980..3a2ebcd3dff35804ef251b44f93568a218ac2ff8 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
@@ -30,8 +30,16 @@ import de.ugoe.cs.rwm.docci.connector.Connector;
import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
import de.ugoe.cs.rwm.tocci.Transformator;
import de.ugoe.cs.rwm.tocci.TransformatorFactory;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+import monitoring.MonitoringPackage;
public class DeployHadoopMonitoringTest {
+ String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
+ String manNWRuntimeId = "75a4639e-9ce7-4058-b859-8a711b0e2e7b";
+ String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova";
+ String userData = "I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj";
+
+
@BeforeClass
public static void OCCIRegistrySetup() {
TestUtility.loggerSetup();
@@ -46,16 +54,22 @@ public class DeployHadoopMonitoringTest {
MartDeployer deployer = new MartDeployer(conn);
deployer.deploy(occiPath);
}
- @Ignore
+
@Test
public void deployHadoopWithNewMonitoring() {
CachedResourceSet.getCache().clear();
System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
- Logger.getRootLogger().setLevel(Level.FATAL);
+ //Logger.getRootLogger().setLevel(Level.FATAL);
Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopClusterNewExt.occic"));
Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
trans.transform(occiPath, occiPath);
+
+ OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
+
+ trans2.transform(occiPath, occiPath);
+
Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
MartDeployer deployer = new MartDeployer(conn);
@@ -67,11 +81,19 @@ public class DeployHadoopMonitoringTest {
}
-
+ @Ignore
@Test
public void resolveProxies() {
- CachedResourceSet.getCache().clear();
+ MonitoringPackage.eINSTANCE.eClass();
+
+ OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
+ MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
Path newOCCI = Paths.get(de.ugoe.cs.rwm.docci.ModelUtility.getPathToResource("occi/hadoopClusterNewExt.occic"));
+
+ Resource ress = de.ugoe.cs.rwm.docci.ModelUtility.loadOCCIintoEMFResource(newOCCI);
+ ResourceSet resSet = ress.getResourceSet();
+
+
EList<EObject> newModel = de.ugoe.cs.rwm.docci.ModelUtility.loadOCCI(newOCCI);
for (org.eclipse.cmf.occi.core.Resource res : de.ugoe.cs.rwm.docci.ModelUtility.getResources(newModel)) {
System.out.println("Resource Title: " + res.getTitle());
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 18bf2341f0fd3309312311324e3569e834378af9..d2bb8f4c1615b2c0300ba41d8683c3329ec55d3d 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
@@ -27,6 +27,7 @@ import de.ugoe.cs.rwm.docci.executor.Executor;
import de.ugoe.cs.rwm.docci.extractor.Extractor;
import de.ugoe.cs.rwm.docci.provisioner.Provisioner;
import de.ugoe.cs.rwm.docci.updater.ElementAdapter;
+import de.ugoe.cs.rwm.tocci.Transformator;
import modmacao.ModmacaoPackage;
import monitoring.MonitoringPackage;
import openstackruntime.OpenstackruntimePackage;
@@ -46,8 +47,7 @@ public class TestUtility {
MonitoringPackage.eINSTANCE.eClass();
-
-
+
OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
@@ -79,15 +79,16 @@ public class TestUtility {
File log4jfile = new File(ModelUtility.getPathToResource("log4j.properties"));
PropertyConfigurator.configure(log4jfile.getAbsolutePath());
Logger.getLogger(Executor.class.getName()).setLevel(Level.DEBUG);
- Logger.getLogger(Extractor.class.getName()).setLevel(Level.DEBUG);
- Logger.getLogger(Provisioner.class.getName()).setLevel(Level.DEBUG);
- Logger.getLogger(Comparator.class.getName()).setLevel(Level.FATAL);
+ //Logger.getLogger(Extractor.class.getName()).setLevel(Level.DEBUG);
+ //Logger.getLogger(Provisioner.class.getName()).setLevel(Level.DEBUG);
+ Logger.getLogger(Comparator.class.getName()).setLevel(Level.DEBUG);
Logger.getLogger(Deprovisioner.class.getName()).setLevel(Level.INFO);
- Logger.getLogger(Connector.class.getName()).setLevel(Level.DEBUG);
- Logger.getLogger(ElementAdapter.class.getName()).setLevel(Level.INFO);
+ //Logger.getLogger(Connector.class.getName()).setLevel(Level.DEBUG);
+ //Logger.getLogger(ElementAdapter.class.getName()).setLevel(Level.INFO);
Logger.getLogger(Deployer.class.getName()).setLevel(Level.INFO);
Logger.getLogger(MartAppDeployerMaster.class.getName()).setLevel(Level.DEBUG);
Logger.getLogger(MartAppDeployerSlave.class.getName()).setLevel(Level.DEBUG);
+ //Logger.getLogger(Transformator.class.getName()).setLevel(Level.DEBUG);
}
public static boolean equalsRuntime(Path desiredModelPath, Connector conn) {
diff --git a/src/test/resources/occi/hadoopClusterNewExt.occic b/src/test/resources/occi/hadoopClusterNewExt.occic
index 007729bbd188dd1510d1cedbc1f0dc47159877cc..fafebb0111797ff5a375d2cded1e5364934c5aa7 100644
--- a/src/test/resources/occi/hadoopClusterNewExt.occic
+++ b/src/test/resources/occi/hadoopClusterNewExt.occic
@@ -9,21 +9,7 @@
<use href="http://schemas.modmacao.org/modmacao#/"/>
<use href="http://schemas.modmacao.org/openstack/swe#/"/>
<use href="http://schemas.ugoe.cs.rwm/monitoring#/"/>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590" title="management" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/" rlinks="//@resources.1/@links.0 //@resources.5/@links.0" occiNetworkState="active">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
- <attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590"/>
- <attributes name="occi.core.title" value="management"/>
- <attributes name="occi.core.summary" value=""/>
- <attributes name="occi.network.vlan" value="0"/>
- <attributes name="occi.network.label" value=""/>
- <attributes name="occi.network.state" value="active"/>
- <attributes name="occi.network.state.message" value=""/>
- <parts>
- <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
- <attributes name="openstack.runtime.id" value="718eaf4e-cc2b-4f19-9347-8ba8a045c515"/>
- </parts>
- </resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.3/@links.0 //@resources.2/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce" title="hadoop-master" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.2/@links.0 //@resources.1/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
<attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce"/>
<attributes name="occi.core.title" value="hadoop-master"/>
@@ -47,18 +33,7 @@
<parts>
<mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
</parts>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag" title="link1" location="/networkinterface/urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag/" target="//@resources.0" occiNetworkinterfaceInterface="" occiNetworkinterfaceMac="" occiNetworkinterfaceStateMessage="">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
- <attributes name="occi.core.id" value="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ag"/>
- <attributes name="occi.core.title" value="link1"/>
- <attributes name="occi.networkinterface.address" value="10.0.0.25"/>
- <attributes name="occi.networkinterface.gateway" value="10.0.0.254"/>
- <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
- <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.25" occiNetworkinterfaceGateway="10.0.0.254">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
- </parts>
- </links>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.7">
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.6">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
<attributes name="occi.core.id" value="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
<attributes name="occi.core.title" value="link3"/>
@@ -67,6 +42,15 @@
<mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
</parts>
</links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d" title="monNwLink" target="//@resources.12" occiNetworkinterfaceInterface="100.254.1.35" occiNetworkinterfaceMac="">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d"/>
+ <attributes name="occi.core.title" value="monNwLink"/>
+ <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
</resources>
<resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896" title="Wordcount" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
@@ -76,13 +60,13 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.0"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.1">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929/" target="//@resources.0">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929"/>
<attributes name="occi.core.title" value="link1"/>
</links>
</resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.4/@links.0" occiComponentStateMessage="">
+ <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="hMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.3/@links.0 //@resources.8/@links.0" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897"/>
<attributes name="occi.core.title" value="hMaster"/>
@@ -90,30 +74,35 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.1"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.1">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928/" target="//@resources.0">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928"/>
<attributes name="occi.core.title" value="link1"/>
<attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
<attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
</links>
+ <links id="urn:uuid:ebf794ac-30aa-4955-b421-62cc794d6654" title="link2" target="//@resources.12">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ebf794ac-30aa-4955-b421-62cc794d6654"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </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">
<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"/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.3">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.2">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef"/>
<attributes name="occi.core.title" value="ComponentLink"/>
</links>
- <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.6">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.5">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1"/>
<attributes name="occi.core.title" value="link4"/>
</links>
</resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.6/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
<attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
<attributes name="occi.core.title" value="hadoop-worker-1"/>
@@ -137,24 +126,7 @@
<parts>
<mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
</parts>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah" title="link1" location="/networkinterface/urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah/" target="//@resources.0" occiNetworkinterfaceInterface="" occiNetworkinterfaceMac="" occiNetworkinterfaceStateMessage="">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
- <attributes name="occi.core.id" value="urn:uuid:0f3c22cd-35ea-4e31-a09b-d866aaf4a8ah"/>
- <attributes name="occi.core.title" value="link1"/>
- <attributes name="occi.networkinterface.interface" value=""/>
- <attributes name="occi.networkinterface.mac" value=""/>
- <attributes name="occi.networkinterface.state" value="active"/>
- <attributes name="occi.networkinterface.state.message" value=""/>
- <attributes name="occi.networkinterface.address" value="10.0.0.15"/>
- <attributes name="occi.networkinterface.gateway" value="10.0.0.254"/>
- <attributes name="occi.networkinterface.allocation" value="dynamic"/>
- <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
- <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
- <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.0.0.15" occiNetworkinterfaceGateway="10.0.0.254">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
- </parts>
- </links>
- <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.7">
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.6">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
<attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
<attributes name="occi.core.title" value="link2"/>
@@ -164,7 +136,7 @@
</parts>
</links>
</resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.4/@links.1" occiComponentStateMessage="">
+ <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Worker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.3/@links.1" occiComponentStateMessage="">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
<attributes name="occi.core.title" value="Worker"/>
@@ -172,14 +144,14 @@
<attributes name="occi.component.state" value="undeployed"/>
<attributes name="occi.component.state.message" value=""/>
<parts mixin="//@mixins.2"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.5">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917/" target="//@resources.4">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917"/>
<attributes name="occi.core.title" value="link1"/>
<attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
</links>
</resources>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.1/@links.1 //@resources.5/@links.1" occiNetworkState="active">
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="hNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.0/@links.0 //@resources.4/@links.0" occiNetworkState="active">
<kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
<attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
<attributes name="occi.core.title" value="hNetwork"/>
@@ -193,10 +165,10 @@
<attributes name="occi.network.address" value="10.254.1.1/24"/>
</parts>
</resources>
- <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="resource10">
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor">
<kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
<attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb"/>
- <attributes name="occi.core.title" value="resource10"/>
+ <attributes name="occi.core.title" value="Sensor"/>
<attributes name="occi.core.summary" value=""/>
<attributes name="occi.sensor.timebase" value=""/>
<attributes name="occi.sensor.timestart" value=""/>
@@ -204,42 +176,100 @@
<attributes name="occi.sensor.period" value=""/>
<attributes name="occi.sensor.granularity" value=""/>
<attributes name="occi.sensor.accuracy" value=""/>
- <attributes name="occi.component.state" value=""/>
- <attributes name="occi.component.message" value=""/>
- <attributes name="occi.component.state.message" value=""/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1">
+ <attributes name="occi.app.state" value="undeployed"/>
+ <attributes name="occi.app.state.message" value=""/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<attributes name="occi.core.id" value="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
<attributes name="occi.core.title" value="link1"/>
</links>
- <links xsi:type="placement:Placementlink" id="urn:uuid:c10d9e3e-fc69-45c7-bf3b-855b9e33efce" title="link2">
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" target="//@resources.9">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" target="//@resources.10">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
+ <attributes name="occi.core.title" value="link3"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" rlinks="//@resources.7/@links.0 //@resources.9/@links.0">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='datagatherer']"/>
+ <attributes name="occi.core.id" value="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48"/>
+ <attributes name="occi.core.title" value="DataGatherer"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.2">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:c10d9e3e-fc69-45c7-bf3b-855b9e33efce"/>
+ <attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" rlinks="//@resources.10/@links.0 //@resources.7/@links.1">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='processor']"/>
+ <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
+ <attributes name="occi.core.title" value="Processor"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" target="//@resources.8">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
<attributes name="occi.core.title" value="link2"/>
</links>
</resources>
- <resources xsi:type="monitoring:Sensor" id="urn:uuid:54d120dc-a2cd-43c1-acc1-54a86be23863" title="resource11" location="">
- <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
- <attributes name="occi.core.id" value="urn:uuid:54d120dc-a2cd-43c1-acc1-54a86be23863"/>
- <attributes name="occi.core.title" value="resource11"/>
- <attributes name="occi.core.summary" value=""/>
- <attributes name="occi.sensor.timebase" value=""/>
- <attributes name="occi.sensor.timestart" value=""/>
- <attributes name="occi.sensor.timestop" value=""/>
- <attributes name="occi.sensor.period" value=""/>
- <attributes name="occi.sensor.granularity" value=""/>
- <attributes name="occi.sensor.accuracy" value=""/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:1ce660ef-24b1-4d9c-a46b-ba91ce864179" title="link1">
+ <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" rlinks="//@resources.7/@links.2">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='publisher']"/>
+ <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
+ <attributes name="occi.core.title" value="Publisher"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" target="//@resources.9">
<kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:1ce660ef-24b1-4d9c-a46b-ba91ce864179"/>
+ <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
<attributes name="occi.core.title" value="link1"/>
</links>
- <links xsi:type="placement:Placementlink" id="urn:uuid:33b4e50b-77db-47d5-b77b-8f07d9c03b55" title="link2">
+ <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" target="//@resources.11">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:33b4e50b-77db-47d5-b77b-8f07d9c03b55"/>
+ <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
<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" occiComputeState="inactive">
+ <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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.compute.architecture" value="x86"/>
+ <attributes name="occi.compute.cores" value="2"/>
+ <attributes name="occi.compute.hostname" value="hadoop-worker-1"/>
+ <attributes name="occi.compute.share" value="0"/>
+ <attributes name="occi.compute.speed" value="0"/>
+ <attributes name="occi.compute.memory" value="4096"/>
+ <attributes name="occi.compute.state" value="active"/>
+ <attributes name="occi.compute.state.message" value=""/>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed" title="link1" target="//@resources.12">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.25">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.2/@links.1 //@resources.0/@links.1" occiNetworkState="inactive">
+ <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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.network.vlan" value="0"/>
+ <attributes name="occi.network.label" value=""/>
+ <attributes name="occi.network.state" value="active"/>
+ <attributes name="occi.network.state.message" value=""/>
+ <parts>
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="100.254.1.1/24"/>
+ </parts>
+ </resources>
<mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
<mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
<mixins name="hWorker" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker"/>