diff --git a/.settings/org.eclipse.buildship.core.prefs b/.settings/org.eclipse.buildship.core.prefs
index e8895216fd3c0c3af4c4522334775f41b7deb42e..e8c143f59f7f625da9d9e7f2858e46485cae0b72 100644
--- a/.settings/org.eclipse.buildship.core.prefs
+++ b/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=
+connection.project.dir=de.ugoe.cs.rwm.mocci.connector
eclipse.preferences.version=1
diff --git a/build.gradle b/build.gradle
index 7d8af14eb239aa17ab040b5c2d7f01ae4b20a720..6cfb36e978b6548d3d00c8d24e4832fe8eb7cd17 100644
--- a/build.gradle
+++ b/build.gradle
@@ -70,8 +70,8 @@ dependencies {
//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 project(':de.ugoe.cs.rwm.mocci.model')
+ //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'
@@ -127,7 +127,7 @@ javadoc {
failOnError = true
}
test {
- exclude 'de/ugoe/cs/rwm/mocci/live/**'
+ //exclude 'de/ugoe/cs/rwm/mocci/live/**'
testLogging.showStandardStreams = true
testLogging {
exceptionFormat = 'full'
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/.settings/org.eclipse.buildship.core.prefs b/de.ugoe.cs.rwm.mocci.connector.dummy/.settings/org.eclipse.buildship.core.prefs
index b1886adb46c085de842f1283c1a3c25151bfc988..1752c9353159a3382e3f642e31d09b45ee82f7c4 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/.settings/org.eclipse.buildship.core.prefs
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/.settings/org.eclipse.buildship.core.prefs
@@ -1,2 +1,2 @@
-connection.project.dir=..
+connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/bin/.gitignore b/de.ugoe.cs.rwm.mocci.connector.dummy/bin/.gitignore
deleted file mode 100644
index fd04598cccd1eb791debf5b0edfff26368dbb294..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/de/
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 b1886adb46c085de842f1283c1a3c25151bfc988..e8895216fd3c0c3af4c4522334775f41b7deb42e 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 898e623900e6da9c5a47c38ae7c0998f6870cf79..40cc25edcd7e8bca493dc3de9287058059e0582b 100644
--- a/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF
+++ b/de.ugoe.cs.rwm.mocci.connector/META-INF/MANIFEST.MF
@@ -9,6 +9,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.slf4j.api,
org.eclipse.cmf.occi.core,
- de.ugoe.cs.rwm.mocci.model,
- org.modmacao.occi.platform
+ de.ugoe.cs.rwm.mocci.model
Export-Package: de.ugoe.cs.rwm.mocci.connector
diff --git a/de.ugoe.cs.rwm.mocci.connector/build.gradle b/de.ugoe.cs.rwm.mocci.connector/build.gradle
index d234050ca877d143c95878fb1c8609bd13aa8cbd..8ada62e6640b67e4e4b83e334cc87f3767556f6d 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', name: 'core', 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/ComponentManager.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..7ec0b68e73224d67d1b626737e67aa55fea4c195
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java
@@ -0,0 +1,241 @@
+package de.ugoe.cs.rwm.mocci.connector;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.MixinBase;
+import org.modmacao.cm.ConfigurationManagementTool;
+import org.modmacao.cm.ansible.AnsibleCMTool;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Status;
+
+import modmacao.Executiondependency;
+import modmacao.Installationdependency;
+
+public class ComponentManager {
+
+
+ private ConfigurationManagementTool cmtool = new AnsibleCMTool();
+ private Component comp;
+
+ public ComponentManager(Component comp) {
+ this.comp = comp;
+ }
+
+
+ public void undeploy() {
+
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+
+ comp.stop();
+ cmtool.undeploy(comp);
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.INACTIVE_VALUE:
+ cmtool.undeploy(comp);
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.DEPLOYED_VALUE:
+ cmtool.undeploy(comp);
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.ERROR_VALUE:
+ cmtool.undeploy(comp);
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+ default:
+ break;
+ }
+ }
+ // End of user code
+ // Start of user code Publisher_Kind_deploy_action
+ /**
+ * Implement OCCI action:
+ * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+ * - term: deploy
+ * - title:
+ */
+ public void deploy()
+ {
+ int status = -1;
+
+ // Component State Machine.
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.UNDEPLOYED_VALUE:
+ for (Component component: getInstallDependendComps()) {
+ component.deploy();
+ }
+ status = cmtool.deploy(comp);
+
+ if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.DEPLOYED))
+ comp.setOcciComponentState(Status.DEPLOYED);
+ else
+ comp.setOcciComponentState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
+ }
+ // End of user code
+ // Start of user code Publisher_Kind_configure_action
+ /**
+ * Implement OCCI action:
+ * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
+ * - term: configure
+ * - title:
+ */
+ public void configure()
+ {
+ int status = -1;
+
+ // Component State Machine.
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.DEPLOYED_VALUE:
+ for (Component component: getInstallDependendComps()) {
+ component.configure();
+ }
+ status = cmtool.configure(comp);
+
+ if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.INACTIVE))
+ comp.setOcciComponentState(Status.INACTIVE);
+ else
+ comp.setOcciComponentState(Status.ERROR);
+ break;
+
+ default:
+ break;
+}
+ }
+ // End of user code
+ // 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.
+ */
+ public void start()
+ {
+ int status = -1;
+
+ // Component State Machine.
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.INACTIVE_VALUE:
+ for (Component component: getExecutionDependendComps()) {
+ component.start();
+ }
+
+ status = cmtool.start(comp);
+
+ if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE))
+ comp.setOcciComponentState(Status.ACTIVE);
+ else
+ comp.setOcciComponentState(Status.ERROR);
+
+ break;
+
+
+ case Status.UNDEPLOYED_VALUE:
+ for (Component component: getInstallDependendComps()) {
+ component.deploy();
+ }
+ comp.deploy();
+
+ for (Component component: getInstallDependendComps()) {
+ component.configure();
+ }
+ comp.configure();
+
+ for (Component component: getExecutionDependendComps()) {
+ component.start();
+ }
+
+ status = cmtool.start(comp);
+
+ if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE))
+ comp.setOcciComponentState(Status.ACTIVE);
+ else
+ comp.setOcciComponentState(Status.ERROR);
+
+ default:
+ break;
+}
+ }
+ // 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.
+ */
+ public void stop()
+ {
+ int status = -1;
+ // Component State Machine.
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+
+ status = cmtool.stop(comp);
+
+ comp.setOcciComponentState(Status.INACTIVE);
+
+ break;
+
+ default:
+ break;
+}
+ }
+ // End of user code
+
+ private List<Component> getInstallDependendComps(){
+ LinkedList<Component> dependendComponents = new LinkedList<Component>();
+ for (Link link: comp.getLinks()) {
+ for (MixinBase mixin: link.getParts()) {
+ if (mixin instanceof Installationdependency) {
+ dependendComponents.add((Component) link.getTarget());
+ break;
+ }
+ }
+ }
+ return dependendComponents;
+ }
+
+ private List<Component> getExecutionDependendComps(){
+ LinkedList<Component> dependendComponents = new LinkedList<Component>();
+ for (Link link: comp.getLinks()) {
+ for (MixinBase mixin: link.getParts()) {
+ if (mixin instanceof Executiondependency) {
+ dependendComponents.add((Component) link.getTarget());
+ break;
+ }
+ }
+ }
+ return dependendComponents;
+ }
+
+ private boolean assertCompsStatusEquals(List<Component> components, Status status) {
+ for (Component component: components) {
+ if (component.getOcciComponentState().getValue() != status.getValue()) {
+ return false;
+ }
+ }
+ return true;
+}
+
+}
\ No newline at end of file
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 e5a46b8ba42e6f6d5a8f5a93667c0441bd5156de..0ec40b0c11b7725344b6f394383fff88fafe6c13 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 Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
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 50bcc3671d7aa4b9dc704b118d91e435c3532586..300bd305ad46f4d3d6b65817d95a64c25988f352 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 Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -31,6 +31,7 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
* Initialize the logger.
*/
private static Logger LOGGER = LoggerFactory.getLogger(DatagathererConnector.class);
+ private ComponentManager compMan;
// Start of user code Datagathererconnector_constructor
/**
@@ -39,6 +40,7 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
DatagathererConnector()
{
LOGGER.debug("Constructor called on " + this);
+ this.compMan = new ComponentManager(this);
// TODO: Implement this constructor.
}
// End of user code
@@ -109,38 +111,38 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
-
+ compMan.undeploy();
// TODO: Implement how to undeploy this datagatherer.
}
// End of user code
- // Start of user code Datagatherer_Kind_deploy_action
+ // Start of user code Datagatherer_Kind_configure_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: deploy
+ * - term: configure
* - title:
*/
@Override
- public void deploy()
+ public void configure()
{
- LOGGER.debug("Action deploy() called on " + this);
-
- // TODO: Implement how to deploy this datagatherer.
+ LOGGER.debug("Action configure() called on " + this);
+ compMan.configure();
+ // TODO: Implement how to configure this datagatherer.
}
// End of user code
- // Start of user code Datagatherer_Kind_configure_action
+ // Start of user code Datagatherer_Kind_Stop_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: configure
- * - title:
+ * - term: stop
+ * - title: Stop the application.
*/
@Override
- public void configure()
+ public void stop()
{
- LOGGER.debug("Action configure() called on " + this);
-
- // TODO: Implement how to configure this datagatherer.
+ LOGGER.debug("Action stop() called on " + this);
+ compMan.stop();
+ // TODO: Implement how to stop this datagatherer.
}
// End of user code
// Start of user code Datagatherer_Kind_Start_action
@@ -154,23 +156,23 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
-
+ compMan.start();
// 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_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);
-
- // TODO: Implement how to stop this datagatherer.
+ LOGGER.debug("Action deploy() called on " + this);
+ compMan.deploy();
+ // TODO: Implement how to deploy this datagatherer.
}
// End of user code
diff --git a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java b/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.java
index c25839d26d3d07f39b51746b82e6ab739d3ae33b..c3ef0f75cd789f05488770a0249a6cd5a206b26a 100644
--- a/de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/MonitoringpropertyConnector.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 Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
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 68922e707cd671f4c5b9a3957758835a437df2ff..ed4ecb581bd32c57f8c1f5534d64d840139d53b0 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 Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
*/
public class ProcessorConnector extends monitoring.impl.ProcessorImpl
{
+ private ComponentManager compMan;
/**
* Initialize the logger.
*/
@@ -39,6 +40,7 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
ProcessorConnector()
{
LOGGER.debug("Constructor called on " + this);
+ this.compMan = new ComponentManager(this);
// TODO: Implement this constructor.
}
// End of user code
@@ -109,38 +111,39 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
-
+ compMan.undeploy();
// TODO: Implement how to undeploy this processor.
}
// End of user code
- // Start of user code Processor_Kind_deploy_action
+ // Start of user code Processor_Kind_configure_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: deploy
+ * - term: configure
* - title:
*/
@Override
- public void deploy()
+ public void configure()
{
- LOGGER.debug("Action deploy() called on " + this);
-
- // TODO: Implement how to deploy this processor.
+ LOGGER.debug("Action configure() called on " + this);
+ compMan.configure();
+ // TODO: Implement how to configure this processor.
}
// End of user code
- // Start of user code Processor_Kind_configure_action
+ // Start of user code Processor_Kind_Stop_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: configure
- * - title:
+ * - term: stop
+ * - title: Stop the application.
*/
@Override
- public void configure()
+ public void stop()
{
- LOGGER.debug("Action configure() called on " + this);
+ LOGGER.debug("Action stop() called on " + this);
+ compMan.stop();
- // TODO: Implement how to configure this processor.
+ // TODO: Implement how to stop this processor.
}
// End of user code
// Start of user code Processor_Kind_Start_action
@@ -154,23 +157,23 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
-
+ compMan.start();
// 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_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);
-
- // TODO: Implement how to stop this processor.
+ LOGGER.debug("Action deploy() called on " + this);
+ compMan.deploy();
+ // TODO: Implement how to deploy 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 145283706d65aa26e92efaf7614d2f19170b36a4..89cf5e49ffc65332aa1fbb7162ed9af63cb4b32d 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 Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -27,6 +27,7 @@ import org.slf4j.LoggerFactory;
*/
public class PublisherConnector extends monitoring.impl.PublisherImpl
{
+ private ComponentManager compMan;
/**
* Initialize the logger.
*/
@@ -39,6 +40,7 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
PublisherConnector()
{
LOGGER.debug("Constructor called on " + this);
+ this.compMan = new ComponentManager(this);
// TODO: Implement this constructor.
}
// End of user code
@@ -109,38 +111,38 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
-
+ compMan.undeploy();
// TODO: Implement how to undeploy this publisher.
}
// End of user code
- // Start of user code Publisher_Kind_deploy_action
+ // Start of user code Publisher_Kind_configure_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: deploy
+ * - term: configure
* - title:
*/
@Override
- public void deploy()
+ public void configure()
{
- LOGGER.debug("Action deploy() called on " + this);
-
- // TODO: Implement how to deploy this publisher.
+ LOGGER.debug("Action configure() called on " + this);
+ compMan.configure();
+ // TODO: Implement how to configure this publisher.
}
// End of user code
- // Start of user code Publisher_Kind_configure_action
+ // Start of user code Publisher_Kind_Stop_action
/**
* Implement OCCI action:
* - scheme: http://schemas.modmacao.org/occi/platform/component/action#
- * - term: configure
- * - title:
+ * - term: stop
+ * - title: Stop the application.
*/
@Override
- public void configure()
+ public void stop()
{
- LOGGER.debug("Action configure() called on " + this);
-
- // TODO: Implement how to configure this publisher.
+ LOGGER.debug("Action stop() called on " + this);
+ compMan.stop();
+ // TODO: Implement how to stop this publisher.
}
// End of user code
// Start of user code Publisher_Kind_Start_action
@@ -154,23 +156,23 @@ public class PublisherConnector extends monitoring.impl.PublisherImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
-
+ compMan.start();
// 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_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);
-
- // TODO: Implement how to stop this publisher.
+ LOGGER.debug("Action deploy() called on " + this);
+ compMan.deploy();
+ // TODO: Implement how to deploy 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 e8c2e4bac756edca89bdacc705c63e4bea43bf18..889a962727646135478a4d453319bab78dcf9404 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,7 +10,7 @@
* - Philippe Merle <philippe.merle@inria.fr>
* - Faiez Zalila <faiez.zalila@inria.fr>
*
- * 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
+ * Generated at Mon Dec 10 09:47:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
*/
package de.ugoe.cs.rwm.mocci.connector;
@@ -20,7 +20,6 @@ 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;
@@ -39,7 +38,6 @@ public class SensorConnector extends monitoring.impl.SensorImpl
{
private ConfigurationManagementTool cmtool = new AnsibleCMTool();
-
/**
* Initialize the logger.
*/
@@ -111,6 +109,41 @@ public class SensorConnector extends monitoring.impl.SensorImpl
// Sensor actions.
//
+ // Start of user code Sensor_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()
+ {
+ int status = -1;
+ LOGGER.debug("Action stop() called on " + this);
+
+ // Application State Machine.
+ switch(getOcciAppState().getValue()) {
+
+ 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_deploy_action
/**
* Implement OCCI action:
@@ -216,41 +249,6 @@ public class SensorConnector extends monitoring.impl.SensorImpl
}
}
// End of user code
- // Start of user code Sensor_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()
- {
- int status = -1;
- LOGGER.debug("Action stop() called on " + this);
-
- // Application State Machine.
- switch(getOcciAppState().getValue()) {
-
- 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_configure_action
/**
* Implement OCCI action:
@@ -345,16 +343,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
}
}
// 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) {
@@ -367,6 +356,16 @@ public class SensorConnector extends monitoring.impl.SensorImpl
}
return true;
}
-
+
+ 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;
+
+}
}
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/.classpath b/de.ugoe.cs.rwm.mocci.model.edit/.classpath
index ba9563870359d6f6776459965a9a63042a32bfb4..9f26f94005a15116e7455333308dcb80ef6440e6 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/.classpath
+++ b/de.ugoe.cs.rwm.mocci.model.edit/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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 b1886adb46c085de842f1283c1a3c25151bfc988..1752c9353159a3382e3f642e31d09b45ee82f7c4 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=..
+connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
index 797626398c73ecf9b3fd41dfee05a47696d8b2cb..adf132da4a01b66e8b6984dad45bfb89ea09ac9e 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
+++ b/de.ugoe.cs.rwm.mocci.model.edit/plugin.properties
@@ -52,3 +52,8 @@ _UI_Monitoringattribute_monitoringAttributeValue_feature = Monitoring Attribute
_UI_Monitoringproperty_type = Monitoringproperty
_UI_Monitoringproperty_monitoringAttributeName_feature = Monitoring Attribute Name
_UI_Monitoringproperty_monitoringAttributeValue_feature = Monitoring Attribute Value
+_UI_Monitoringproperty_monitoringPropertyName_feature = Monitoring Property Name
+_UI_Monitoringproperty_monitoringPropertyValue_feature = Monitoring Property Value
+_UI_Monitoringproperty_monitoringPropertyId_feature = Monitoring Property Id
+_UI_Sensor_monitoringPropertyId_feature = Monitoring Property Id
+_UI_Sensor_monitoringPropertyMixin_feature = Monitoring Property Mixin
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
index 4ea0ab15a710371f133d7f6c35a1aa212644fab8..c7cbbe43dd3cbd2c5967bc7351fae70368d25614 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
+++ b/de.ugoe.cs.rwm.mocci.model.edit/src-gen/monitoring/provider/MonitoringpropertyItemProvider.java
@@ -59,26 +59,27 @@ public class MonitoringpropertyItemProvider extends MixinBaseItemProvider {
if (itemPropertyDescriptors == null) {
super.getPropertyDescriptors(object);
- addMonitoringAttributeNamePropertyDescriptor(object);
- addMonitoringAttributeValuePropertyDescriptor(object);
+ addMonitoringPropertyNamePropertyDescriptor(object);
+ addMonitoringPropertyValuePropertyDescriptor(object);
+ addMonitoringPropertyIdPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
/**
- * This adds a property descriptor for the Monitoring Attribute Name feature.
+ * This adds a property descriptor for the Monitoring Property Name feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addMonitoringAttributeNamePropertyDescriptor(Object object) {
+ protected void addMonitoringPropertyNamePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Monitoringproperty_monitoringAttributeName_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringAttributeName_feature", "_UI_Monitoringproperty_type"),
- MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME,
+ getString("_UI_Monitoringproperty_monitoringPropertyName_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringPropertyName_feature", "_UI_Monitoringproperty_type"),
+ MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME,
true,
false,
false,
@@ -88,19 +89,41 @@ public class MonitoringpropertyItemProvider extends MixinBaseItemProvider {
}
/**
- * This adds a property descriptor for the Monitoring Attribute Value feature.
+ * This adds a property descriptor for the Monitoring Property Value feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- protected void addMonitoringAttributeValuePropertyDescriptor(Object object) {
+ protected void addMonitoringPropertyValuePropertyDescriptor(Object object) {
itemPropertyDescriptors.add
(createItemPropertyDescriptor
(((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
getResourceLocator(),
- getString("_UI_Monitoringproperty_monitoringAttributeValue_feature"),
- getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringAttributeValue_feature", "_UI_Monitoringproperty_type"),
- MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE,
+ getString("_UI_Monitoringproperty_monitoringPropertyValue_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringPropertyValue_feature", "_UI_Monitoringproperty_type"),
+ MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
+ /**
+ * This adds a property descriptor for the Monitoring Property Id feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addMonitoringPropertyIdPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_Monitoringproperty_monitoringPropertyId_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Monitoringproperty_monitoringPropertyId_feature", "_UI_Monitoringproperty_type"),
+ MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_ID,
true,
false,
false,
@@ -128,7 +151,7 @@ public class MonitoringpropertyItemProvider extends MixinBaseItemProvider {
*/
@Override
public String getText(Object object) {
- String label = ((Monitoringproperty)object).getMonitoringAttributeName();
+ String label = ((Monitoringproperty)object).getMonitoringPropertyName();
return label == null || label.length() == 0 ?
getString("_UI_Monitoringproperty_type") :
getString("_UI_Monitoringproperty_type") + " " + label;
@@ -147,8 +170,9 @@ public class MonitoringpropertyItemProvider extends MixinBaseItemProvider {
updateChildren(notification);
switch (notification.getFeatureID(Monitoringproperty.class)) {
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
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 dd1ac913555a277a9269632b2f124ca573c03240..db4e1401f7fa900057fb4733dd27e50d233139af 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
@@ -69,6 +69,7 @@ public class SensorItemProvider extends ApplicationItemProvider {
addOcciSensorPeriodPropertyDescriptor(object);
addOcciSensorGranularityPropertyDescriptor(object);
addOcciSensorAccuracyPropertyDescriptor(object);
+ addMonitoringPropertyMixinPropertyDescriptor(object);
}
return itemPropertyDescriptors;
}
@@ -205,6 +206,28 @@ public class SensorItemProvider extends ApplicationItemProvider {
null));
}
+ /**
+ * This adds a property descriptor for the Monitoring Property Mixin feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ protected void addMonitoringPropertyMixinPropertyDescriptor(Object object) {
+ itemPropertyDescriptors.add
+ (createItemPropertyDescriptor
+ (((ComposeableAdapterFactory)adapterFactory).getRootAdapterFactory(),
+ getResourceLocator(),
+ getString("_UI_Sensor_monitoringPropertyMixin_feature"),
+ getString("_UI_PropertyDescriptor_description", "_UI_Sensor_monitoringPropertyMixin_feature", "_UI_Sensor_type"),
+ MonitoringPackage.Literals.SENSOR__MONITORING_PROPERTY_MIXIN,
+ true,
+ false,
+ false,
+ ItemPropertyDescriptor.GENERIC_VALUE_IMAGE,
+ null,
+ null));
+ }
+
/**
* This returns Sensor.gif.
* <!-- begin-user-doc -->
@@ -249,6 +272,7 @@ public class SensorItemProvider extends ApplicationItemProvider {
case MonitoringPackage.SENSOR__OCCI_SENSOR_PERIOD:
case MonitoringPackage.SENSOR__OCCI_SENSOR_GRANULARITY:
case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
+ case MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN:
fireNotifyChanged(new ViewerNotification(notification, notification.getNotifier(), false, true));
return;
}
diff --git a/de.ugoe.cs.rwm.mocci.model/.classpath b/de.ugoe.cs.rwm.mocci.model/.classpath
index ba9563870359d6f6776459965a9a63042a32bfb4..9f26f94005a15116e7455333308dcb80ef6440e6 100644
--- a/de.ugoe.cs.rwm.mocci.model/.classpath
+++ b/de.ugoe.cs.rwm.mocci.model/.classpath
@@ -3,5 +3,6 @@
<classpathentry kind="src" path="src-gen"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
+ <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
</classpath>
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 b1886adb46c085de842f1283c1a3c25151bfc988..1752c9353159a3382e3f642e31d09b45ee82f7c4 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=..
+connection.project.dir=../de.ugoe.cs.rwm.mocci.connector
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
index 479a9581be5acf06582572a43c05196b830a4b73..40d146f1526940def5d1d5712f6f10b219cb177d 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.ecore
@@ -54,6 +54,12 @@
<details key="documentation" value="Accuracy of time measument (seconds)"/>
</eAnnotations>
</eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyMixin"
+ eType="#//String">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value=""/>
+ </eAnnotations>
+ </eStructuralFeatures>
</eClassifiers>
<eClassifiers xsi:type="ecore:EClass" name="Datagatherer" eSuperTypes="platform:/plugin/org.modmacao.occi.platform/model/platform.ecore#//Component">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
@@ -95,14 +101,19 @@
<eAnnotations source="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot">
<details key="appliesConstraint" value="self.entity.oclIsKindOf(occi::Entity)"/>
</eAnnotations>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringAttributeName"
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyName"
lowerBound="1" eType="#//String">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value=""/>
</eAnnotations>
</eStructuralFeatures>
- <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringAttributeValue"
- lowerBound="1" eType="#//String">
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyValue"
+ eType="#//String">
+ <eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
+ <details key="documentation" value=""/>
+ </eAnnotations>
+ </eStructuralFeatures>
+ <eStructuralFeatures xsi:type="ecore:EAttribute" name="monitoringPropertyId" eType="#//String">
<eAnnotations source="http://www.eclipse.org/emf/2002/GenModel">
<details key="documentation" value=""/>
</eAnnotations>
diff --git a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
index 43cd2f47575a3ae34c2bba402cec2f76f1f9b925..c928a8daa69022d7cbeeb8e7bf31ad73584699b5 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.genmodel
@@ -35,6 +35,9 @@
<genFeatures createChild="false">
<ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/occiSensorAccuracy"/>
</genFeatures>
+ <genFeatures createChild="false">
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Sensor/monitoringPropertyMixin"/>
+ </genFeatures>
</genClasses>
<genClasses>
<ecoreClass href="monitoring.ecore#//Datagatherer"/>
@@ -57,10 +60,13 @@
<genClasses>
<ecoreClass href="monitoring.ecore#//Monitoringproperty"/>
<genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringAttributeName"/>
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringPropertyName"/>
+ </genFeatures>
+ <genFeatures createChild="false">
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringPropertyValue"/>
</genFeatures>
<genFeatures createChild="false">
- <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringAttributeValue"/>
+ <ecoreFeature xsi:type="ecore:EAttribute" href="monitoring.ecore#//Monitoringproperty/monitoringPropertyId"/>
</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 72dcb46435b2e6f7ced8a5635a5ba709752d9b97..4f48bb649c54d160b986ab7e6317133bddbd491d 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
@@ -9,6 +9,7 @@
<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"/>
+ <attributes name="monitoring.property.mixin" default="" type="//@types.2"/>
<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">
@@ -24,8 +25,9 @@
<parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
</kinds>
<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" required="true" type="//@types.2"/>
+ <attributes name="monitoring.property.name" mutable="false" required="true" type="//@types.2"/>
+ <attributes name="monitoring.property.value" type="//@types.2"/>
+ <attributes name="monitoring.property.id" 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/src-gen/monitoring/MonitoringPackage.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/MonitoringPackage.java
index f8dcb04ef2881a079a8bf0851f80694d23cea8c5..4511f8c2fe8c016832691f4de998048fb862de52 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
@@ -270,6 +270,15 @@ public interface MonitoringPackage extends EPackage {
*/
int SENSOR__OCCI_SENSOR_ACCURACY = PlatformPackage.APPLICATION_FEATURE_COUNT + 5;
+ /**
+ * The feature id for the '<em><b>Monitoring Property Mixin</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int SENSOR__MONITORING_PROPERTY_MIXIN = PlatformPackage.APPLICATION_FEATURE_COUNT + 6;
+
/**
* The number of structural features of the '<em>Sensor</em>' class.
* <!-- begin-user-doc -->
@@ -277,7 +286,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int SENSOR_FEATURE_COUNT = PlatformPackage.APPLICATION_FEATURE_COUNT + 6;
+ int SENSOR_FEATURE_COUNT = PlatformPackage.APPLICATION_FEATURE_COUNT + 7;
/**
* The operation id for the '<em>Occi Create</em>' operation.
@@ -1085,22 +1094,31 @@ public interface MonitoringPackage extends EPackage {
int MONITORINGPROPERTY__ATTRIBUTES = OCCIPackage.MIXIN_BASE__ATTRIBUTES;
/**
- * The feature id for the '<em><b>Monitoring Attribute Name</b></em>' attribute.
+ * The feature id for the '<em><b>Monitoring Property Name</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ * @ordered
+ */
+ int MONITORINGPROPERTY__MONITORING_PROPERTY_NAME = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
+
+ /**
+ * The feature id for the '<em><b>Monitoring Property Value</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 0;
+ int MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
/**
- * The feature id for the '<em><b>Monitoring Attribute Value</b></em>' attribute.
+ * The feature id for the '<em><b>Monitoring Property Id</b></em>' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
* @ordered
*/
- int MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 1;
+ int MONITORINGPROPERTY__MONITORING_PROPERTY_ID = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 2;
/**
* The number of structural features of the '<em>Monitoringproperty</em>' class.
@@ -1109,7 +1127,7 @@ public interface MonitoringPackage extends EPackage {
* @generated
* @ordered
*/
- int MONITORINGPROPERTY_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 2;
+ int MONITORINGPROPERTY_FEATURE_COUNT = OCCIPackage.MIXIN_BASE_FEATURE_COUNT + 3;
/**
* The operation id for the '<em>Applies Constraint</em>' operation.
@@ -1236,6 +1254,17 @@ public interface MonitoringPackage extends EPackage {
*/
EAttribute getSensor_OcciSensorAccuracy();
+ /**
+ * Returns the meta object for the attribute '{@link monitoring.Sensor#getMonitoringPropertyMixin <em>Monitoring Property Mixin</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Monitoring Property Mixin</em>'.
+ * @see monitoring.Sensor#getMonitoringPropertyMixin()
+ * @see #getSensor()
+ * @generated
+ */
+ EAttribute getSensor_MonitoringPropertyMixin();
+
/**
* Returns the meta object for class '{@link monitoring.Datagatherer <em>Datagatherer</em>}'.
* <!-- begin-user-doc -->
@@ -1310,26 +1339,37 @@ public interface MonitoringPackage extends EPackage {
EClass getMonitoringproperty();
/**
- * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}'.
+ * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}'.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @return the meta object for the attribute '<em>Monitoring Property Name</em>'.
+ * @see monitoring.Monitoringproperty#getMonitoringPropertyName()
+ * @see #getMonitoringproperty()
+ * @generated
+ */
+ EAttribute getMonitoringproperty_MonitoringPropertyName();
+
+ /**
+ * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Monitoring Attribute Name</em>'.
- * @see monitoring.Monitoringproperty#getMonitoringAttributeName()
+ * @return the meta object for the attribute '<em>Monitoring Property Value</em>'.
+ * @see monitoring.Monitoringproperty#getMonitoringPropertyValue()
* @see #getMonitoringproperty()
* @generated
*/
- EAttribute getMonitoringproperty_MonitoringAttributeName();
+ EAttribute getMonitoringproperty_MonitoringPropertyValue();
/**
- * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}'.
+ * Returns the meta object for the attribute '{@link monitoring.Monitoringproperty#getMonitoringPropertyId <em>Monitoring Property Id</em>}'.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @return the meta object for the attribute '<em>Monitoring Attribute Value</em>'.
- * @see monitoring.Monitoringproperty#getMonitoringAttributeValue()
+ * @return the meta object for the attribute '<em>Monitoring Property Id</em>'.
+ * @see monitoring.Monitoringproperty#getMonitoringPropertyId()
* @see #getMonitoringproperty()
* @generated
*/
- EAttribute getMonitoringproperty_MonitoringAttributeValue();
+ EAttribute getMonitoringproperty_MonitoringPropertyId();
/**
* Returns the meta object for the '{@link monitoring.Monitoringproperty#appliesConstraint(org.eclipse.emf.common.util.DiagnosticChain, java.util.Map) <em>Applies Constraint</em>}' operation.
@@ -1456,6 +1496,14 @@ public interface MonitoringPackage extends EPackage {
*/
EAttribute SENSOR__OCCI_SENSOR_ACCURACY = eINSTANCE.getSensor_OcciSensorAccuracy();
+ /**
+ * The meta object literal for the '<em><b>Monitoring Property Mixin</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute SENSOR__MONITORING_PROPERTY_MIXIN = eINSTANCE.getSensor_MonitoringPropertyMixin();
+
/**
* The meta object literal for the '{@link monitoring.impl.DatagathererImpl <em>Datagatherer</em>}' class.
* <!-- begin-user-doc -->
@@ -1521,20 +1569,28 @@ public interface MonitoringPackage extends EPackage {
EClass MONITORINGPROPERTY = eINSTANCE.getMonitoringproperty();
/**
- * The meta object literal for the '<em><b>Monitoring Attribute Name</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Monitoring Property Name</b></em>' attribute feature.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ EAttribute MONITORINGPROPERTY__MONITORING_PROPERTY_NAME = eINSTANCE.getMonitoringproperty_MonitoringPropertyName();
+
+ /**
+ * The meta object literal for the '<em><b>Monitoring Property Value</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME = eINSTANCE.getMonitoringproperty_MonitoringAttributeName();
+ EAttribute MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE = eINSTANCE.getMonitoringproperty_MonitoringPropertyValue();
/**
- * The meta object literal for the '<em><b>Monitoring Attribute Value</b></em>' attribute feature.
+ * The meta object literal for the '<em><b>Monitoring Property Id</b></em>' attribute feature.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
* @generated
*/
- EAttribute MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE = eINSTANCE.getMonitoringproperty_MonitoringAttributeValue();
+ EAttribute MONITORINGPROPERTY__MONITORING_PROPERTY_ID = eINSTANCE.getMonitoringproperty_MonitoringPropertyId();
/**
* The meta object literal for the '<em><b>Applies Constraint</b></em>' operation.
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 a001adc87f51e034330d1881eed31eecc89b0bca..115abceda3a009457596d369fd663133e3196850 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
@@ -348,15 +348,17 @@ 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 _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);
- public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorPeriod = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_PERIOD, Types._Sensor, 2);
- public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimebase = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMEBASE, Types._Sensor, 3);
- public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestart = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTART, Types._Sensor, 4);
- public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestop = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTOP, Types._Sensor, 5);
+ public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringPropertyId = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_ID, Types._Monitoringproperty, 0);
+ public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringPropertyName = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME, Types._Monitoringproperty, 1);
+ public static final /*@NonNull*/ ExecutorProperty _Monitoringproperty__monitoringPropertyValue = new EcoreExecutorProperty(MonitoringPackage.Literals.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE, Types._Monitoringproperty, 2);
+
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__monitoringPropertyMixin = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__MONITORING_PROPERTY_MIXIN, Types._Sensor, 0);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorAccuracy = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_ACCURACY, Types._Sensor, 1);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorGranularity = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_GRANULARITY, Types._Sensor, 2);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorPeriod = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_PERIOD, Types._Sensor, 3);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimebase = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMEBASE, Types._Sensor, 4);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestart = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTART, Types._Sensor, 5);
+ public static final /*@NonNull*/ ExecutorProperty _Sensor__occiSensorTimestop = new EcoreExecutorProperty(MonitoringPackage.Literals.SENSOR__OCCI_SENSOR_TIMESTOP, Types._Sensor, 6);
static {
Init.initEnd();
}
@@ -878,8 +880,9 @@ public class MonitoringTables
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _DateTime = {};
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Monitoringproperty = {
- MonitoringTables.Properties._Monitoringproperty__monitoringAttributeName,
- MonitoringTables.Properties._Monitoringproperty__monitoringAttributeValue
+ MonitoringTables.Properties._Monitoringproperty__monitoringPropertyId,
+ MonitoringTables.Properties._Monitoringproperty__monitoringPropertyName,
+ MonitoringTables.Properties._Monitoringproperty__monitoringPropertyValue
};
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Processor = {};
@@ -889,6 +892,7 @@ public class MonitoringTables
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Second = {};
private static final /*@NonNull*/ ExecutorProperty /*@NonNull*/ [] _Sensor = {
+ MonitoringTables.Properties._Sensor__monitoringPropertyMixin,
MonitoringTables.Properties._Sensor__occiSensorAccuracy,
MonitoringTables.Properties._Sensor__occiSensorGranularity,
MonitoringTables.Properties._Sensor__occiSensorPeriod,
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
index 1d558817b525d52cd797428878042eb474ce89bb..fefe3a8fe17abf48007d33969da7697eed754349 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Monitoringproperty.java
@@ -27,8 +27,9 @@ import org.eclipse.emf.common.util.DiagnosticChain;
* 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>
+ * <li>{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
+ * <li>{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}</li>
+ * <li>{@link monitoring.Monitoringproperty#getMonitoringPropertyId <em>Monitoring Property Id</em>}</li>
* </ul>
*
* @see monitoring.MonitoringPackage#getMonitoringproperty()
@@ -37,56 +38,82 @@ import org.eclipse.emf.common.util.DiagnosticChain;
*/
public interface Monitoringproperty extends MixinBase {
/**
- * Returns the value of the '<em><b>Monitoring Attribute Name</b></em>' attribute.
+ * Returns the value of the '<em><b>Monitoring Property 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()
+ * @return the value of the '<em>Monitoring Property Name</em>' attribute.
+ * @see #setMonitoringPropertyName(String)
+ * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringPropertyName()
* @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'"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringPropertyName'"
* @generated
*/
- String getMonitoringAttributeName();
+ String getMonitoringPropertyName();
/**
- * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}' attribute.
+ * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringPropertyName <em>Monitoring Property Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Monitoring Attribute Name</em>' attribute.
- * @see #getMonitoringAttributeName()
+ * @param value the new value of the '<em>Monitoring Property Name</em>' attribute.
+ * @see #getMonitoringPropertyName()
* @generated
*/
- void setMonitoringAttributeName(String value);
+ void setMonitoringPropertyName(String value);
/**
- * Returns the value of the '<em><b>Monitoring Attribute Value</b></em>' attribute.
+ * Returns the value of the '<em><b>Monitoring Property 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'"
+ * @return the value of the '<em>Monitoring Property Value</em>' attribute.
+ * @see #setMonitoringPropertyValue(String)
+ * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringPropertyValue()
+ * @model dataType="monitoring.String"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringPropertyValue'"
+ * @generated
+ */
+ String getMonitoringPropertyValue();
+
+ /**
+ * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringPropertyValue <em>Monitoring Property Value</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Monitoring Property Value</em>' attribute.
+ * @see #getMonitoringPropertyValue()
+ * @generated
+ */
+ void setMonitoringPropertyValue(String value);
+
+ /**
+ * Returns the value of the '<em><b>Monitoring Property Id</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ *
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Monitoring Property Id</em>' attribute.
+ * @see #setMonitoringPropertyId(String)
+ * @see monitoring.MonitoringPackage#getMonitoringproperty_MonitoringPropertyId()
+ * @model dataType="monitoring.String"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Monitoringproperty!monitoringPropertyId'"
* @generated
*/
- String getMonitoringAttributeValue();
+ String getMonitoringPropertyId();
/**
- * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}' attribute.
+ * Sets the value of the '{@link monitoring.Monitoringproperty#getMonitoringPropertyId <em>Monitoring Property Id</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @param value the new value of the '<em>Monitoring Attribute Value</em>' attribute.
- * @see #getMonitoringAttributeValue()
+ * @param value the new value of the '<em>Monitoring Property Id</em>' attribute.
+ * @see #getMonitoringPropertyId()
* @generated
*/
- void setMonitoringAttributeValue(String value);
+ void setMonitoringPropertyId(String value);
/**
* <!-- begin-user-doc -->
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
index df8d42b2461bc80a63abce8e8bdb87670abeaede..4210893c52882b407afd97071b394a63ab1daa32 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/Sensor.java
@@ -33,6 +33,7 @@ import org.modmacao.occi.platform.Application;
* <li>{@link monitoring.Sensor#getOcciSensorPeriod <em>Occi Sensor Period</em>}</li>
* <li>{@link monitoring.Sensor#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}</li>
* <li>{@link monitoring.Sensor#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}</li>
+ * <li>{@link monitoring.Sensor#getMonitoringPropertyMixin <em>Monitoring Property Mixin</em>}</li>
* </ul>
*
* @see monitoring.MonitoringPackage#getSensor()
@@ -196,4 +197,30 @@ public interface Sensor extends Application {
*/
void setOcciSensorAccuracy(String value);
+ /**
+ * Returns the value of the '<em><b>Monitoring Property Mixin</b></em>' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * <!-- begin-model-doc -->
+ *
+ * <!-- end-model-doc -->
+ * @return the value of the '<em>Monitoring Property Mixin</em>' attribute.
+ * @see #setMonitoringPropertyMixin(String)
+ * @see monitoring.MonitoringPackage#getSensor_MonitoringPropertyMixin()
+ * @model dataType="monitoring.String"
+ * annotation="http://www.eclipse.org/emf/2002/GenModel get='throw new UnsupportedOperationException(); // FIXME Unimplemented http://schemas.ugoe.cs.rwm/monitoring/ecore!Sensor!monitoringPropertyMixin'"
+ * @generated
+ */
+ String getMonitoringPropertyMixin();
+
+ /**
+ * Sets the value of the '{@link monitoring.Sensor#getMonitoringPropertyMixin <em>Monitoring Property Mixin</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @param value the new value of the '<em>Monitoring Property Mixin</em>' attribute.
+ * @see #getMonitoringPropertyMixin()
+ * @generated
+ */
+ void setMonitoringPropertyMixin(String value);
+
} // Sensor
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 301584d6817c8057bc8f06b3c22978fb843efe91..4a473d2e3486fa4266106b7631cea006256b5884 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
@@ -237,6 +237,15 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
return (EAttribute)sensorEClass.getEStructuralFeatures().get(5);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getSensor_MonitoringPropertyMixin() {
+ return (EAttribute)sensorEClass.getEStructuralFeatures().get(6);
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -305,7 +314,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getMonitoringproperty_MonitoringAttributeName() {
+ public EAttribute getMonitoringproperty_MonitoringPropertyName() {
return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(0);
}
@@ -314,10 +323,19 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
* <!-- end-user-doc -->
* @generated
*/
- public EAttribute getMonitoringproperty_MonitoringAttributeValue() {
+ public EAttribute getMonitoringproperty_MonitoringPropertyValue() {
return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(1);
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public EAttribute getMonitoringproperty_MonitoringPropertyId() {
+ return (EAttribute)monitoringpropertyEClass.getEStructuralFeatures().get(2);
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -389,6 +407,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_PERIOD);
createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_GRANULARITY);
createEAttribute(sensorEClass, SENSOR__OCCI_SENSOR_ACCURACY);
+ createEAttribute(sensorEClass, SENSOR__MONITORING_PROPERTY_MIXIN);
datagathererEClass = createEClass(DATAGATHERER);
createEAttribute(datagathererEClass, DATAGATHERER__OCCI_COLLECTOR_PERIOD);
@@ -400,8 +419,9 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
publisherEClass = createEClass(PUBLISHER);
monitoringpropertyEClass = createEClass(MONITORINGPROPERTY);
- createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME);
- createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE);
+ createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_PROPERTY_NAME);
+ createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE);
+ createEAttribute(monitoringpropertyEClass, MONITORINGPROPERTY__MONITORING_PROPERTY_ID);
createEOperation(monitoringpropertyEClass, MONITORINGPROPERTY___APPLIES_CONSTRAINT__DIAGNOSTICCHAIN_MAP);
// Create data types
@@ -456,6 +476,7 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
initEAttribute(getSensor_OcciSensorPeriod(), this.getSecond(), "occiSensorPeriod", null, 1, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSensor_OcciSensorGranularity(), this.getSecond(), "occiSensorGranularity", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEAttribute(getSensor_OcciSensorAccuracy(), this.getSecond(), "occiSensorAccuracy", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getSensor_MonitoringPropertyMixin(), this.getString(), "monitoringPropertyMixin", null, 0, 1, Sensor.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
initEClass(datagathererEClass, Datagatherer.class, "Datagatherer", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
initEAttribute(getDatagatherer_OcciCollectorPeriod(), this.getSecond(), "occiCollectorPeriod", null, 1, 1, Datagatherer.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
@@ -467,8 +488,9 @@ public class MonitoringPackageImpl extends EPackageImpl implements MonitoringPac
initEClass(publisherEClass, Publisher.class, "Publisher", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
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);
+ initEAttribute(getMonitoringproperty_MonitoringPropertyName(), this.getString(), "monitoringPropertyName", null, 1, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMonitoringproperty_MonitoringPropertyValue(), this.getString(), "monitoringPropertyValue", null, 0, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
+ initEAttribute(getMonitoringproperty_MonitoringPropertyId(), this.getString(), "monitoringPropertyId", null, 0, 1, Monitoringproperty.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, 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);
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
index ba9b37a497214ac1ceb143e739a05fbf1f54fb9a..accbe760f29a3732bf74dc79686e0ebf01414171 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/MonitoringpropertyImpl.java
@@ -58,52 +58,73 @@ import org.eclipse.ocl.pivot.values.IntegerValue;
* The following features are implemented:
* </p>
* <ul>
- * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringAttributeName <em>Monitoring Attribute Name</em>}</li>
- * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringAttributeValue <em>Monitoring Attribute Value</em>}</li>
+ * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringPropertyName <em>Monitoring Property Name</em>}</li>
+ * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringPropertyValue <em>Monitoring Property Value</em>}</li>
+ * <li>{@link monitoring.impl.MonitoringpropertyImpl#getMonitoringPropertyId <em>Monitoring Property Id</em>}</li>
* </ul>
*
* @generated
*/
public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringproperty {
/**
- * The default value of the '{@link #getMonitoringAttributeName() <em>Monitoring Attribute Name</em>}' attribute.
+ * The default value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMonitoringAttributeName()
+ * @see #getMonitoringPropertyName()
* @generated
* @ordered
*/
- protected static final String MONITORING_ATTRIBUTE_NAME_EDEFAULT = null;
+ protected static final String MONITORING_PROPERTY_NAME_EDEFAULT = null;
/**
- * The cached value of the '{@link #getMonitoringAttributeName() <em>Monitoring Attribute Name</em>}' attribute.
+ * The cached value of the '{@link #getMonitoringPropertyName() <em>Monitoring Property Name</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMonitoringAttributeName()
+ * @see #getMonitoringPropertyName()
* @generated
* @ordered
*/
- protected String monitoringAttributeName = MONITORING_ATTRIBUTE_NAME_EDEFAULT;
+ protected String monitoringPropertyName = MONITORING_PROPERTY_NAME_EDEFAULT;
/**
- * The default value of the '{@link #getMonitoringAttributeValue() <em>Monitoring Attribute Value</em>}' attribute.
+ * The default value of the '{@link #getMonitoringPropertyValue() <em>Monitoring Property Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMonitoringAttributeValue()
+ * @see #getMonitoringPropertyValue()
* @generated
* @ordered
*/
- protected static final String MONITORING_ATTRIBUTE_VALUE_EDEFAULT = null;
+ protected static final String MONITORING_PROPERTY_VALUE_EDEFAULT = null;
/**
- * The cached value of the '{@link #getMonitoringAttributeValue() <em>Monitoring Attribute Value</em>}' attribute.
+ * The cached value of the '{@link #getMonitoringPropertyValue() <em>Monitoring Property Value</em>}' attribute.
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
- * @see #getMonitoringAttributeValue()
+ * @see #getMonitoringPropertyValue()
* @generated
* @ordered
*/
- protected String monitoringAttributeValue = MONITORING_ATTRIBUTE_VALUE_EDEFAULT;
+ protected String monitoringPropertyValue = MONITORING_PROPERTY_VALUE_EDEFAULT;
+
+ /**
+ * The default value of the '{@link #getMonitoringPropertyId() <em>Monitoring Property Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMonitoringPropertyId()
+ * @generated
+ * @ordered
+ */
+ protected static final String MONITORING_PROPERTY_ID_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getMonitoringPropertyId() <em>Monitoring Property Id</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMonitoringPropertyId()
+ * @generated
+ * @ordered
+ */
+ protected String monitoringPropertyId = MONITORING_PROPERTY_ID_EDEFAULT;
/**
* <!-- begin-user-doc -->
@@ -129,8 +150,8 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
* <!-- end-user-doc -->
* @generated
*/
- public String getMonitoringAttributeName() {
- return monitoringAttributeName;
+ public String getMonitoringPropertyName() {
+ return monitoringPropertyName;
}
/**
@@ -138,11 +159,11 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
* <!-- end-user-doc -->
* @generated
*/
- public void setMonitoringAttributeName(String newMonitoringAttributeName) {
- String oldMonitoringAttributeName = monitoringAttributeName;
- monitoringAttributeName = newMonitoringAttributeName;
+ public void setMonitoringPropertyName(String newMonitoringPropertyName) {
+ String oldMonitoringPropertyName = monitoringPropertyName;
+ monitoringPropertyName = newMonitoringPropertyName;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME, oldMonitoringAttributeName, monitoringAttributeName));
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME, oldMonitoringPropertyName, monitoringPropertyName));
}
/**
@@ -150,8 +171,8 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
* <!-- end-user-doc -->
* @generated
*/
- public String getMonitoringAttributeValue() {
- return monitoringAttributeValue;
+ public String getMonitoringPropertyValue() {
+ return monitoringPropertyValue;
}
/**
@@ -159,11 +180,32 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
* <!-- end-user-doc -->
* @generated
*/
- public void setMonitoringAttributeValue(String newMonitoringAttributeValue) {
- String oldMonitoringAttributeValue = monitoringAttributeValue;
- monitoringAttributeValue = newMonitoringAttributeValue;
+ public void setMonitoringPropertyValue(String newMonitoringPropertyValue) {
+ String oldMonitoringPropertyValue = monitoringPropertyValue;
+ monitoringPropertyValue = newMonitoringPropertyValue;
if (eNotificationRequired())
- eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE, oldMonitoringAttributeValue, monitoringAttributeValue));
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE, oldMonitoringPropertyValue, monitoringPropertyValue));
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getMonitoringPropertyId() {
+ return monitoringPropertyId;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setMonitoringPropertyId(String newMonitoringPropertyId) {
+ String oldMonitoringPropertyId = monitoringPropertyId;
+ monitoringPropertyId = newMonitoringPropertyId;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID, oldMonitoringPropertyId, monitoringPropertyId));
}
/**
@@ -213,10 +255,12 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
@Override
public Object eGet(int featureID, boolean resolve, boolean coreType) {
switch (featureID) {
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
- return getMonitoringAttributeName();
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
- return getMonitoringAttributeValue();
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
+ return getMonitoringPropertyName();
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+ return getMonitoringPropertyValue();
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID:
+ return getMonitoringPropertyId();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -229,11 +273,14 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
@Override
public void eSet(int featureID, Object newValue) {
switch (featureID) {
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
- setMonitoringAttributeName((String)newValue);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
+ setMonitoringPropertyName((String)newValue);
+ return;
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+ setMonitoringPropertyValue((String)newValue);
return;
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
- setMonitoringAttributeValue((String)newValue);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID:
+ setMonitoringPropertyId((String)newValue);
return;
}
super.eSet(featureID, newValue);
@@ -247,11 +294,14 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
@Override
public void eUnset(int featureID) {
switch (featureID) {
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
- setMonitoringAttributeName(MONITORING_ATTRIBUTE_NAME_EDEFAULT);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
+ setMonitoringPropertyName(MONITORING_PROPERTY_NAME_EDEFAULT);
+ return;
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+ setMonitoringPropertyValue(MONITORING_PROPERTY_VALUE_EDEFAULT);
return;
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
- setMonitoringAttributeValue(MONITORING_ATTRIBUTE_VALUE_EDEFAULT);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID:
+ setMonitoringPropertyId(MONITORING_PROPERTY_ID_EDEFAULT);
return;
}
super.eUnset(featureID);
@@ -265,10 +315,12 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
@Override
public boolean eIsSet(int featureID) {
switch (featureID) {
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_NAME:
- return MONITORING_ATTRIBUTE_NAME_EDEFAULT == null ? monitoringAttributeName != null : !MONITORING_ATTRIBUTE_NAME_EDEFAULT.equals(monitoringAttributeName);
- case MonitoringPackage.MONITORINGPROPERTY__MONITORING_ATTRIBUTE_VALUE:
- return MONITORING_ATTRIBUTE_VALUE_EDEFAULT == null ? monitoringAttributeValue != null : !MONITORING_ATTRIBUTE_VALUE_EDEFAULT.equals(monitoringAttributeValue);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_NAME:
+ return MONITORING_PROPERTY_NAME_EDEFAULT == null ? monitoringPropertyName != null : !MONITORING_PROPERTY_NAME_EDEFAULT.equals(monitoringPropertyName);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_VALUE:
+ return MONITORING_PROPERTY_VALUE_EDEFAULT == null ? monitoringPropertyValue != null : !MONITORING_PROPERTY_VALUE_EDEFAULT.equals(monitoringPropertyValue);
+ case MonitoringPackage.MONITORINGPROPERTY__MONITORING_PROPERTY_ID:
+ return MONITORING_PROPERTY_ID_EDEFAULT == null ? monitoringPropertyId != null : !MONITORING_PROPERTY_ID_EDEFAULT.equals(monitoringPropertyId);
}
return super.eIsSet(featureID);
}
@@ -298,10 +350,12 @@ public class MonitoringpropertyImpl extends MixinBaseImpl implements Monitoringp
if (eIsProxy()) return super.toString();
StringBuffer result = new StringBuffer(super.toString());
- result.append(" (monitoringAttributeName: ");
- result.append(monitoringAttributeName);
- result.append(", monitoringAttributeValue: ");
- result.append(monitoringAttributeValue);
+ result.append(" (monitoringPropertyName: ");
+ result.append(monitoringPropertyName);
+ result.append(", monitoringPropertyValue: ");
+ result.append(monitoringPropertyValue);
+ result.append(", monitoringPropertyId: ");
+ result.append(monitoringPropertyId);
result.append(')');
return result.toString();
}
diff --git a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
index d824030691f626318ccba468771336827785ffaa..5f433b23ed52085c21d522accfc432a621c07380 100644
--- a/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
+++ b/de.ugoe.cs.rwm.mocci.model/src-gen/monitoring/impl/SensorImpl.java
@@ -37,6 +37,7 @@ import org.modmacao.occi.platform.impl.ApplicationImpl;
* <li>{@link monitoring.impl.SensorImpl#getOcciSensorPeriod <em>Occi Sensor Period</em>}</li>
* <li>{@link monitoring.impl.SensorImpl#getOcciSensorGranularity <em>Occi Sensor Granularity</em>}</li>
* <li>{@link monitoring.impl.SensorImpl#getOcciSensorAccuracy <em>Occi Sensor Accuracy</em>}</li>
+ * <li>{@link monitoring.impl.SensorImpl#getMonitoringPropertyMixin <em>Monitoring Property Mixin</em>}</li>
* </ul>
*
* @generated
@@ -162,6 +163,26 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
*/
protected String occiSensorAccuracy = OCCI_SENSOR_ACCURACY_EDEFAULT;
+ /**
+ * The default value of the '{@link #getMonitoringPropertyMixin() <em>Monitoring Property Mixin</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMonitoringPropertyMixin()
+ * @generated
+ * @ordered
+ */
+ protected static final String MONITORING_PROPERTY_MIXIN_EDEFAULT = null;
+
+ /**
+ * The cached value of the '{@link #getMonitoringPropertyMixin() <em>Monitoring Property Mixin</em>}' attribute.
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @see #getMonitoringPropertyMixin()
+ * @generated
+ * @ordered
+ */
+ protected String monitoringPropertyMixin = MONITORING_PROPERTY_MIXIN_EDEFAULT;
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -307,6 +328,27 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY, oldOcciSensorAccuracy, occiSensorAccuracy));
}
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public String getMonitoringPropertyMixin() {
+ return monitoringPropertyMixin;
+ }
+
+ /**
+ * <!-- begin-user-doc -->
+ * <!-- end-user-doc -->
+ * @generated
+ */
+ public void setMonitoringPropertyMixin(String newMonitoringPropertyMixin) {
+ String oldMonitoringPropertyMixin = monitoringPropertyMixin;
+ monitoringPropertyMixin = newMonitoringPropertyMixin;
+ if (eNotificationRequired())
+ eNotify(new ENotificationImpl(this, Notification.SET, MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN, oldMonitoringPropertyMixin, monitoringPropertyMixin));
+ }
+
/**
* <!-- begin-user-doc -->
* <!-- end-user-doc -->
@@ -327,6 +369,8 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
return getOcciSensorGranularity();
case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
return getOcciSensorAccuracy();
+ case MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN:
+ return getMonitoringPropertyMixin();
}
return super.eGet(featureID, resolve, coreType);
}
@@ -357,6 +401,9 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
setOcciSensorAccuracy((String)newValue);
return;
+ case MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN:
+ setMonitoringPropertyMixin((String)newValue);
+ return;
}
super.eSet(featureID, newValue);
}
@@ -387,6 +434,9 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
setOcciSensorAccuracy(OCCI_SENSOR_ACCURACY_EDEFAULT);
return;
+ case MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN:
+ setMonitoringPropertyMixin(MONITORING_PROPERTY_MIXIN_EDEFAULT);
+ return;
}
super.eUnset(featureID);
}
@@ -411,6 +461,8 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
return OCCI_SENSOR_GRANULARITY_EDEFAULT == null ? occiSensorGranularity != null : !OCCI_SENSOR_GRANULARITY_EDEFAULT.equals(occiSensorGranularity);
case MonitoringPackage.SENSOR__OCCI_SENSOR_ACCURACY:
return OCCI_SENSOR_ACCURACY_EDEFAULT == null ? occiSensorAccuracy != null : !OCCI_SENSOR_ACCURACY_EDEFAULT.equals(occiSensorAccuracy);
+ case MonitoringPackage.SENSOR__MONITORING_PROPERTY_MIXIN:
+ return MONITORING_PROPERTY_MIXIN_EDEFAULT == null ? monitoringPropertyMixin != null : !MONITORING_PROPERTY_MIXIN_EDEFAULT.equals(monitoringPropertyMixin);
}
return super.eIsSet(featureID);
}
@@ -437,6 +489,8 @@ public class SensorImpl extends ApplicationImpl implements Sensor {
result.append(occiSensorGranularity);
result.append(", occiSensorAccuracy: ");
result.append(occiSensorAccuracy);
+ result.append(", monitoringPropertyMixin: ");
+ result.append(monitoringPropertyMixin);
result.append(')');
return result.toString();
}
diff --git a/src/main/resources/occi/runtime.occic b/src/main/resources/occi/runtime.occic
deleted file mode 100755
index b83694b69a249678cd5efa5cafe969130b8522e0..0000000000000000000000000000000000000000
--- a/src/main/resources/occi/runtime.occic
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:occi="http://schemas.ogf.org/occi/core/ecore">
- <occi:Configuration>
- </occi:Configuration>
-</xmi:XMI>
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 5dd849ecf11562eedbdc417d23508be3b73e64ec..f9536cb4ce43200e62c6a140188e10184ce9794b 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopMonitoringTest.java
@@ -46,7 +46,7 @@ public class DeployHadoopMonitoringTest {
TestUtility.extensionRegistrySetup();
}
- //@Before
+ @Before
public void deprovisionEverything() {
CachedResourceSet.getCache().clear();
Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/Empty.occic"));
@@ -55,7 +55,7 @@ public class DeployHadoopMonitoringTest {
deployer.deploy(occiPath);
}
- @Ignore
+ @Test
public void deployHadoopWithNewMonitoring() {
CachedResourceSet.getCache().clear();
System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
@@ -80,8 +80,6 @@ public class DeployHadoopMonitoringTest {
}
-
- @Ignore
@Test
public void resolveProxies() {
MonitoringPackage.eINSTANCE.eClass();
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
new file mode 100644
index 0000000000000000000000000000000000000000..bb8b7a613ae8759f14b33bc3a7d4f10ebd6bc5ee
--- /dev/null
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopMonitoringTestLive.java
@@ -0,0 +1,81 @@
+package de.ugoe.cs.rwm.mocci.live;
+
+import static org.junit.Assert.assertTrue;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.Mixin;
+import org.eclipse.cmf.occi.core.OCCIPackage;
+import org.eclipse.cmf.occi.core.util.OcciRegistry;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
+import org.eclipse.emf.ecore.util.EcoreUtil;
+import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Ignore;
+import org.junit.Test;
+
+import de.ugoe.cs.rwm.docci.MartDeployer;
+import de.ugoe.cs.rwm.docci.ModelUtility;
+import de.ugoe.cs.rwm.mocci.TestUtility;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
+import de.ugoe.cs.rwm.docci.connector.MartConnector;
+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 DeployHadoopMonitoringTestLive {
+ 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();
+ TestUtility.extensionRegistrySetup();
+ }
+
+ @Before
+ public void deprovisionEverything() {
+ CachedResourceSet.getCache().clear();
+ Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/Empty.occic"));
+ Connector conn = new MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
+ MartDeployer deployer = new MartDeployer(conn);
+ deployer.deploy(occiPath);
+ }
+
+ @Test
+ public void deployHadoopWithNewMonitoring() {
+ CachedResourceSet.getCache().clear();
+ 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 MartConnector("192.168.35.45", 8080, "ubuntu", "~/key.pem");
+ MartDeployer deployer = new MartDeployer(conn);
+
+ deployer.deploy(occiPath);
+
+ assertTrue(TestUtility.equalsRuntime(occiPath, conn));
+
+ }
+}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java
deleted file mode 100644
index c7a0b16b745d33aa24d2c289fa1595f23eff2c1a..0000000000000000000000000000000000000000
--- a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployWorkflowLiveTest.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package de.ugoe.cs.rwm.mocci.live;
-
-import static org.junit.Assert.assertTrue;
-
-import java.nio.file.Path;
-import java.nio.file.Paths;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
-import org.eclipse.cmf.occi.core.util.OcciRegistry;
-import org.eclipse.epsilon.emc.emf.CachedResourceSet;
-import org.junit.Before;
-import org.junit.BeforeClass;
-import org.junit.Test;
-
-import de.ugoe.cs.rwm.docci.MartDeployer;
-import de.ugoe.cs.rwm.docci.ModelUtility;
-import de.ugoe.cs.rwm.mocci.TestUtility;
-import de.ugoe.cs.rwm.docci.connector.Connector;
-import de.ugoe.cs.rwm.docci.connector.MartConnector;
-import de.ugoe.cs.rwm.tocci.Transformator;
-import de.ugoe.cs.rwm.tocci.TransformatorFactory;
-
-public class DeployWorkflowLiveTest {
- @BeforeClass
- public static void OCCIRegistrySetup() {
- TestUtility.loggerSetup();
- TestUtility.extensionRegistrySetup();
- }
-
- @Before
- public void deprovisionEverything() {
- CachedResourceSet.getCache().clear();
- Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/Empty.occic"));
- Connector conn = new MartConnector("localhost", 8080, "root", "~/key.pem");
- MartDeployer deployer = new MartDeployer(conn);
- deployer.deploy(occiPath);
- }
-
- @Test
- public void deployWaaS() {
- CachedResourceSet.getCache().clear();
- System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
- Logger.getRootLogger().setLevel(Level.FATAL);
- Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/MLSDiffVM.occic"));
-
- Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
- trans.transform(occiPath, occiPath);
-
- Connector conn = new MartConnector("localhost", 8080, "root", "~/key.pem");
- MartDeployer deployer = new MartDeployer(conn);
-
- deployer.deploy(occiPath);
- }
-}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java
deleted file mode 100644
index 9588e64cb2f50c88479aef8acf840cbf4b77f0ae..0000000000000000000000000000000000000000
--- a/src/test/java/de/ugoe/cs/rwm/mocci/live/package-info.java
+++ /dev/null
@@ -1,8 +0,0 @@
-/**
- *
- */
-/**
- * @author erbel
- *
- */
-package de.ugoe.cs.rwm.mocci.live;
\ No newline at end of file
diff --git a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.jar b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.jar
index 0b26d4f33c3bb1448a98de4b594d6e0a33fa20d1..5e27625ecfd34a53d28fc2f7bd3fc229ca275d09 100644
Binary files a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.jar and b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.connector.jar differ
diff --git a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar
index 66c26f8f8b6d9d1b4fcf0a60cf1a1c3721a54283..cdcb1c94f97bcc7a982480c1f93673937c598f3e 100644
Binary files a/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar and b/src/test/resources/martserver-plugins/de.ugoe.cs.rwm.mocci.model.jar differ
diff --git a/src/test/resources/occi/MLSDiffVM.occic b/src/test/resources/occi/MLSDiffVM.occic
deleted file mode 100644
index 3b3170f0265f72d87da8f1db0b4a0b2de1e7a12b..0000000000000000000000000000000000000000
--- a/src/test/resources/occi/MLSDiffVM.occic
+++ /dev/null
@@ -1,300 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<occi:Configuration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:infrastructure="http://schemas.ogf.org/occi/infrastructure/ecore" xmlns:occi="http://schemas.ogf.org/occi/core/ecore" xmlns:placement="http://schemas.modmacao.org/placement/ecore" xmlns:platform="http://schemas.modmacao.org/occi/platform/ecore" xmlns:workflow="http://schemas.ugoe.cs.rwm/workflow/ecore">
- <use href="http://schemas.ogf.org/occi/core#/"/>
- <use href="http://schemas.ogf.org/occi/infrastructure#/"/>
- <use href="http://schemas.modmacao.org/occi/platform#/"/>
- <use href="http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#/"/>
- <use href="http://schemas.modmacao.org/placement#/"/>
- <use href="http://schemas.modmacao.org/openstack/runtime#/"/>
- <use href="http://schemas.modmacao.org/modmacao#/"/>
- <use href="http://schemas.modmacao.org/openstack/swe#/"/>
- <use href="http://schemas.ugoe.cs.rwm/workflow#/"/>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:d52754e0-6729-4034-adbb-8f1f3800f2c6" title="provider" location="/network/urn:uuid:d52754e0-6729-4034-adbb-8f1f3800f2c6/" occiNetworkState="inactive">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
- <attributes name="occi.core.id" value="urn:uuid:d52754e0-6729-4034-adbb-8f1f3800f2c6"/>
- <attributes name="occi.core.title" value="provider"/>
- <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="inactive"/>
- <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="d52754e0-6729-4034-adbb-8f1f3800f2c6"/>
- </parts>
- </resources>
- <resources xsi:type="infrastructure:Storage" id="urn:uuid:a0646f23-4b3a-4298-b262-85fd92d10060" title="storage" location="/storage/urn:uuid:a0646f23-4b3a-4298-b262-85fd92d10060/" rlinks="//@resources.3/@links.0" occiStorageSize="100.0">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='storage']"/>
- <attributes name="occi.core.id" value="urn:uuid:a0646f23-4b3a-4298-b262-85fd92d10060"/>
- <attributes name="occi.core.title" value="storage"/>
- <attributes name="occi.core.summary" value=""/>
- <attributes name="occi.storage.size" value="100"/>
- <attributes name="occi.storage.state" value="online"/>
- <attributes name="occi.storage.state.message" value=""/>
- </resources>
- <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.3/@links.1 //@resources.8/@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="vm1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/" rlinks="//@resources.5/@links.0 //@resources.4/@links.0 //@resources.11/@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="vm1"/>
- <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="vm1"/>
- <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=""/>
- <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
- <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
- </parts>
- <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
- <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
- </parts>
- <parts>
- <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
- </parts>
- <links xsi:type="infrastructure:Storagelink" id="urn:uuid:0f24a49b-3e80-4d65-96bc-80d6256e475b" title="storageLink" location="/storagelink/urn:uuid:0f24a49b-3e80-4d65-96bc-80d6256e475b/" target="//@resources.1">
- <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='storagelink']"/>
- <attributes name="occi.core.id" value="urn:uuid:0f24a49b-3e80-4d65-96bc-80d6256e475b"/>
- <attributes name="occi.core.title" value="storageLink"/>
- <attributes name="occi.storagelink.deviceid" value=""/>
- <attributes name="occi.storagelink.mountpoint" value=""/>
- <attributes name="occi.storagelink.state" value="active"/>
- <attributes name="occi.storagelink.state.message" value=""/>
- <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
- <attributes name="occi.core.target" value="/storage/urn:uuid:a0646f23-4b3a-4298-b262-85fd92d10060/"/>
- </links>
- <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.2" 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>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896" title="Java" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/" rlinks="//@resources.5/@links.1 //@resources.6/@links.0 //@resources.9/@links.1 //@resources.10/@links.2" occiComponentStateMessage="">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
- <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896"/>
- <attributes name="occi.core.title" value="Java"/>
- <attributes name="occi.core.summary" value=""/>
- <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.3">
- <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>
- <links xsi:type="platform:Componentlink" id="urn:uuid:3441844f-3317-4f90-88b1-a3de96244e4d" title="depends" location="/componentlink/urn:uuid:3441844f-3317-4f90-88b1-a3de96244e4d" target="//@resources.11">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:3441844f-3317-4f90-88b1-a3de96244e4d"/>
- <attributes name="occi.core.title" value="depends"/>
- </links>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="Coarse" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.6/@links.1 //@resources.7/@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="Coarse"/>
- <attributes name="occi.core.summary" value=""/>
- <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.3">
- <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 xsi:type="platform:Componentlink" id="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3d" title="depends" location="/componentlink/urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3d" target="//@resources.4">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3d"/>
- <attributes name="occi.core.title" value="depends"/>
- </links>
- </resources>
- <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="CoarseApplication" 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="CoarseApplication"/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ee" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ee" target="//@resources.4">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ee"/>
- <attributes name="occi.core.title" value="ComponentLink"/>
- </links>
- <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.5">
- <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:9aa31c50-c605-4370-aa60-3c7c461051ee" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-3c7c461051ee" target="//@resources.11">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-3c7c461051ee"/>
- <attributes name="occi.core.title" value="ComponentLink"/>
- </links>
- </resources>
- <resources xsi:type="workflow:Task" id="urn:uuid:d3024b8d-d021-4bbd-abf4-0e4d44e8635a" title="CoarseTask" location="/task/urn:uuid:d3024b8d-d021-4bbd-abf4-0e4d44e8635a">
- <kind href="http://schemas.ugoe.cs.rwm/workflow#//@kinds[term='task']"/>
- <attributes name="occi.core.id" value="urn:uuid:d3024b8d-d021-4bbd-abf4-0e4d44e8635a"/>
- <attributes name="occi.core.title" value="CoarseTask"/>
- <links xsi:type="workflow:Executionlink" id="urn:uuid:097c5265-01ac-4beb-8cc5-8958ea4d1f3f" title="execLink" location="/executionlink/urn:uuid:097c5265-01ac-4beb-8cc5-8958ea4d1f3f" target="//@resources.5">
- <kind href="http://schemas.ugoe.cs.rwm/workflow#//@kinds[term='executionlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:097c5265-01ac-4beb-8cc5-8958ea4d1f3f"/>
- <attributes name="occi.core.title" value="execLink"/>
- <attributes name="occi.core.target" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
- <attributes name="occi.core.source" value="/task/urn:uuid:d3024b8d-d021-4bbd-abf4-0e4d44e8635a"/>
- </links>
- </resources>
- <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="vm2" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.9/@links.0 //@resources.12/@links.0 //@resources.13/@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="vm2"/>
- <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="vm2"/>
- <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=""/>
- <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
- <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
- </parts>
- <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
- <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
- <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
- </parts>
- <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.2" 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>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898" title="Fine" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.10/@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-d9f1a8255898"/>
- <attributes name="occi.core.title" value="Fine"/>
- <attributes name="occi.core.summary" value=""/>
- <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.8">
- <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>
- <links xsi:type="platform:Componentlink" id="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3e" title="depends" location="/componentlink/urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3e" target="//@resources.4">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e3e"/>
- <attributes name="occi.core.title" value="depends"/>
- </links>
- </resources>
- <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42e" title="FineApplication" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42e" 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-901c876ab42e"/>
- <attributes name="occi.core.title" value="FineApplication"/>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051eg" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051eg" target="//@resources.9">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051eg"/>
- <attributes name="occi.core.title" value="ComponentLink"/>
- </links>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-4c7c461051ee" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-4c7c461051ee" target="//@resources.12">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-4c7c461051ee"/>
- <attributes name="occi.core.title" value="ComponentLink"/>
- </links>
- <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ez" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ez" target="//@resources.4">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ez"/>
- <attributes name="occi.core.title" value="ComponentLink"/>
- </links>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255887" title="Ping" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255887/" rlinks="//@resources.4/@links.1 //@resources.6/@links.2" occiComponentStateMessage="">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
- <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255887"/>
- <attributes name="occi.core.title" value="Ping"/>
- <attributes name="occi.component.state.message" value=""/>
- <parts mixin="//@mixins.3"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b918" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b918/" target="//@resources.3">
- <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b918"/>
- <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>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255888" title="Ping" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255888/" rlinks="//@resources.13/@links.1 //@resources.10/@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-d9f1a8255888"/>
- <attributes name="occi.core.title" value="Ping"/>
- <attributes name="occi.component.state.message" value=""/>
- <parts mixin="//@mixins.3"/>
- <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-94d33783b918" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-94d33783b918/" target="//@resources.8">
- <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-94d33783b918"/>
- <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>
- </resources>
- <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8254896" title="Java" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8254896/" occiComponentStateMessage="">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
- <attributes name="occi.core.title" value="Java"/>
- <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8254896"/>
- <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-84d33783b919" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b919/" target="//@resources.8">
- <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b919"/>
- <attributes name="occi.core.title" value="link1"/>
- </links>
- <links xsi:type="platform:Componentlink" id="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e4d" title="depends" location="/componentlink/urn:uuid:3441844f-3317-4f90-88b1-a3de96233e4d" target="//@resources.12">
- <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <attributes name="occi.core.id" value="urn:uuid:3441844f-3317-4f90-88b1-a3de96233e4d"/>
- <attributes name="occi.core.title" value="depends"/>
- </links>
- </resources>
- <mixins name="java" scheme="http://schemas.modmacao.org/usermixins#" title="Java"/>
- <mixins name="coarse" scheme="http://schemas.modmacao.org/usermixins#" title="Coarse"/>
- <mixins name="fine" scheme="http://schemas.modmacao.org/usermixins#" title="Fine"/>
- <mixins name="ping" scheme="http://schemas.modmacao.org/usermixins#" title="Ping"/>
-</occi:Configuration>
diff --git a/src/test/resources/occi/expectedRuntime.occic b/src/test/resources/occi/expectedRuntime.occic
new file mode 100644
index 0000000000000000000000000000000000000000..e0cefe158f16740fbebcd55c1d31ae44e3b581d9
--- /dev/null
+++ b/src/test/resources/occi/expectedRuntime.occic
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="ASCII"?>
+<occi:Configuration xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ansibleconfiguration="http://schemas.modmacao.org/occi/ansible/ecore" xmlns:infrastructure="http://schemas.ogf.org/occi/infrastructure/ecore" xmlns:monitoring="http://schemas.ugoe.cs.rwm/monitoring/ecore" xmlns:occi="http://schemas.ogf.org/occi/core/ecore" xmlns:openstackruntime="http://schemas.modmacao.org/openstack/runtime/ecore" xmlns:ossweruntime="http://schemas.modmacao.org/openstack/swe/ecore" xmlns:placement="http://schemas.modmacao.org/placement/ecore" xmlns:platform="http://schemas.modmacao.org/occi/platform/ecore">
+ <use href="http://schemas.ogf.org/occi/core#/"/>
+ <use href="http://schemas.ogf.org/occi/infrastructure#/"/>
+ <use href="http://schemas.modmacao.org/occi/platform#/"/>
+ <use href="http://schemas.ogf.org/occi/infrastructure/compute/template/1.1#/"/>
+ <use href="http://schemas.modmacao.org/placement#/"/>
+ <use href="http://schemas.modmacao.org/openstack/runtime#/"/>
+ <use href="http://schemas.modmacao.org/modmacao#/"/>
+ <use href="http://schemas.modmacao.org/occi/ansible#/"/>
+ <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 Network" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/" rlinks="//@resources.8/@links.2 //@resources.12/@links.1 //@resources.13/@links.1">
+ <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 Network"/>
+ <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="inactive"/>
+ <attributes name="occi.network.state.message" value=""/>
+ <parts xsi:type="openstackruntime:Runtimeid" openstackRuntimeId="75a4639e-9ce7-4058-b859-8a711b0e2e7b">
+ <mixin href="http://schemas.modmacao.org/openstack/runtime#//@mixins[term='runtimeid']"/>
+ <attributes name="openstack.runtime.id" value="75a4639e-9ce7-4058-b859-8a711b0e2e7b"/>
+ </parts>
+ </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.7/@links.1" occiComponentState="active" 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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.component.state" value="active"/>
+ <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.8">
+ <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>
+ </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']"/>
+ <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896"/>
+ <attributes name="occi.core.title" value="Wordcount"/>
+ <attributes name="occi.core.summary" value=""/>
+ <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.8">
+ <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"/>
+ <attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255896/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="DataGatherer" location="/datagatherer/urn:uuid:051affdc-d686-48f8-884c-83fe81718a48/" rlinks="//@resources.6/@links.0 //@resources.11/@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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.component.state" value="active"/>
+ <attributes name="occi.component.state.message" value=""/>
+ <attributes name="occi.collector.period" value=""/>
+ <attributes name="occi.collector.granularity" value=""/>
+ <attributes name="occi.collector.accuracy" value=""/>
+ <parts mixin="//@mixins.3"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" location="/placementlink/urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f/" target="//@resources.8">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <attributes name="occi.core.source" value="/datagatherer/urn:uuid:051affdc-d686-48f8-884c-83fe81718a48/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ </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.7/@links.0" occiComponentState="active" 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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.component.state" value="active"/>
+ <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.13">
+ <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.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/"/>
+ </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.8/@links.0 //@resources.13/@links.0" occiNetworkVlan="0" occiNetworkLabel="" occiNetworkState="active" occiNetworkStateMessage="">
+ <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"/>
+ <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 xsi:type="infrastructure:Ipnetwork" occiNetworkAddress="10.254.1.1/24">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="10.254.1.1/24"/>
+ <attributes name="occi.network.gateway" value=""/>
+ <attributes name="occi.network.allocation" value="dynamic"/>
+ </parts>
+ </resources>
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor" location="/sensor/urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb/" occiAppState="active" occiAppStateMessage="" occiSensorTimebase="" occiSensorTimestart="" occiSensorTimestop="" occiSensorPeriod="" occiSensorGranularity="" occiSensorAccuracy="" monitoringPropertyMixin="123456">
+ <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="Sensor"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.app.name" value=""/>
+ <attributes name="occi.app.context" value="0"/>
+ <attributes name="occi.app.url" value="0"/>
+ <attributes name="occi.app.state" value="active"/>
+ <attributes name="occi.app.state.message" 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=""/>
+ <attributes name="monitoring.property.mixin" value="123456"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" location="/componentlink/urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a/" target="//@resources.3">
+ <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"/>
+ <attributes name="occi.core.source" value="/sensor/urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb/"/>
+ <attributes name="occi.core.target" value="/datagatherer/urn:uuid:051affdc-d686-48f8-884c-83fe81718a48/"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" location="/componentlink/urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a/" target="//@resources.11">
+ <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"/>
+ <attributes name="occi.core.source" value="/sensor/urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb/"/>
+ <attributes name="occi.core.target" value="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" location="/componentlink/urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3/" 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"/>
+ <attributes name="occi.core.source" value="/sensor/urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb/"/>
+ <attributes name="occi.core.target" value="/publisher/urn:uuid:588f705e-5279-4847-9337-846af2c86972/"/>
+ </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/" occiAppState="active">
+ <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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.app.name" value=""/>
+ <attributes name="occi.app.context" value="0"/>
+ <attributes name="occi.app.url" value="0"/>
+ <attributes name="occi.app.state" value="active"/>
+ <attributes name="occi.app.state.message" value=""/>
+ <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.4">
+ <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"/>
+ <attributes name="occi.core.source" value="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d/"/>
+ <attributes name="occi.core.target" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/"/>
+ </links>
+ <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.1">
+ <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"/>
+ <attributes name="occi.core.source" value="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d/"/>
+ <attributes name="occi.core.target" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
+ </links>
+ </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.2/@links.0 //@resources.1/@links.0 //@resources.3/@links.0" occiComputeCores="2" occiComputeHostname="hadoop-master" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
+ <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"/>
+ <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-master"/>
+ <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=""/>
+ <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
+ <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
+ </parts>
+ <parts xsi:type="monitoring:Monitoringproperty" monitoringPropertyName="cpuutil" monitoringPropertyValue="0" monitoringPropertyId="123456">
+ <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='monitoringproperty']"/>
+ <attributes name="monitoring.property.name" value="cpuutil"/>
+ <attributes name="monitoring.property.value" value="0"/>
+ <attributes name="monitoring.property.id" value="123456"/>
+ </parts>
+ <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
+ <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
+ <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
+ </parts>
+ <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
+ <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
+ </parts>
+ <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.5">
+ <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"/>
+ <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.254.1.5"/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <attributes name="occi.networkinterface.allocation" value="dynamic"/>
+ <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.5">
+ <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" location="/networkinterface/urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d/" target="//@resources.9">
+ <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.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="100.254.1.35"/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <attributes name="occi.networkinterface.allocation" value="dynamic"/>
+ <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ <attributes name="occi.core.target" value="/network/urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:d065d54c-55e5-48ce-81ac-2c1e8d1eee2e" title="hadoop-master -> Management Network" location="/networkinterface/urn:uuid:d065d54c-55e5-48ce-81ac-2c1e8d1eee2e/" target="//@resources.0">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:d065d54c-55e5-48ce-81ac-2c1e8d1eee2e"/>
+ <attributes name="occi.core.title" value="hadoop-master -> Management Network"/>
+ <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=""/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <attributes name="occi.networkinterface.allocation" value="dynamic"/>
+ <attributes name="occi.core.source" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
+ <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
+ </parts>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" location="/network/urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a/" rlinks="//@resources.8/@links.1 //@resources.12/@links.0" occiNetworkVlan="0" occiNetworkLabel="" occiNetworkState="active" occiNetworkStateMessage="">
+ <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 xsi:type="infrastructure:Ipnetwork" occiNetworkAddress="100.254.1.1/24">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="100.254.1.1/24"/>
+ <attributes name="occi.network.gateway" value=""/>
+ <attributes name="occi.network.allocation" value="dynamic"/>
+ </parts>
+ </resources>
+ <resources xsi:type="monitoring:Publisher" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="Publisher" location="/publisher/urn:uuid:588f705e-5279-4847-9337-846af2c86972/" rlinks="//@resources.6/@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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.component.state" value="active"/>
+ <attributes name="occi.component.state.message" value=""/>
+ <parts mixin="//@mixins.5"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80" title="link1" location="/componentlink/urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80/" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <attributes name="occi.core.source" value="/publisher/urn:uuid:588f705e-5279-4847-9337-846af2c86972/"/>
+ <attributes name="occi.core.target" value="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" location="/placementlink/urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616/" target="//@resources.12">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
+ <attributes name="occi.core.title" value="link2"/>
+ <attributes name="occi.core.source" value="/publisher/urn:uuid:588f705e-5279-4847-9337-846af2c86972/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Processor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="Processor" location="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/" rlinks="//@resources.10/@links.0 //@resources.6/@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"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.component.state" value="active"/>
+ <attributes name="occi.component.state.message" value=""/>
+ <parts mixin="//@mixins.4"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40" title="link1" location="/componentlink/urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf40/" target="//@resources.3">
+ <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"/>
+ <attributes name="occi.core.source" value="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/"/>
+ <attributes name="occi.core.target" value="/datagatherer/urn:uuid:051affdc-d686-48f8-884c-83fe81718a48/"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" location="/placementlink/urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4/" target="//@resources.12">
+ <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"/>
+ <attributes name="occi.core.source" value="/processor/urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/"/>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" location="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/" rlinks="//@resources.11/@links.1 //@resources.10/@links.1" occiComputeCores="2" occiComputeHostname="monvm" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
+ <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="monvm"/>
+ <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=""/>
+ <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
+ <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
+ </parts>
+ <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
+ <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
+ <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
+ </parts>
+ <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
+ <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
+ </parts>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed" title="link1" location="/networkinterface/urn:uuid:00d6889d-b644-44bf-af13-3fe350e926ed/" target="//@resources.9">
+ <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"/>
+ <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=""/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <attributes name="occi.networkinterface.allocation" value="dynamic"/>
+ <attributes name="occi.core.source" value="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/"/>
+ <attributes name="occi.core.target" value="/network/urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:a10c7d4b-d1e2-420e-81dc-ad4b46e718bf" title="MonVm -> Management Network" location="/networkinterface/urn:uuid:a10c7d4b-d1e2-420e-81dc-ad4b46e718bf/" target="//@resources.0">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:a10c7d4b-d1e2-420e-81dc-ad4b46e718bf"/>
+ <attributes name="occi.core.title" value="MonVm -> Management Network"/>
+ <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=""/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <attributes name="occi.networkinterface.allocation" value="dynamic"/>
+ <attributes name="occi.core.source" value="/compute/urn:uuid:37829092-c690-494a-98fa-335b2fd660ea/"/>
+ <attributes name="occi.core.target" value="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
+ <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
+ </parts>
+ </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.4/@links.0" occiComputeCores="2" occiComputeHostname="hadoop-worker-1" occiComputeShare="0" occiComputeSpeed="0.0" occiComputeMemory="4096.0" occiComputeState="active" occiComputeStateMessage="">
+ <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"/>
+ <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=""/>
+ <parts xsi:type="infrastructure:Ssh_key" occiCredentialsSshPublickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ssh_key']"/>
+ <attributes name="occi.credentials.ssh.publickey" value="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova"/>
+ </parts>
+ <parts xsi:type="ossweruntime:Ubuntu_xenialxerus">
+ <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
+ <attributes name="openstack.runtime.id" value="5437eae8-7c47-4834-929c-a314de77d291"/>
+ </parts>
+ <parts xsi:type="infrastructure:User_data" occiComputeUserdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='user_data']"/>
+ <attributes name="occi.compute.userdata" value="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"/>
+ </parts>
+ <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.5">
+ <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"/>
+ <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.254.1.8"/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <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-b8aaf3339591/"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.8">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:23fb4836-580e-4324-8b85-96429ade0bc6" title="hadoop-worker-1 -> Management Network" location="/networkinterface/urn:uuid:23fb4836-580e-4324-8b85-96429ade0bc6/" target="//@resources.0">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:23fb4836-580e-4324-8b85-96429ade0bc6"/>
+ <attributes name="occi.core.title" value="hadoop-worker-1 -> Management Network"/>
+ <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=""/>
+ <attributes name="occi.networkinterface.gateway" value=""/>
+ <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">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ <parts xsi:type="ansibleconfiguration:Ansibleendpoint">
+ <mixin href="http://schemas.modmacao.org/occi/ansible#//@mixins[term='ansibleendpoint']"/>
+ </parts>
+ </links>
+ </resources>
+ <mixins name="hjob" scheme="http://schemas.modmacao.org/usermixins#"/>
+ <mixins name="hmaster" scheme="http://schemas.modmacao.org/usermixins#"/>
+ <mixins name="hworker" scheme="http://schemas.modmacao.org/usermixins#"/>
+ <mixins name="cpugatherer" scheme="http://schemas.modmacao.org/usermixins#"/>
+ <mixins name="cpuprocessor" scheme="http://schemas.modmacao.org/usermixins#"/>
+ <mixins name="cpupublisher" scheme="http://schemas.modmacao.org/usermixins#"/>
+</occi:Configuration>
diff --git a/src/test/resources/occi/hadoopClusterNewExt.occic b/src/test/resources/occi/hadoopClusterNewExt.occic
index a33758dc511b18f73fca84d47630526a3630f0a5..0cc759a16dc38c7a8016a3d8260798ba4b55a786 100644
--- a/src/test/resources/occi/hadoopClusterNewExt.occic
+++ b/src/test/resources/occi/hadoopClusterNewExt.occic
@@ -9,7 +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: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">
+ <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 //@resources.8/@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"/>
@@ -33,6 +33,12 @@
<parts>
<mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
</parts>
+ <parts>
+ <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='monitoringproperty']"/>
+ <attributes name="monitoring.property.name" value="cpuutil"/>
+ <attributes name="monitoring.property.value" value="0"/>
+ <attributes name="monitoring.property.id" value="123456"/>
+ </parts>
<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"/>
@@ -47,6 +53,9 @@
<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" occiNetworkinterfaceGateway="">
+ <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="">
@@ -63,7 +72,7 @@
<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.3/@links.0 //@resources.8/@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" 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"/>
@@ -157,7 +166,7 @@
<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="Sensor">
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="Sensor" monitoringPropertyMixin="123456">
<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="Sensor"/>
@@ -168,8 +177,9 @@
<attributes name="occi.sensor.period" value=""/>
<attributes name="occi.sensor.granularity" value=""/>
<attributes name="occi.sensor.accuracy" value=""/>
- <attributes name="occi.app.state" value=""/>
+ <attributes name="occi.app.state" value="undeployed"/>
<attributes name="occi.app.state.message" value=""/>
+ <attributes name="monitoring.property.mixin" value="123456"/>
<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"/>
@@ -190,7 +200,8 @@
<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">
+ <parts mixin="//@mixins.3"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.0">
<kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
<attributes name="occi.core.id" value="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f"/>
<attributes name="occi.core.title" value="link1"/>
@@ -200,6 +211,7 @@
<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"/>
+ <parts mixin="//@mixins.4"/>
<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"/>
@@ -215,6 +227,7 @@
<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"/>
+ <parts mixin="//@mixins.5"/>
<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:9551c357-59f8-4ac1-8c85-0e886e206b80"/>
@@ -226,19 +239,22 @@
<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">
+ <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.hostname" value="monvm"/>
<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=""/>
+ <parts>
+ <mixin href="http://schemas.modmacao.org/openstack/swe#//@mixins[term='ubuntu_xenialxerus']"/>
+ </parts>
<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"/>
@@ -248,7 +264,7 @@
</parts>
</links>
</resources>
- <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@resources.0/@links.1">
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonitoringNetwork" rlinks="//@resources.11/@links.0 //@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"/>
@@ -265,6 +281,7 @@
<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"/>
- <mixins name="hJobMonitoring" scheme="http://schemas.modmacao.org/usermixins#" title="HJobMonitoring"/>
- <mixins name="hJobMonitoring2" scheme="http://schemas.modmacao.org/usermixins#" title="HJobMonitoring2"/>
+ <mixins name="CPUGatherer" scheme="http://schemas.modmacao.org/usermixins#" title="CPUGatherer"/>
+ <mixins name="CPUProcessor" scheme="http://schemas.modmacao.org/usermixins#" title="CPUProcessor"/>
+ <mixins name="CPUPublisher" scheme="http://schemas.modmacao.org/usermixins#" title="CPUPublisher"/>
</occi:Configuration>