diff --git a/build.gradle b/build.gradle
index e7fb8bcf847f81f8d52c096184518f43cd9696bb..3f0586116b208f4eed4282ecad356282d56e5e21 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,8 +71,9 @@ 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', name: 'tocci', version: '1.0.0'
+ compile group: 'de.ugoe.cs.rwm.mocci', name: 'model', version: '1.0.0'
+ //compile project(':de.ugoe.cs.rwm.mocci.model')
//modmacao
compile group: 'org.modmacao', name: 'core', version: '1.0.0'
compile group: 'org.modmacao', name: 'placement', version: '1.0.0'
@@ -91,7 +92,7 @@ dependencies {
testCompile group: 'junit', name: 'junit', version: '4.12'
compile group: 'de.ugoe.cs.rwm.pog', name: 'model', version: '1.0.0'
- compile group: 'de.ugoe.cs.rwm', name: 'tocci', version: '1.0.0'
+ compile group: 'de.ugoe.cs.rwm.pcg', name: 'model', version: '1.0.0'
//testImplementation 'junit:junit:4.12'
}
@@ -152,7 +153,7 @@ jacocoTestReport {
findbugs {
sourceSets = [sourceSets.main]
- ignoreFailures = false
+ ignoreFailures = true
}
checkstyle {
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 1752c9353159a3382e3f642e31d09b45ee82f7c4..e8895216fd3c0c3af4c4522334775f41b7deb42e 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=../de.ugoe.cs.rwm.mocci.connector
+connection.project.dir=
eclipse.preferences.version=1
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/META-INF/MANIFEST.MF b/de.ugoe.cs.rwm.mocci.connector.dummy/META-INF/MANIFEST.MF
index c9e37426b17fc135698c6bcfbbd26f01c9b528e9..5b7d2586dc2e2d871dfde3a728ae870e4717e761 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/META-INF/MANIFEST.MF
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/META-INF/MANIFEST.MF
@@ -9,5 +9,6 @@ Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Require-Bundle: org.slf4j.api,
org.eclipse.cmf.occi.core,
- de.ugoe.cs.rwm.mocci.model
+ de.ugoe.cs.rwm.mocci.model,
+ org.modmacao.core
Export-Package: de.ugoe.cs.rwm.mocci.connector
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle b/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
index d234050ca877d143c95878fb1c8609bd13aa8cbd..65d47fcfa65a2c2b4c25154ae681840af0d9161a 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/build.gradle
@@ -59,6 +59,7 @@ sourceSets {
processResources {
from("."){
include("plugin.xml")
+ include("resultprovider.properties")
}
}
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/resultprovider.properties b/de.ugoe.cs.rwm.mocci.connector.dummy/resultprovider.properties
new file mode 100644
index 0000000000000000000000000000000000000000..5ff259b3374d44974a6f63d33aff8f0219bfc45f
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/resultprovider.properties
@@ -0,0 +1,2 @@
+CPU = None,Low,Medium,High,Critical,3000
+Mem = None1,Low1,Medium1,High1,Critical1,4000
\ No newline at end of file
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java
new file mode 100644
index 0000000000000000000000000000000000000000..5ead91811f66c141323d785c1584e980ebebbc58
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java
@@ -0,0 +1,161 @@
+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;
+
+
+public class ComponentManager {
+
+ private Component comp;
+
+ public ComponentManager(Component comp) {
+ this.comp = comp;
+ }
+
+
+ public void undeploy() {
+
+ switch(comp.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+
+ comp.stop();
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.INACTIVE_VALUE:
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.DEPLOYED_VALUE:
+ comp.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.ERROR_VALUE:
+ 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:
+ comp.setOcciComponentState(Status.DEPLOYED);
+ 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:
+ comp.setOcciComponentState(Status.INACTIVE);
+ 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:
+ comp.setOcciComponentState(Status.ACTIVE);
+ break;
+
+
+ case Status.UNDEPLOYED_VALUE:
+ comp.setOcciComponentState(Status.ERROR);
+ break;
+
+ 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:
+
+ comp.setOcciComponentState(Status.INACTIVE);
+
+ break;
+
+ default:
+ break;
+}
+ }
+ // End of user code
+
+ 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.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
index 0edcbf5e8fbe91c5e797dd6f02481fd7ce055bc7..22a81506dc6989670bf248c62e26cad4464ae174 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderConnector.java
@@ -23,6 +23,8 @@ import org.eclipse.cmf.occi.core.Link;
import org.eclipse.cmf.occi.core.MixinBase;
import org.eclipse.cmf.occi.core.Resource;
import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -44,10 +46,7 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
* Initialize the logger.
*/
private static Logger LOGGER = LoggerFactory.getLogger(ResultproviderConnector.class);
- private OCCIFactoryImpl factory = new OCCIFactoryImpl();
- private Sensor sensor;
- private Monitorableproperty monProp;
- private Resource monObject;
+ private Thread simulation;
//private Occiresultprovider occiResProv;
@@ -58,14 +57,17 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
ResultproviderConnector()
{
LOGGER.debug("Constructor called on " + this);
- //occiResProv = getMartMixin();
- // TODO: Implement this constructor.
+
+
}
// End of user code
//
// OCCI CRUD callback operations.
//
+
+
+
// Start of user code PublisherocciCreate
/**
* Called when this Publisher instance is completely created.
@@ -74,6 +76,7 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void occiCreate()
{
LOGGER.debug("occiCreate() called on " + this);
+
// TODO: Implement this callback or remove this method.
}
// End of user code
@@ -86,6 +89,14 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void occiRetrieve()
{
LOGGER.debug("occiRetrieve() called on " + this);
+
+ if(this.getOcciComponentState().getValue() == Status.ACTIVE.getValue()) {
+ if(simulation == null) {
+ ResultproviderSimulation sim = new ResultproviderSimulation(getMonProp(getSensor()));
+ simulation = new Thread(sim);
+ simulation.start();
+ }
+ }
// TODO: Implement this callback or remove this method.
}
// End of user code
@@ -110,6 +121,9 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void occiDelete()
{
LOGGER.debug("occiDelete() called on " + this);
+ if(simulation!= null) {
+ simulation.stop();
+ }
// TODO: Implement this callback or remove this method.
}
// End of user code
@@ -129,7 +143,15 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void configure()
{
LOGGER.debug("Action configure() called on " + this);
- setRuntimeInformation();
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.DEPLOYED_VALUE:
+ this.setOcciComponentState(Status.INACTIVE);
+ break;
+
+ default:
+ break;
+ }
// TODO: Implement how to configure this publisher.
}
// End of user code
@@ -144,10 +166,16 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void deploy()
{
LOGGER.debug("Action deploy() called on " + this);
- setRuntimeInformation();
+ switch(this.getOcciComponentState().getValue()) {
-
- // TODO: Implement how to deploy this publisher.
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.DEPLOYED);
+ break;
+
+ default:
+ break;
+}
+
}
// End of user code
@@ -158,12 +186,38 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
* - term: undeploy
* - title:
*/
+ @SuppressWarnings("deprecation")
@Override
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
- setRuntimeInformation();
- // TODO: Implement how to undeploy this publisher.
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ if(simulation!= null) {
+ simulation.stop();
+ }
+ break;
+
+
+ case Status.INACTIVE_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.DEPLOYED_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.ERROR_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
// Start of user code Publisher_Kind_Stop_action
@@ -173,12 +227,15 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
* - term: stop
* - title: Stop the application.
*/
+ @SuppressWarnings("deprecation")
@Override
public void stop()
{
LOGGER.debug("Action stop() called on " + this);
- setRuntimeInformation();
- // TODO: Implement how to stop this publisher.
+ if(simulation!= null) {
+ simulation.stop();
+ }
+ setOcciComponentState(Status.INACTIVE);
}
// End of user code
// Start of user code Publisher_Kind_Start_action
@@ -192,48 +249,35 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
- setRuntimeInformation();
- }
-
-
- private void setRuntimeInformation() {
- sensor = getSensor();
- AttributeState sensorAttr = factory.createAttributeState();
- sensorAttr.setName("sensor");
- sensorAttr.setValue(sensor.getLocation());
- System.out.println("Sensor: " + sensor);
- this.attributes.add(sensorAttr);
-
- monProp = getMonProp(sensor);
- AttributeState monPropAttr = factory.createAttributeState();
- monPropAttr.setName("monitorable.property");
- monPropAttr.setValue(monProp.getLocation());
- System.out.println("MonProp: " + monProp);
- this.attributes.add(monPropAttr);
-
- AttributeState monPropNameAttr = factory.createAttributeState();
- monPropNameAttr.setName("monitorable.property.property");
- monPropNameAttr.setValue(monProp.getMonitoringProperty());
- this.attributes.add(monPropNameAttr);
-
- monObject = monProp.getTarget();
- AttributeState monObjectAttr = factory.createAttributeState();
- monObjectAttr.setName("monitorable.property.target");
- monObjectAttr.setValue(monObject.getLocation());
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.INACTIVE_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ if(simulation == null) {
+ ResultproviderSimulation sim = new ResultproviderSimulation(getMonProp(getSensor()));
+ simulation = new Thread(sim);
+ simulation.start();
+ }
+ break;
+
+
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ if(simulation == null) {
+ ResultproviderSimulation sim = new ResultproviderSimulation(getMonProp(getSensor()));
+ simulation = new Thread(sim);
+ simulation.start();
+ }
+ break;
+
+ default:
+ break;
}
+ }
// End of user code
- private Occiresultprovider getMartMixin() {
- for(MixinBase mixinBase: this.getParts()) {
- if(mixinBase instanceof Occiresultprovider) {
- LOGGER.info("Occiresultprovider found: " + this.title);
- return ((Occiresultprovider)mixinBase);
- }
- }
- return null;
- }
private Sensor getSensor() {
for(Link link: this.getRlinks()) {
@@ -252,4 +296,5 @@ public class ResultproviderConnector extends monitoring.impl.ResultproviderImpl
}
throw new NoSuchElementException("No monitorableproperty found in sensor!");
}
+
}
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderHelper.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderHelper.java
new file mode 100644
index 0000000000000000000000000000000000000000..da357ff1726d313fdbc0c34777f2849aa1eef7eb
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderHelper.java
@@ -0,0 +1,49 @@
+package de.ugoe.cs.rwm.mocci.connector;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+public final class ResultproviderHelper {
+ Properties props;
+ private final static String FILENAME = "resultprovider.properties";
+
+ public ResultproviderHelper() {
+ loadProperties();
+ }
+
+ /**
+ * Getter method for providing the properties of this ResultProviderHelper.
+ * Properties will be read from local file resultprovider.properties.
+ * @return The properties
+ */
+ public Properties getProperties() {
+ if (props == null)
+ loadProperties();
+
+ return props;
+}
+
+ private void loadProperties() {
+ props = new Properties();
+ InputStream input = null;
+
+ try {
+ input = this.getClass().getClassLoader().getResourceAsStream(FILENAME);
+ props.load(input);
+
+ } catch (IOException ex) {
+ ex.printStackTrace();
+ } finally{
+ if(input!=null){
+ try {
+ input.close();
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
+ }
+}
+
+
+}
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderSimulation.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderSimulation.java
new file mode 100644
index 0000000000000000000000000000000000000000..a8f560a4096947ee2f090a5aa929e3de9f290d58
--- /dev/null
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderSimulation.java
@@ -0,0 +1,64 @@
+package de.ugoe.cs.rwm.mocci.connector;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Random;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.eclipse.cmf.occi.core.AttributeState;
+import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import monitoring.Monitorableproperty;
+
+public class ResultproviderSimulation implements Runnable{
+ private static Logger LOGGER = LoggerFactory.getLogger(ResultproviderSimulation.class);
+ private Monitorableproperty monProp;
+ private OCCIFactoryImpl factory = new OCCIFactoryImpl();
+ private static Random random;
+ private int interval;
+ private List<String> results;
+
+ public ResultproviderSimulation(Monitorableproperty monProp) {
+ this.monProp = monProp;
+ String property = getProperty(monProp.getMonitoringProperty());
+ List<String> items = new ArrayList<String>(Arrays.asList(property.split("\\s*,\\s*")));
+ this.interval = Integer.parseInt(items.get(items.size()-1));
+ String lastItem = items.get(items.size()-1);
+ items.remove(items.get(items.size()-1));
+ this.results = items;
+ LOGGER.info("Creating Simulation for: " + monProp.getMonitoringProperty() + "; with values: " + results + "; and interval: " + interval);
+ }
+
+ @Override
+ public void run() {
+ while(true) {
+ try {
+ Thread.sleep(interval);
+ } catch (InterruptedException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+
+ AttributeState monPropAttr = factory.createAttributeState();
+ monPropAttr.setName("monitoring.result");
+ int randomElementIndex = ThreadLocalRandom.current().nextInt(results.size());
+ String value = results.get(randomElementIndex);
+ monPropAttr.setValue(value);
+ monProp.setMonitoringResult(value);
+ LOGGER.info("MonProp: " + monProp.getMonitoringProperty() + ", set to: " + value + "(" +monProp.getId()+")" );
+ monProp.getAttributes().add(monPropAttr);
+ }
+
+ }
+
+ private String getProperty(String monitoringProperty) {
+ return new ResultproviderHelper().getProperties().getProperty(monitoringProperty);
+
+ }
+
+}
+
+
diff --git a/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore b/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore
deleted file mode 100644
index fd04598cccd1eb791debf5b0edfff26368dbb294..0000000000000000000000000000000000000000
--- a/de.ugoe.cs.rwm.mocci.connector/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/de/
diff --git a/de.ugoe.cs.rwm.mocci.model.edit/.classpath b/de.ugoe.cs.rwm.mocci.model.edit/.classpath
index 9f26f94005a15116e7455333308dcb80ef6440e6..ba9563870359d6f6776459965a9a63042a32bfb4 100644
--- a/de.ugoe.cs.rwm.mocci.model.edit/.classpath
+++ b/de.ugoe.cs.rwm.mocci.model.edit/.classpath
@@ -3,6 +3,5 @@
<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/.classpath b/de.ugoe.cs.rwm.mocci.model/.classpath
index 9f26f94005a15116e7455333308dcb80ef6440e6..ba9563870359d6f6776459965a9a63042a32bfb4 100644
--- a/de.ugoe.cs.rwm.mocci.model/.classpath
+++ b/de.ugoe.cs.rwm.mocci.model/.classpath
@@ -3,6 +3,5 @@
<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/model/monitoring.occie b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
index 50658e2e70d5246aede87f548c4c68ed65856115..b642ad5cf4024b9126a3a8a9cdf9f4b1279a8090 100644
--- a/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
+++ b/de.ugoe.cs.rwm.mocci.model/model/monitoring.occie
@@ -14,11 +14,11 @@
<kinds name="ResultProvider" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="Publisher Resource">
<parent href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
</kinds>
- <kinds name="MonitorableProperty" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitorableProperty Component" target="//@kinds[term='sensor']">
+ <kinds name="MonitorableProperty" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="MonitorableProperty Component" source="//@kinds[term='sensor']">
<attributes name="monitoring.property" mutable="false" required="true" description="" type="//@types.0"/>
<attributes name="monitoring.result" mutable="true" description="" type="//@types.0"/>
<parent href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
- <source href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
+ <target href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
</kinds>
<mixins name="OCCIResultProvider" scheme="http://schemas.ugoe.cs.rwm/monitoring#" title="OCCIResultProvider Mixin" applies="//@kinds[term='resultprovider']">
<attributes name="result.provider.endpoint" mutable="true" required="true" description="Genereic address to be used by the result provider." type="//@types.0"/>
diff --git a/de.ugoe.cs.rwm.mocci.model/new Extension diagram.jpg b/de.ugoe.cs.rwm.mocci.model/new Extension diagram.jpg
deleted file mode 100644
index 86176e0a62105c3c635681ff6e07d597c7c0b22d..0000000000000000000000000000000000000000
Binary files a/de.ugoe.cs.rwm.mocci.model/new Extension diagram.jpg and /dev/null differ
diff --git a/de.ugoe.cs.rwm.mocci.model/representations.aird b/de.ugoe.cs.rwm.mocci.model/representations.aird
index 23c7e40418cfc8e7ec27b3cab7d11836394171c7..2e5532f11d6da1be7272aab2ec582e7d2f75238e 100644
--- a/de.ugoe.cs.rwm.mocci.model/representations.aird
+++ b/de.ugoe.cs.rwm.mocci.model/representations.aird
@@ -34,15 +34,15 @@
<children xmi:type="notation:Node" xmi:id="_zUGYYPcHEeiCiOA5ZDMQdg" type="3009" element="_zRw2FvcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zUG_cPcHEeiCiOA5ZDMQdg" type="5004"/>
<children xmi:type="notation:Node" xmi:id="_zUHmgPcHEeiCiOA5ZDMQdg" type="7003">
- <children xmi:type="notation:Node" xmi:id="_zUW3EPcHEeiCiOA5ZDMQdg" type="3010" element="_zRw2GPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUW3EPcHEeiCiOA5ZDMQdg" visible="false" type="3010" element="_zRw2GPcHEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_zUW3EfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUW3EvcHEeiCiOA5ZDMQdg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_zUW3E_cHEeiCiOA5ZDMQdg" type="3010" element="_zRw2GvcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUW3E_cHEeiCiOA5ZDMQdg" visible="false" type="3010" element="_zRw2GvcHEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_zUW3FPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUW3FfcHEeiCiOA5ZDMQdg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_zUXeIPcHEeiCiOA5ZDMQdg" type="3010" element="_zRw2HPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUXeIPcHEeiCiOA5ZDMQdg" visible="false" type="3010" element="_zRw2HPcHEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_zUXeIfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUXeIvcHEeiCiOA5ZDMQdg"/>
</children>
@@ -50,7 +50,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zUXeJPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUXeJfcHEeiCiOA5ZDMQdg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_zUXeJvcHEeiCiOA5ZDMQdg" type="3010" element="_zRw2IPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUXeJvcHEeiCiOA5ZDMQdg" visible="false" type="3010" element="_zRw2IPcHEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_zUXeJ_cHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUXeKPcHEeiCiOA5ZDMQdg"/>
</children>
@@ -78,7 +78,7 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_zUHmgvcHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zUGYYfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUGYYvcHEeiCiOA5ZDMQdg" x="31" y="30"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUGYYvcHEeiCiOA5ZDMQdg" x="295" y="12" width="136" height="147"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zUINkPcHEeiCiOA5ZDMQdg" type="3009" element="_zRw2LPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zUI0oPcHEeiCiOA5ZDMQdg" type="5004"/>
@@ -87,7 +87,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zUZTV_cHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUZTWPcHEeiCiOA5ZDMQdg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_zUZ6YPcHEeiCiOA5ZDMQdg" type="3010" element="_zRw2MPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUZ6YPcHEeiCiOA5ZDMQdg" visible="false" type="3010" element="_zRw2MPcHEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_zUZ6YfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_zUZ6YvcHEeiCiOA5ZDMQdg"/>
</children>
@@ -115,16 +115,16 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_zUJbsvcHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zUINkfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUINkvcHEeiCiOA5ZDMQdg" x="247" y="30"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUINkvcHEeiCiOA5ZDMQdg" x="10" y="10" width="135" height="149"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_zUL38PcHEeiCiOA5ZDMQdg" visible="false" type="3009" element="_zRw2PPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_zUL38PcHEeiCiOA5ZDMQdg" type="3009" element="_zRw2PPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zUMfAPcHEeiCiOA5ZDMQdg" type="5004"/>
<children xmi:type="notation:Node" xmi:id="_zUMfAfcHEeiCiOA5ZDMQdg" type="7003">
<styles xmi:type="notation:SortingStyle" xmi:id="_zUMfAvcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_zUMfA_cHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zUL38fcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUL38vcHEeiCiOA5ZDMQdg" x="1687" y="681"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUL38vcHEeiCiOA5ZDMQdg" x="151" y="78" width="135" height="40"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zUNGEPcHEeiCiOA5ZDMQdg" visible="false" type="3009" element="_zRw2PvcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zUNGE_cHEeiCiOA5ZDMQdg" type="5004"/>
@@ -389,99 +389,37 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_zT4V8vcHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zTt94fcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zTt94vcHEeiCiOA5ZDMQdg" x="288"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zTt94vcHEeiCiOA5ZDMQdg" x="156" y="48" width="447" height="173"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zT_qsPcHEeiCiOA5ZDMQdg" type="2003" element="_zRxdRPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zT_qs_cHEeiCiOA5ZDMQdg" type="5007"/>
<children xmi:type="notation:Node" xmi:id="_zUARwPcHEeiCiOA5ZDMQdg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_zU97E_cHEeiCiOA5ZDMQdg" type="3010" element="_zRxdRvcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU97FPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU97FfcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU97FvcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdSPcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU97F_cHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU97GPcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU-iIPcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdSvcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU-iIfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU-iIvcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU-iI_cHEeiCiOA5ZDMQdg" type="3010" element="_zRxdTPcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU-iJPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU-iJfcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU-iJvcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdTvcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU-iJ_cHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU-iKPcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU_wQPcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdUPcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU_wQfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU_wQvcHEeiCiOA5ZDMQdg"/>
- </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_zUARwfcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_zUARwvcHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zT_qsfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zT_qsvcHEeiCiOA5ZDMQdg" x="288" y="252"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zT_qsvcHEeiCiOA5ZDMQdg" x="408" y="265" width="123"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zUA40PcHEeiCiOA5ZDMQdg" type="2003" element="_zRxdUvcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zUBf4PcHEeiCiOA5ZDMQdg" type="5007"/>
<children xmi:type="notation:Node" xmi:id="_zUBf4fcHEeiCiOA5ZDMQdg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_zU_wQ_cHEeiCiOA5ZDMQdg" type="3010" element="_zRxdVPcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU_wRPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU_wRfcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zU_wRvcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdVvcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zU_wR_cHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zU_wSPcHEeiCiOA5ZDMQdg"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_zVAXUPcHEeiCiOA5ZDMQdg" type="3010" element="_zRxdWPcHEeiCiOA5ZDMQdg">
- <styles xmi:type="notation:FontStyle" xmi:id="_zVAXUfcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_zVAXUvcHEeiCiOA5ZDMQdg"/>
- </children>
<styles xmi:type="notation:SortingStyle" xmi:id="_zUBf4vcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_zUBf4_cHEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_zUA40fcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUA40vcHEeiCiOA5ZDMQdg" x="720" y="252"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_Cr_IYPcIEeiCiOA5ZDMQdg" type="2003" element="_CqlaMPcIEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_Cr_vcPcIEeiCiOA5ZDMQdg" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_Cr_vcfcIEeiCiOA5ZDMQdg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnRP4A9aEemWZoTWtpdGMw" type="3010" element="_tlZAkA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnRP4Q9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnRP4g9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_Cr_vcvcIEeiCiOA5ZDMQdg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_Cr_vc_cIEeiCiOA5ZDMQdg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_Cr_IYfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Cr_IYvcIEeiCiOA5ZDMQdg" x="684" y="298"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IhtloPcIEeiCiOA5ZDMQdg" type="2003" element="_IhgKQPcIEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_Ihtlo_cIEeiCiOA5ZDMQdg" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_IhtlpPcIEeiCiOA5ZDMQdg" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnR28A9aEemWZoTWtpdGMw" type="3010" element="_tla1wA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnR28Q9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnR28g9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_IhtlpfcIEeiCiOA5ZDMQdg"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_IhtlpvcIEeiCiOA5ZDMQdg"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_IhtlofcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhtlovcIEeiCiOA5ZDMQdg" x="540" y="252"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zUA40vcHEeiCiOA5ZDMQdg" x="156" y="228"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBkLQPcIEeiCiOA5ZDMQdg" type="2002" element="_SAU1IPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBkLQ_cIEeiCiOA5ZDMQdg" type="5006"/>
<children xmi:type="notation:Node" xmi:id="_SBkLRPcIEeiCiOA5ZDMQdg" type="7001">
- <children xmi:type="notation:Node" xmi:id="_SBkyUPcIEeiCiOA5ZDMQdg" type="3009" element="_SAWqUPcIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_SBkyUPcIEeiCiOA5ZDMQdg" visible="false" type="3009" element="_SAWqUPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBkyU_cIEeiCiOA5ZDMQdg" type="5004"/>
<children xmi:type="notation:Node" xmi:id="_SBkyVPcIEeiCiOA5ZDMQdg" type="7003">
- <children xmi:type="notation:Node" xmi:id="_SBmAdPcIEeiCiOA5ZDMQdg" type="3010" element="_SAXRYvcIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_SBmAdPcIEeiCiOA5ZDMQdg" visible="false" type="3010" element="_SAXRYvcIEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_SBmAdfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_SBmAdvcIEeiCiOA5ZDMQdg"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_SBmngPcIEeiCiOA5ZDMQdg" type="3010" element="_SAl64fcIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_SBmngPcIEeiCiOA5ZDMQdg" visible="false" type="3010" element="_SAl64fcIEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_SBmngfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_SBmngvcIEeiCiOA5ZDMQdg"/>
</children>
@@ -489,12 +427,12 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_SBkyVvcIEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_SBkyUfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBkyUvcIEeiCiOA5ZDMQdg" x="19" y="22"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBkyUvcIEeiCiOA5ZDMQdg" x="91" y="6"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBlZYPcIEeiCiOA5ZDMQdg" type="3009" element="_SAWqUvcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBlZY_cIEeiCiOA5ZDMQdg" type="5004"/>
<children xmi:type="notation:Node" xmi:id="_SBlZZPcIEeiCiOA5ZDMQdg" type="7003">
- <children xmi:type="notation:Node" xmi:id="_SBmng_cIEeiCiOA5ZDMQdg" type="3010" element="_SAsBgfcIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_SBmng_cIEeiCiOA5ZDMQdg" visible="false" type="3010" element="_SAsBgfcIEeiCiOA5ZDMQdg">
<styles xmi:type="notation:FontStyle" xmi:id="_SBmnhPcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_SBmnhfcIEeiCiOA5ZDMQdg"/>
</children>
@@ -502,65 +440,27 @@
<styles xmi:type="notation:FilteringStyle" xmi:id="_SBlZZvcIEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_SBlZYfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBlZYvcIEeiCiOA5ZDMQdg" x="156" y="48"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBlZYvcIEeiCiOA5ZDMQdg" x="7" y="18" width="99"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_SBlZZ_cIEeiCiOA5ZDMQdg" visible="false" type="3009" element="_SAXRYPcIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_SBlZZ_cIEeiCiOA5ZDMQdg" type="3009" element="_SAXRYPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBmAcPcIEeiCiOA5ZDMQdg" type="5004"/>
<children xmi:type="notation:Node" xmi:id="_SBmAcfcIEeiCiOA5ZDMQdg" type="7003">
<styles xmi:type="notation:SortingStyle" xmi:id="_SBmAcvcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_SBmAc_cIEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_SBlZaPcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBlZafcIEeiCiOA5ZDMQdg" x="168" y="60"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBlZafcIEeiCiOA5ZDMQdg" x="7" y="114" width="99"/>
</children>
<styles xmi:type="notation:SortingStyle" xmi:id="_SBkLRfcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FilteringStyle" xmi:id="_SBkLRvcIEeiCiOA5ZDMQdg"/>
</children>
<styles xmi:type="notation:ShapeStyle" xmi:id="_SBkLQfcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBkLQvcIEeiCiOA5ZDMQdg" x="948"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBkLQvcIEeiCiOA5ZDMQdg" x="612" y="48" width="123" height="172"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tnAxMA9aEemWZoTWtpdGMw" type="2003" element="_tlIh4A9aEemWZoTWtpdGMw">
- <children xmi:type="notation:Node" xmi:id="_tnIF8A9aEemWZoTWtpdGMw" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_tnItAA9aEemWZoTWtpdGMw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnR28w9aEemWZoTWtpdGMw" type="3010" element="_tlK-IA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnR29A9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnR29Q9aEemWZoTWtpdGMw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tnSeAA9aEemWZoTWtpdGMw" type="3010" element="_tlMzUA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnSeAQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnSeAg9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_tnItAQ9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_tnItAg9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tnAxMQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnAxMg9aEemWZoTWtpdGMw" x="144" y="444"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tnM-cA9aEemWZoTWtpdGMw" type="2003" element="_tld5EA9aEemWZoTWtpdGMw">
- <children xmi:type="notation:Node" xmi:id="_tnM-cw9aEemWZoTWtpdGMw" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_tnNlgA9aEemWZoTWtpdGMw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnSeAw9aEemWZoTWtpdGMw" type="3010" element="_tlegIA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnSeBA9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnSeBQ9aEemWZoTWtpdGMw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tnTsIA9aEemWZoTWtpdGMw" type="3010" element="_tlfuQA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnTsIQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnTsIg9aEemWZoTWtpdGMw"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tnUTMA9aEemWZoTWtpdGMw" type="3010" element="_tloRIA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnUTMQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnUTMg9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_tnNlgQ9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_tnNlgg9aEemWZoTWtpdGMw"/>
- </children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tnM-cQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnM-cg9aEemWZoTWtpdGMw" x="516" y="456"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_tnNlgw9aEemWZoTWtpdGMw" type="2003" element="_tlpfQA9aEemWZoTWtpdGMw">
+ <children xmi:type="notation:Node" xmi:id="_tnNlgw9aEemWZoTWtpdGMw" visible="false" type="2003" element="_tlpfQA9aEemWZoTWtpdGMw">
<children xmi:type="notation:Node" xmi:id="_tnNlhg9aEemWZoTWtpdGMw" type="5007"/>
<children xmi:type="notation:Node" xmi:id="_tnOMkA9aEemWZoTWtpdGMw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnUTMw9aEemWZoTWtpdGMw" type="3010" element="_tlqtYg9aEemWZoTWtpdGMw">
+ <children xmi:type="notation:Node" xmi:id="_tnUTMw9aEemWZoTWtpdGMw" visible="false" type="3010" element="_tlqtYg9aEemWZoTWtpdGMw">
<styles xmi:type="notation:FontStyle" xmi:id="_tnUTNA9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" italic="true"/>
<layoutConstraint xmi:type="notation:Location" xmi:id="_tnUTNQ9aEemWZoTWtpdGMw"/>
</children>
@@ -570,48 +470,69 @@
<styles xmi:type="notation:ShapeStyle" xmi:id="_tnNlhA9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="12" bold="true"/>
<layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnNlhQ9aEemWZoTWtpdGMw"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tnOMkw9aEemWZoTWtpdGMw" type="2003" element="_tlqGUQ9aEemWZoTWtpdGMw">
- <children xmi:type="notation:Node" xmi:id="_tnOMlg9aEemWZoTWtpdGMw" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_tnOMlw9aEemWZoTWtpdGMw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnU6QA9aEemWZoTWtpdGMw" type="3010" element="_tlsikA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnU6QQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" italic="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnU6Qg9aEemWZoTWtpdGMw"/>
+ <children xmi:type="notation:Node" xmi:id="_K62foBKFEemGUof1NBtbTQ" type="2003" element="_K5Ng4BKFEemGUof1NBtbTQ">
+ <children xmi:type="notation:Node" xmi:id="_K68mQBKFEemGUof1NBtbTQ" type="5007"/>
+ <children xmi:type="notation:Node" xmi:id="_K69NUBKFEemGUof1NBtbTQ" type="7004">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_K69NURKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_K69NUhKFEemGUof1NBtbTQ"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_K62foRKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="12" bold="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K62fohKFEemGUof1NBtbTQ" x="276" y="228"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_K7A3sBKFEemGUof1NBtbTQ" type="2003" element="_K5OvABKFEemGUof1NBtbTQ">
+ <children xmi:type="notation:Node" xmi:id="_K7BewBKFEemGUof1NBtbTQ" type="5007"/>
+ <children xmi:type="notation:Node" xmi:id="_K7BewRKFEemGUof1NBtbTQ" type="7004">
+ <styles xmi:type="notation:SortingStyle" xmi:id="_K7BewhKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_K7BewxKFEemGUof1NBtbTQ"/>
+ </children>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_K7A3sRKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="12" bold="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7A3shKFEemGUof1NBtbTQ" x="204" y="276"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_K7BexBKFEemGUof1NBtbTQ" type="2003" element="_K5PWERKFEemGUof1NBtbTQ">
+ <children xmi:type="notation:Node" xmi:id="_K7CF0BKFEemGUof1NBtbTQ" type="5007"/>
+ <children xmi:type="notation:Node" xmi:id="_K7CF0RKFEemGUof1NBtbTQ" type="7004">
+ <children xmi:type="notation:Node" xmi:id="_K7EiEBKFEemGUof1NBtbTQ" type="3010" element="_K5QkMBKFEemGUof1NBtbTQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7EiERKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="10" bold="true" italic="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_K7EiEhKFEemGUof1NBtbTQ"/>
</children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_tnOMmA9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_tnOMmQ9aEemWZoTWtpdGMw"/>
+ <children xmi:type="notation:Node" xmi:id="_K7FJIBKFEemGUof1NBtbTQ" type="3010" element="_K5RyUBKFEemGUof1NBtbTQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7FJIRKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="10"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_K7FJIhKFEemGUof1NBtbTQ"/>
+ </children>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_K7CF0hKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_K7CF0xKFEemGUof1NBtbTQ"/>
</children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tnOMlA9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnOMlQ9aEemWZoTWtpdGMw" y="-72"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_K7BexRKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="12" bold="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7BexhKFEemGUof1NBtbTQ" x="540" y="254"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tnOzoA9aEemWZoTWtpdGMw" type="2003" element="_tlqtYA9aEemWZoTWtpdGMw">
- <children xmi:type="notation:Node" xmi:id="_tnOzow9aEemWZoTWtpdGMw" type="5007"/>
- <children xmi:type="notation:Node" xmi:id="_tnOzpA9aEemWZoTWtpdGMw" type="7004">
- <children xmi:type="notation:Node" xmi:id="_tnVhUA9aEemWZoTWtpdGMw" type="3010" element="_tltJoA9aEemWZoTWtpdGMw">
- <styles xmi:type="notation:FontStyle" xmi:id="_tnVhUQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" italic="true"/>
- <layoutConstraint xmi:type="notation:Location" xmi:id="_tnVhUg9aEemWZoTWtpdGMw"/>
+ <children xmi:type="notation:Node" xmi:id="_K7CF1BKFEemGUof1NBtbTQ" type="2003" element="_K5VcsBKFEemGUof1NBtbTQ">
+ <children xmi:type="notation:Node" xmi:id="_K7CF1xKFEemGUof1NBtbTQ" type="5007"/>
+ <children xmi:type="notation:Node" xmi:id="_K7Cs4BKFEemGUof1NBtbTQ" type="7004">
+ <children xmi:type="notation:Node" xmi:id="_K7FwMBKFEemGUof1NBtbTQ" type="3010" element="_K5WDwBKFEemGUof1NBtbTQ">
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7FwMRKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="10" bold="true"/>
+ <layoutConstraint xmi:type="notation:Location" xmi:id="_K7FwMhKFEemGUof1NBtbTQ"/>
</children>
- <styles xmi:type="notation:SortingStyle" xmi:id="_tnOzpQ9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FilteringStyle" xmi:id="_tnOzpg9aEemWZoTWtpdGMw"/>
+ <styles xmi:type="notation:SortingStyle" xmi:id="_K7Cs4RKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FilteringStyle" xmi:id="_K7Cs4hKFEemGUof1NBtbTQ"/>
</children>
- <styles xmi:type="notation:ShapeStyle" xmi:id="_tnOzoQ9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="12" bold="true"/>
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnOzog9aEemWZoTWtpdGMw" x="156" y="-72"/>
+ <styles xmi:type="notation:ShapeStyle" xmi:id="_K7CF1RKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="12" bold="true"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7CF1hKFEemGUof1NBtbTQ" x="156" y="336" width="230"/>
</children>
<styles xmi:type="notation:DiagramStyle" xmi:id="_zTc4IvcHEeiCiOA5ZDMQdg"/>
<edges xmi:type="notation:Edge" xmi:id="_zVrswPcHEeiCiOA5ZDMQdg" type="4001" element="_zRxda_cHEeiCiOA5ZDMQdg" source="_zUA40PcHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVsT0PcHEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT0fcHEeiCiOA5ZDMQdg" x="3" y="-4"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT0fcHEeiCiOA5ZDMQdg" x="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zVsT0vcHEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT0_cHEeiCiOA5ZDMQdg" x="2" y="1"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT0_cHEeiCiOA5ZDMQdg" x="16" y="-7"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zVsT1PcHEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT1fcHEeiCiOA5ZDMQdg" x="-1" y="1"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zVsT1fcHEeiCiOA5ZDMQdg" x="-13" y="-3"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_zVrswfcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_zVrswvcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVrsw_cHEeiCiOA5ZDMQdg" points="[-38, -39, 138, 145]$[-108, -112, 68, 72]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVs64PcHEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVs64fcHEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVrsw_cHEeiCiOA5ZDMQdg" points="[0, -20, -2, 24]$[1, -37, -1, 7]"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVs64fcHEeiCiOA5ZDMQdg" id="(0.3233082706766917,0.9523809523809523)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVs64vcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdbvcHEeiCiOA5ZDMQdg" source="_zUNGEPcHEeiCiOA5ZDMQdg" target="_zUGYYPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVs65vcHEeiCiOA5ZDMQdg" type="6001">
@@ -627,7 +548,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zVs65PcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVs65fcHEeiCiOA5ZDMQdg" points="[-1, 0, -1, 60]$[-1, -60, -1, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuJAPcHEeiCiOA5ZDMQdg" id="(0.5151515151515151,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuJAfcHEeiCiOA5ZDMQdg" id="(0.5026737967914439,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuJAfcHEeiCiOA5ZDMQdg" id="(0.7626828763189865,0.9567354965585054)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVuJAvcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdcfcHEeiCiOA5ZDMQdg" source="_zUNGF_cHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVuJBvcHEeiCiOA5ZDMQdg" type="6001">
@@ -643,7 +564,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zVuJBPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVuJBfcHEeiCiOA5ZDMQdg" points="[-1, 0, -441, 60]$[439, -60, -1, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuwEPcHEeiCiOA5ZDMQdg" id="(0.5161290322580645,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuwEfcHEeiCiOA5ZDMQdg" id="(0.5043478260869565,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVuwEfcHEeiCiOA5ZDMQdg" id="(0.7409956983753739,0.8843537414965986)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVuwEvcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxddPcHEeiCiOA5ZDMQdg" source="_zUNGF_cHEeiCiOA5ZDMQdg" target="_zUGYYPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVvXIPcHEeiCiOA5ZDMQdg" type="6001">
@@ -659,7 +580,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zVuwFPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVuwFfcHEeiCiOA5ZDMQdg" points="[-1, 0, 128, 60]$[-130, -60, -1, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVvXJvcHEeiCiOA5ZDMQdg" id="(0.5161290322580645,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVvXJ_cHEeiCiOA5ZDMQdg" id="(0.5026737967914439,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVvXJ_cHEeiCiOA5ZDMQdg" id="(0.7626828763189865,0.9567354965585054)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVvXKPcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdd_cHEeiCiOA5ZDMQdg" source="_zUNtJPcHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVv-MPcHEeiCiOA5ZDMQdg" type="6001">
@@ -675,7 +596,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zVvXKvcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVvXK_cHEeiCiOA5ZDMQdg" points="[-1, 0, -1, 60]$[-1, -60, -1, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVv-NvcHEeiCiOA5ZDMQdg" id="(0.5053191489361702,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVv-N_cHEeiCiOA5ZDMQdg" id="(0.5043478260869565,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVv-N_cHEeiCiOA5ZDMQdg" id="(0.7409956983753739,0.8843537414965986)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVwlQPcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdevcHEeiCiOA5ZDMQdg" source="_zUOUNPcHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zVwlRPcHEeiCiOA5ZDMQdg" type="6001">
@@ -691,7 +612,7 @@
<styles xmi:type="notation:FontStyle" xmi:id="_zVwlQvcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVwlQ_cHEeiCiOA5ZDMQdg" points="[-1, 0, -253, 60]$[251, -60, -1, 0]"/>
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVxMUPcHEeiCiOA5ZDMQdg" id="(0.5026178010471204,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVxMUfcHEeiCiOA5ZDMQdg" id="(0.5043478260869565,1.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zVxMUfcHEeiCiOA5ZDMQdg" id="(0.7409956983753739,0.8843537414965986)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zVzomPcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdhvcHEeiCiOA5ZDMQdg" source="_zUGYYPcHEeiCiOA5ZDMQdg" target="_zURXgPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zV0PoPcHEeiCiOA5ZDMQdg" type="6001">
@@ -706,7 +627,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_zVzomfcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_zVzomvcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zVzom_cHEeiCiOA5ZDMQdg" points="[-1, 0, 129, 60]$[-131, -60, -1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV02sPcHEeiCiOA5ZDMQdg" id="(0.5026737967914439,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV02sPcHEeiCiOA5ZDMQdg" id="(0.7626828763189865,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV02sfcHEeiCiOA5ZDMQdg" id="(0.5013020833333334,1.0)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zV02svcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdifcHEeiCiOA5ZDMQdg" source="_zUINkPcHEeiCiOA5ZDMQdg" target="_zUTMsPcHEeiCiOA5ZDMQdg">
@@ -722,7 +643,7 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_zV02s_cHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_zV02tPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zV02tfcHEeiCiOA5ZDMQdg" points="[-1, 0, -132, 60]$[130, -60, -1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV2E0PcHEeiCiOA5ZDMQdg" id="(0.5043478260869565,0.0)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV2E0PcHEeiCiOA5ZDMQdg" id="(0.7409956983753739,-0.061224489795918366)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zV2E0fcHEeiCiOA5ZDMQdg" id="(0.5013020833333334,1.0)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_zV2E0vcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxdjPcHEeiCiOA5ZDMQdg" source="_zUeL0PcHEeiCiOA5ZDMQdg" target="_zUey4PcHEeiCiOA5ZDMQdg">
@@ -1173,100 +1094,68 @@
<sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWHxpPcHEeiCiOA5ZDMQdg" id="(0.5172413793103449,0.0)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWHxpfcHEeiCiOA5ZDMQdg" id="(0.5,1.0)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_zWHxpvcHEeiCiOA5ZDMQdg" visible="false" type="4001" element="_zRxd4PcHEeiCiOA5ZDMQdg" source="_zUL38PcHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
+ <edges xmi:type="notation:Edge" xmi:id="_zWHxpvcHEeiCiOA5ZDMQdg" type="4001" element="_zRxd4PcHEeiCiOA5ZDMQdg" source="_zUL38PcHEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_zWHxqvcHEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxq_cHEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxq_cHEeiCiOA5ZDMQdg" x="-15" y="18"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zWHxrPcHEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxrfcHEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxrfcHEeiCiOA5ZDMQdg" x="-1"/>
</children>
<children xmi:type="notation:Node" xmi:id="_zWHxrvcHEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxr_cHEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zWHxr_cHEeiCiOA5ZDMQdg" y="-1"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_zWHxp_cHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_zWHxqPcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zWHxqfcHEeiCiOA5ZDMQdg" points="[-1, 0, 216, 60]$[-218, -60, -1, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWIYsPcHEeiCiOA5ZDMQdg" id="(0.5081967213114754,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWIYsfcHEeiCiOA5ZDMQdg" id="(0.5043478260869565,1.0)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_zWHxqfcHEeiCiOA5ZDMQdg" points="[-13, 12, 16, -4]$[-13, 12, 16, -4]$[-21, 12, 8, -4]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWIYsPcHEeiCiOA5ZDMQdg" id="(0.09774436090225563,0.0)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_zWIYsfcHEeiCiOA5ZDMQdg" id="(0.9398496240601504,0.5714285714285714)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="__rcvkPcHEeiCiOA5ZDMQdg" type="4001" element="__q-OcPcHEeiCiOA5ZDMQdg" source="_zT_qsPcHEeiCiOA5ZDMQdg" target="_zUGYYPcHEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="__rcvlPcHEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvlfcHEeiCiOA5ZDMQdg" x="2" y="-11"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvlfcHEeiCiOA5ZDMQdg" x="11" y="-6"/>
</children>
<children xmi:type="notation:Node" xmi:id="__rcvlvcHEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvl_cHEeiCiOA5ZDMQdg" y="9"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvl_cHEeiCiOA5ZDMQdg" x="17" y="-9"/>
</children>
<children xmi:type="notation:Node" xmi:id="__rcvmPcHEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvmfcHEeiCiOA5ZDMQdg" x="-1" y="9"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="__rcvmfcHEeiCiOA5ZDMQdg" x="-2" y="-8"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="__rcvkfcHEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="__rcvkvcHEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__rcvk_cHEeiCiOA5ZDMQdg" points="[5, -71, -9, 121]$[7, -96, -7, 96]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rdWoPcHEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rdWofcHEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="__rcvk_cHEeiCiOA5ZDMQdg" points="[-1, -3, 3, 190]$[-2, -59, 2, 134]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rdWoPcHEeiCiOA5ZDMQdg" id="(0.6198347107438017,0.07317073170731707)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="__rdWofcHEeiCiOA5ZDMQdg" id="(0.17164179104477612,0.06194690265486726)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_HERXQPcIEeiCiOA5ZDMQdg" type="4001" element="_HDKkAPcIEeiCiOA5ZDMQdg" source="_Cr_IYPcIEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_HER-UPcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HER-UfcIEeiCiOA5ZDMQdg" x="3" y="-5"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_HER-UvcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HER-U_cIEeiCiOA5ZDMQdg" x="5" y="3"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_HER-VPcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_HER-VfcIEeiCiOA5ZDMQdg" x="4" y="6"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_HERXQfcIEeiCiOA5ZDMQdg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_HERXQvcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HERXQ_cIEeiCiOA5ZDMQdg" points="[0, 0, 115, 119]$[-115, -119, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HESlYPcIEeiCiOA5ZDMQdg" id="(0.6075949367088608,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_HESlYfcIEeiCiOA5ZDMQdg" id="(0.5739130434782609,1.0)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_IhuMsPcIEeiCiOA5ZDMQdg" type="4001" element="_Ihlp0PcIEeiCiOA5ZDMQdg" source="_IhtloPcIEeiCiOA5ZDMQdg" target="_zUINkPcHEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_IhuMtPcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhuMtfcIEeiCiOA5ZDMQdg" x="2" y="-10"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IhuzwPcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_IhuzwfcIEeiCiOA5ZDMQdg" x="3" y="4"/>
- </children>
- <children xmi:type="notation:Node" xmi:id="_IhuzwvcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Ihuzw_cIEeiCiOA5ZDMQdg" x="3" y="4"/>
- </children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_IhuMsfcIEeiCiOA5ZDMQdg"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_IhuMsvcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_IhuMs_cIEeiCiOA5ZDMQdg" points="[6, -20, -31, 96]$[28, -93, -9, 23]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IhuzxPcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_IhuzxfcIEeiCiOA5ZDMQdg" id="(0.3217391304347826,0.8391608391608392)"/>
- </edges>
- <edges xmi:type="notation:Edge" xmi:id="_SBn1oPcIEeiCiOA5ZDMQdg" type="4001" element="_SBKioPcIEeiCiOA5ZDMQdg" source="_SBlZYPcIEeiCiOA5ZDMQdg" target="_SBkyUPcIEeiCiOA5ZDMQdg">
+ <edges xmi:type="notation:Edge" xmi:id="_SBn1oPcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBKioPcIEeiCiOA5ZDMQdg" source="_SBlZYPcIEeiCiOA5ZDMQdg" target="_SBkyUPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBn1pPcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1pfcIEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1pfcIEeiCiOA5ZDMQdg" x="-3" y="-8"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBn1pvcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1p_cIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1p_cIEeiCiOA5ZDMQdg" x="7" y="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBn1qPcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1qfcIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBn1qfcIEeiCiOA5ZDMQdg" x="7" y="10"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBn1ofcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBn1ovcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBn1o_cIEeiCiOA5ZDMQdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBn1qvcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBn1o_cIEeiCiOA5ZDMQdg" points="[-44, -23, 102, 54]$[-92, -49, 54, 28]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBn1qvcIEeiCiOA5ZDMQdg" id="(0.37628865979381443,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBn1q_cIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBocsPcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBLJsPcIEeiCiOA5ZDMQdg" source="_SBlZZ_cIEeiCiOA5ZDMQdg" target="_SBkyUPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBoctPcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBoctfcIEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBoctfcIEeiCiOA5ZDMQdg" x="8" y="-12"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBoctvcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBoct_cIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBoct_cIEeiCiOA5ZDMQdg" x="-7" y="7"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBocuPcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBocufcIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBocufcIEeiCiOA5ZDMQdg" x="-6" y="8"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBocsfcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBocsvcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBocs_cIEeiCiOA5ZDMQdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBocuvcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBocs_cIEeiCiOA5ZDMQdg" points="[19, -13, -100, 64]$[69, -45, -50, 32]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBocuvcIEeiCiOA5ZDMQdg" id="(0.1958762886597938,0.5)"/>
<targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBocu_cIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBocvPcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBLJs_cIEeiCiOA5ZDMQdg" source="_zUGYYPcHEeiCiOA5ZDMQdg" target="_SBlZYPcIEeiCiOA5ZDMQdg">
@@ -1282,8 +1171,8 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBocvfcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBocvvcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBocv_cIEeiCiOA5ZDMQdg" points="[94, 4, -1206, -62]$[1232, 62, -68, -4]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpDxPcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpDxfcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpDxPcIEeiCiOA5ZDMQdg" id="(0.7595698785535971,0.4783677482792527)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpDxfcIEeiCiOA5ZDMQdg" id="(0.37628865979381443,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBpDxvcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBLJtvcIEeiCiOA5ZDMQdg" source="_zUINkPcHEeiCiOA5ZDMQdg" target="_SBlZYPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBpDyvcIEeiCiOA5ZDMQdg" type="6001">
@@ -1298,24 +1187,24 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBpDx_cIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBpDyPcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBpDyfcIEeiCiOA5ZDMQdg" points="[115, 11, -875, -91]$[922, 94, -68, -8]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq0PcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq0fcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq0PcIEeiCiOA5ZDMQdg" id="(0.7346078044238623,0.41156462585034026)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq0fcIEeiCiOA5ZDMQdg" id="(0.37628865979381443,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBpq0vcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBLJufcIEeiCiOA5ZDMQdg" source="_zUL38PcHEeiCiOA5ZDMQdg" target="_SBlZZ_cIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBpq1vcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq1_cIEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq1_cIEeiCiOA5ZDMQdg" y="-9"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBpq2PcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq2fcIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq2fcIEeiCiOA5ZDMQdg" x="-2" y="9"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBpq2vcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq2_cIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBpq2_cIEeiCiOA5ZDMQdg" x="19" y="10"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBpq0_cIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBpq1PcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBpq1fcIEeiCiOA5ZDMQdg" points="[0, 0, 67, 549]$[-67, -549, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq3PcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq3fcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBpq1fcIEeiCiOA5ZDMQdg" points="[61, 0, -197, 0]$[239, 0, -19, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq3PcIEeiCiOA5ZDMQdg" id="(0.45864661654135336,0.7734082397003746)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBpq3fcIEeiCiOA5ZDMQdg" id="(0.1958762886597938,0.5)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBpq3vcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBLwwvcIEeiCiOA5ZDMQdg" source="_zTt94PcHEeiCiOA5ZDMQdg" target="_SBkLQPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBpq4vcIEeiCiOA5ZDMQdg" type="6001">
@@ -1330,95 +1219,129 @@
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBpq3_cIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBpq4PcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="8"/>
<bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBpq4fcIEeiCiOA5ZDMQdg" points="[281, -13, -168, 7]$[367, -17, -82, 3]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBqR4vcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBqR4_cIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBqR4vcIEeiCiOA5ZDMQdg" id="(0.7655059520495319,0.35964912280701755)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBqR4_cIEeiCiOA5ZDMQdg" id="(2.15702479338843,0.40294117647058814)"/>
</edges>
<edges xmi:type="notation:Edge" xmi:id="_SBqR5PcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBddkPcIEeiCiOA5ZDMQdg" source="_SBlZZ_cIEeiCiOA5ZDMQdg" target="_SBlZYPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBq48PcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq48fcIEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq48fcIEeiCiOA5ZDMQdg" x="80" y="-10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBq48vcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq48_cIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq48_cIEeiCiOA5ZDMQdg" x="134" y="10"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBq49PcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq49fcIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq49fcIEeiCiOA5ZDMQdg" x="22" y="9"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBqR5fcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBqR5vcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBqR5_cIEeiCiOA5ZDMQdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBq49vcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBq49_cIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBqR5_cIEeiCiOA5ZDMQdg" points="[19, -3, -287, 40]$[238, -34, -68, 9]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBq49vcIEeiCiOA5ZDMQdg" id="(0.1958762886597938,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBq49_cIEeiCiOA5ZDMQdg" id="(0.37628865979381443,0.5)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_SBq4-PcIEeiCiOA5ZDMQdg" visible="false" type="4001" element="_SBeEoPcIEeiCiOA5ZDMQdg" source="_SBlZZ_cIEeiCiOA5ZDMQdg" target="_SBlZYPcIEeiCiOA5ZDMQdg">
+ <edges xmi:type="notation:Edge" xmi:id="_SBq4-PcIEeiCiOA5ZDMQdg" type="4001" element="_SBeEoPcIEeiCiOA5ZDMQdg" source="_SBlZZ_cIEeiCiOA5ZDMQdg" target="_SBlZYPcIEeiCiOA5ZDMQdg">
<children xmi:type="notation:Node" xmi:id="_SBq4_PcIEeiCiOA5ZDMQdg" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq4_fcIEeiCiOA5ZDMQdg" y="-10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq4_fcIEeiCiOA5ZDMQdg" x="-10" y="-28"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBq4_vcIEeiCiOA5ZDMQdg" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq4__cIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq4__cIEeiCiOA5ZDMQdg" x="-2" y="1"/>
</children>
<children xmi:type="notation:Node" xmi:id="_SBq5APcIEeiCiOA5ZDMQdg" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq5AfcIEeiCiOA5ZDMQdg" y="10"/>
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SBq5AfcIEeiCiOA5ZDMQdg" x="-6" y="3"/>
</children>
<styles xmi:type="notation:ConnectorStyle" xmi:id="_SBq4-fcIEeiCiOA5ZDMQdg"/>
<styles xmi:type="notation:FontStyle" xmi:id="_SBq4-vcIEeiCiOA5ZDMQdg" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBq4-_cIEeiCiOA5ZDMQdg" points="[0, 0, 0, 0]$[0, 0, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBsHEPcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBsuIPcIEeiCiOA5ZDMQdg" id="(0.5,0.5)"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SBq4-_cIEeiCiOA5ZDMQdg" points="[-1, -5, 3, 76]$[-3, -60, 1, 21]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SBsHEPcIEeiCiOA5ZDMQdg" id="(0.5360824742268041,0.12195121951219512)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_K7VAwBKFEemGUof1NBtbTQ" type="4001" element="_K5zWwBKFEemGUof1NBtbTQ" source="_K62foBKFEemGUof1NBtbTQ" target="_zUINkPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_K7WO4BKFEemGUof1NBtbTQ" type="6001">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7WO4RKFEemGUof1NBtbTQ" x="1"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_K7W18BKFEemGUof1NBtbTQ" type="6002">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7W18RKFEemGUof1NBtbTQ" x="11"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_K7XdABKFEemGUof1NBtbTQ" type="6003">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7XdARKFEemGUof1NBtbTQ" x="-2" y="-3"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_K7VAwRKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7VAwhKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="8"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K7VAwxKFEemGUof1NBtbTQ" points="[0, -3, 0, 30]$[0, -20, 0, 13]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7mGgBKFEemGUof1NBtbTQ" id="(0.1896551724137931,0.07317073170731707)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7mGgRKFEemGUof1NBtbTQ" id="(0.9774436090225563,0.9115646258503401)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_tnn1MA9aEemWZoTWtpdGMw" visible="false" type="4001" element="_tl3hsA9aEemWZoTWtpdGMw" source="_tnAxMA9aEemWZoTWtpdGMw" target="_SBlZZ_cIEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_tnpDUA9aEemWZoTWtpdGMw" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnpDUQ9aEemWZoTWtpdGMw" y="-10"/>
+ <edges xmi:type="notation:Edge" xmi:id="_K7mGghKFEemGUof1NBtbTQ" type="4001" element="_K50k4BKFEemGUof1NBtbTQ" source="_K7A3sBKFEemGUof1NBtbTQ" target="_zUINkPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_K7mtkBKFEemGUof1NBtbTQ" type="6001">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7mtkRKFEemGUof1NBtbTQ" x="25" y="-7"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tnpqYA9aEemWZoTWtpdGMw" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnpqYQ9aEemWZoTWtpdGMw" y="10"/>
+ <children xmi:type="notation:Node" xmi:id="_K7mtkhKFEemGUof1NBtbTQ" type="6002">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7mtkxKFEemGUof1NBtbTQ" x="-1" y="-4"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tnqRcA9aEemWZoTWtpdGMw" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tnqRcQ9aEemWZoTWtpdGMw" y="10"/>
+ <children xmi:type="notation:Node" xmi:id="_K7mtlBKFEemGUof1NBtbTQ" type="6003">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7mtlRKFEemGUof1NBtbTQ" x="13" y="-9"/>
</children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_tnn1MQ9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tnn1Mg9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tnn1Mw9aEemWZoTWtpdGMw" points="[0, 0, -1116, -60]$[1116, 60, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn468A9aEemWZoTWtpdGMw" id="(0.5,0.5)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn468Q9aEemWZoTWtpdGMw" id="(0.5,0.5)"/>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_K7mGgxKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7mGhBKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="8"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K7mGhRKFEemGUof1NBtbTQ" points="[3, -5, 0, 98]$[3, -70, 0, 33]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7nUoBKFEemGUof1NBtbTQ" id="(0.5254237288135594,0.12195121951219512)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7nUoRKFEemGUof1NBtbTQ" id="(0.7368421052631579,0.7755102040816326)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_tn468g9aEemWZoTWtpdGMw" type="4001" element="_tl5W4A9aEemWZoTWtpdGMw" source="_tnM-cA9aEemWZoTWtpdGMw" target="_IhtloPcIEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_tn5iAA9aEemWZoTWtpdGMw" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn5iAQ9aEemWZoTWtpdGMw" x="12" y="5"/>
+ <edges xmi:type="notation:Edge" xmi:id="_K7nUohKFEemGUof1NBtbTQ" type="4001" element="_K51L8BKFEemGUof1NBtbTQ" source="_K7BexBKFEemGUof1NBtbTQ" target="_SBlZZ_cIEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_K7nUphKFEemGUof1NBtbTQ" type="6001">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7nUpxKFEemGUof1NBtbTQ" x="4" y="-8"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tn5iAg9aEemWZoTWtpdGMw" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn5iAw9aEemWZoTWtpdGMw" x="-11" y="-6"/>
+ <children xmi:type="notation:Node" xmi:id="_K7nUqBKFEemGUof1NBtbTQ" type="6002">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7nUqRKFEemGUof1NBtbTQ" y="-12"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tn5iBA9aEemWZoTWtpdGMw" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn5iBQ9aEemWZoTWtpdGMw" x="-11" y="-6"/>
+ <children xmi:type="notation:Node" xmi:id="_K7nUqhKFEemGUof1NBtbTQ" type="6003">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7nUqxKFEemGUof1NBtbTQ" x="3" y="-5"/>
</children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_tn468w9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tn469A9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="8"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tn469Q9aEemWZoTWtpdGMw" points="[0, 0, 4, 157]$[-4, -157, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn6JEA9aEemWZoTWtpdGMw" id="(0.5020080321285141,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn6JEQ9aEemWZoTWtpdGMw" id="(0.5025906735751295,1.0)"/>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_K7nUoxKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7nUpBKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="8"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K7nUpRKFEemGUof1NBtbTQ" points="[0, -7, 0, 66]$[0, -52, 0, 21]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7n7sBKFEemGUof1NBtbTQ" id="(0.6839378238341969,0.1111111111111111)"/>
</edges>
- <edges xmi:type="notation:Edge" xmi:id="_tn6JEg9aEemWZoTWtpdGMw" type="4001" element="_tmwSgA9aEemWZoTWtpdGMw" source="_tnAxMA9aEemWZoTWtpdGMw" target="_zT_qsPcHEeiCiOA5ZDMQdg">
- <children xmi:type="notation:Node" xmi:id="_tn6JFg9aEemWZoTWtpdGMw" type="6001">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn6JFw9aEemWZoTWtpdGMw" x="5" y="-9"/>
+ <edges xmi:type="notation:Edge" xmi:id="_K7n7shKFEemGUof1NBtbTQ" type="4001" element="_K52aEBKFEemGUof1NBtbTQ" source="_K7CF1BKFEemGUof1NBtbTQ" target="_K7A3sBKFEemGUof1NBtbTQ">
+ <children xmi:type="notation:Node" xmi:id="_K7n7thKFEemGUof1NBtbTQ" type="6001">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7n7txKFEemGUof1NBtbTQ" x="1" y="-4"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tn6JGA9aEemWZoTWtpdGMw" type="6002">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn6JGQ9aEemWZoTWtpdGMw" x="-7" y="8"/>
+ <children xmi:type="notation:Node" xmi:id="_K7n7uBKFEemGUof1NBtbTQ" type="6002">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7n7uRKFEemGUof1NBtbTQ" x="4" y="-2"/>
</children>
- <children xmi:type="notation:Node" xmi:id="_tn6JGg9aEemWZoTWtpdGMw" type="6003">
- <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tn6JGw9aEemWZoTWtpdGMw" x="-6" y="7"/>
+ <children xmi:type="notation:Node" xmi:id="_K7oiwBKFEemGUof1NBtbTQ" type="6003">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K7oiwRKFEemGUof1NBtbTQ" x="2" y="-3"/>
</children>
- <styles xmi:type="notation:ConnectorStyle" xmi:id="_tn6JEw9aEemWZoTWtpdGMw"/>
- <styles xmi:type="notation:FontStyle" xmi:id="_tn6JFA9aEemWZoTWtpdGMw" fontName="Ubuntu" fontHeight="10" bold="true"/>
- <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_tn6JFQ9aEemWZoTWtpdGMw" points="[0, 0, -136, 65]$[136, -65, 0, 0]"/>
- <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn6wIA9aEemWZoTWtpdGMw" id="(0.5021834061135371,0.0)"/>
- <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_tn6wIQ9aEemWZoTWtpdGMw" id="(0.5047169811320755,1.0)"/>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_K7n7sxKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_K7n7tBKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="8"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_K7n7tRKFEemGUof1NBtbTQ" points="[4, -2, 0, 19]$[4, -21, 0, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7oiwhKFEemGUof1NBtbTQ" id="(0.45614035087719296,0.0425531914893617)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_K7oiwxKFEemGUof1NBtbTQ" id="(0.5084745762711864,1.0)"/>
+ </edges>
+ <edges xmi:type="notation:Edge" xmi:id="_lBnNIBKFEemGUof1NBtbTQ" type="4001" element="_lBf4YBKFEemGUof1NBtbTQ" source="_K7BexBKFEemGUof1NBtbTQ" target="_zT_qsPcHEeiCiOA5ZDMQdg">
+ <children xmi:type="notation:Node" xmi:id="_lBn0MBKFEemGUof1NBtbTQ" type="6001">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBn0MRKFEemGUof1NBtbTQ" x="-3" y="-38"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_lBn0MhKFEemGUof1NBtbTQ" type="6002">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBn0MxKFEemGUof1NBtbTQ" x="9" y="-5"/>
+ </children>
+ <children xmi:type="notation:Node" xmi:id="_lBn0NBKFEemGUof1NBtbTQ" type="6003">
+ <layoutConstraint xmi:type="notation:Bounds" xmi:id="_lBn0NRKFEemGUof1NBtbTQ" x="2" y="-6"/>
+ </children>
+ <styles xmi:type="notation:ConnectorStyle" xmi:id="_lBnNIRKFEemGUof1NBtbTQ"/>
+ <styles xmi:type="notation:FontStyle" xmi:id="_lBnNIhKFEemGUof1NBtbTQ" fontName="Ubuntu" fontHeight="10" bold="true"/>
+ <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_lBnNIxKFEemGUof1NBtbTQ" points="[-96, 0, 69, 0]$[-107, 0, 58, 0]"/>
+ <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBn0NhKFEemGUof1NBtbTQ" id="(0.5,0.5)"/>
+ <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_lBn0NxKFEemGUof1NBtbTQ" id="(0.5206611570247934,0.5)"/>
</edges>
</data>
</ownedAnnotationEntries>
<ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_zRw2FPcHEeiCiOA5ZDMQdg" name="platform" outgoingEdges="_SBLwwvcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Extension" href="http://schemas.modmacao.org/occi/platform#/"/>
<semanticElements xmi:type="occi:Extension" href="http://schemas.modmacao.org/occi/platform#/"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
<ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_zRw2FfcHEeiCiOA5ZDMQdg" labelSize="12" borderSize="1" borderSizeComputationExpression="1" foregroundColor="214,214,214">
+ <customFeatures>labelAlignment</customFeatures>
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='ImportContainer']/@style"/>
</ownedStyle>
@@ -1434,18 +1357,20 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2GPcHEeiCiOA5ZDMQdg" name="occi.app.name: null">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2GPcHEeiCiOA5ZDMQdg" name="occi.app.name: null" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.0"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.0"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_r7YhUBKFEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_zRw2GfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>bold</labelFormat>
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.3/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2GvcHEeiCiOA5ZDMQdg" name="occi.app.context: URL">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2GvcHEeiCiOA5ZDMQdg" name="occi.app.context: URL" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.1"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.1"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_rz29ABKFEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_zRw2G_cHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>italic</labelFormat>
<labelFormat>bold</labelFormat>
@@ -1453,9 +1378,10 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2HPcHEeiCiOA5ZDMQdg" name="occi.app.url: URL">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2HPcHEeiCiOA5ZDMQdg" name="occi.app.url: URL" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.2"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.2"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_rsqv4BKFEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_zRw2HfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>italic</labelFormat>
<labelFormat>bold</labelFormat>
@@ -1473,9 +1399,10 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2IPcHEeiCiOA5ZDMQdg" name="occi.app.state.message: null">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2IPcHEeiCiOA5ZDMQdg" name="occi.app.state.message: null" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.4"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='application']/@attributes.4"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_suFwoBKFEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_zRw2IfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>italic</labelFormat>
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.0/@style"/>
@@ -1523,7 +1450,7 @@
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAction']"/>
</ownedElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRw2LPcHEeiCiOA5ZDMQdg" name="Component" outgoingEdges="_zRxdifcHEeiCiOA5ZDMQdg _SBLJtvcIEeiCiOA5ZDMQdg" incomingEdges="_zRxda_cHEeiCiOA5ZDMQdg _zRxdcfcHEeiCiOA5ZDMQdg _zRxdd_cHEeiCiOA5ZDMQdg _zRxdevcHEeiCiOA5ZDMQdg _zRxd4PcHEeiCiOA5ZDMQdg _HDKkAPcIEeiCiOA5ZDMQdg _Ihlp0PcIEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRw2LPcHEeiCiOA5ZDMQdg" name="Component" outgoingEdges="_zRxdifcHEeiCiOA5ZDMQdg _SBLJtvcIEeiCiOA5ZDMQdg" incomingEdges="_zRxda_cHEeiCiOA5ZDMQdg _zRxdcfcHEeiCiOA5ZDMQdg _zRxdd_cHEeiCiOA5ZDMQdg _zRxdevcHEeiCiOA5ZDMQdg _zRxd4PcHEeiCiOA5ZDMQdg _K5zWwBKFEemGUof1NBtbTQ _K50k4BKFEemGUof1NBtbTQ">
<target xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<semanticElements xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1544,9 +1471,10 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2MPcHEeiCiOA5ZDMQdg" name="occi.component.state.message: null">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2MPcHEeiCiOA5ZDMQdg" name="occi.component.state.message: null" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']/@attributes.1"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']/@attributes.1"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_rY1N4BKFEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_zRw2MfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>italic</labelFormat>
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.0/@style"/>
@@ -1594,10 +1522,12 @@
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAction']"/>
</ownedElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRw2PPcHEeiCiOA5ZDMQdg" name="ComponentLink" visible="false" outgoingEdges="_zRxd4PcHEeiCiOA5ZDMQdg _SBLJufcIEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRw2PPcHEeiCiOA5ZDMQdg" name="ComponentLink" outgoingEdges="_zRxd4PcHEeiCiOA5ZDMQdg _SBLJufcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<semanticElements xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
- <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_2ZRZkPcHEeiCiOA5ZDMQdg"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
<ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_zRw2PfcHEeiCiOA5ZDMQdg" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
@@ -1742,7 +1672,7 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='EObjectTypeContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='EObjectTypeContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2XPcHEeiCiOA5ZDMQdg" name="java.net.URL" visible="false" tooltipText="org.eclipse.cmf.occi.core.impl.EObjectTypeImpl@3e42c7c6 (name: URL, documentation: null) (instanceClassName: java.net.URL)">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRw2XPcHEeiCiOA5ZDMQdg" name="java.net.URL" visible="false" tooltipText="org.eclipse.cmf.occi.core.impl.EObjectTypeImpl@3bb4ade3 (name: URL, documentation: null) (instanceClassName: java.net.URL)">
<target xmi:type="occi:EObjectType" href="http://schemas.modmacao.org/occi/platform#//@types.0"/>
<semanticElements xmi:type="occi:EObjectType" href="http://schemas.modmacao.org/occi/platform#//@types.0"/>
<ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zRw2XfcHEeiCiOA5ZDMQdg" labelSize="10" showIcon="false">
@@ -1761,7 +1691,7 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='EObjectTypeContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='EObjectTypeContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdIvcHEeiCiOA5ZDMQdg" name="java.net.URI" visible="false" tooltipText="org.eclipse.cmf.occi.core.impl.EObjectTypeImpl@5dcb4826 (name: URI, documentation: null) (instanceClassName: java.net.URI)">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdIvcHEeiCiOA5ZDMQdg" name="java.net.URI" visible="false" tooltipText="org.eclipse.cmf.occi.core.impl.EObjectTypeImpl@24e04318 (name: URI, documentation: null) (instanceClassName: java.net.URI)">
<target xmi:type="occi:EObjectType" href="http://schemas.modmacao.org/occi/platform#//@types.1"/>
<semanticElements xmi:type="occi:EObjectType" href="http://schemas.modmacao.org/occi/platform#//@types.1"/>
<ownedStyle xmi:type="diagram:BundledImage" xmi:id="_zRxdI_cHEeiCiOA5ZDMQdg" labelSize="10" showIcon="false">
@@ -1912,7 +1842,7 @@
</ownedDiagramElements>
</ownedDiagramElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRxdRPcHEeiCiOA5ZDMQdg" name="Sensor" outgoingEdges="__q-OcPcHEeiCiOA5ZDMQdg" incomingEdges="_tmwSgA9aEemWZoTWtpdGMw">
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRxdRPcHEeiCiOA5ZDMQdg" name="Sensor" outgoingEdges="__q-OcPcHEeiCiOA5ZDMQdg" incomingEdges="_lBf4YBKFEemGUof1NBtbTQ">
<target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='sensor']"/>
<semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='sensor']"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
@@ -1923,55 +1853,6 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdRvcHEeiCiOA5ZDMQdg" name="occi.sensor.timebase: DateTime">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdR_cHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdSPcHEeiCiOA5ZDMQdg" name="occi.sensor.timestart: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.1"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.1"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdSfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdSvcHEeiCiOA5ZDMQdg" name="occi.sensor.timestop: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.2"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.2"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdS_cHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdTPcHEeiCiOA5ZDMQdg" name="occi.sensor.period: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.3"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.3"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdTfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.3/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdTvcHEeiCiOA5ZDMQdg" name="occi.sensor.granularity: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.4"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.4"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdT_cHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdUPcHEeiCiOA5ZDMQdg" name="occi.sensor.accuracy: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.5"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='sensor']/@attributes.5"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdUfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_zRxdUvcHEeiCiOA5ZDMQdg" name="DataGatherer" outgoingEdges="_zRxda_cHEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='datagatherer']"/>
@@ -1984,31 +1865,6 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdVPcHEeiCiOA5ZDMQdg" name="occi.collector.period: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdVfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.3/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdVvcHEeiCiOA5ZDMQdg" name="occi.collector.granularity: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.1"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.1"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdV_cHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_zRxdWPcHEeiCiOA5ZDMQdg" name="occi.collector.accuracy: Second">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.2"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='datagatherer']/@attributes.2"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_zRxdWfcHEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zRxda_cHEeiCiOA5ZDMQdg" sourceNode="_zRxdUvcHEeiCiOA5ZDMQdg" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='datagatherer']"/>
@@ -2382,7 +2238,7 @@
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='FinalStateEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zRxd4PcHEeiCiOA5ZDMQdg" name="target" visible="false" sourceNode="_zRw2PPcHEeiCiOA5ZDMQdg" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_zRxd4PcHEeiCiOA5ZDMQdg" name="target" sourceNode="_zRw2PPcHEeiCiOA5ZDMQdg" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_zRxd4fcHEeiCiOA5ZDMQdg" size="2" strokeColor="0,0,0">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='TargetEdge']/@style"/>
@@ -2400,63 +2256,6 @@
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_CqlaMPcIEeiCiOA5ZDMQdg" name="Processor" outgoingEdges="_HDKkAPcIEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='processor']"/>
- <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='processor']"/>
- <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
- <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
- <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_CqmBQPcIEeiCiOA5ZDMQdg" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlZAkA9aEemWZoTWtpdGMw" name="gatherer.address: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='processor']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='processor']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlaOsA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- </ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_HDKkAPcIEeiCiOA5ZDMQdg" sourceNode="_CqlaMPcIEeiCiOA5ZDMQdg" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='processor']"/>
- <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_HDKkAfcIEeiCiOA5ZDMQdg" targetArrow="InputClosedArrow" size="2">
- <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
- <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_HDKkAvcIEeiCiOA5ZDMQdg"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
- </ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_IhgKQPcIEeiCiOA5ZDMQdg" name="Publisher" outgoingEdges="_Ihlp0PcIEeiCiOA5ZDMQdg" incomingEdges="_tl5W4A9aEemWZoTWtpdGMw">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='publisher']"/>
- <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='publisher']"/>
- <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
- <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
- <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_IhgxUPcIEeiCiOA5ZDMQdg" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tla1wA9aEemWZoTWtpdGMw" name="publisher.endpoint: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='publisher']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='publisher']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlcD4A9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.3/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
- </ownedElements>
- </ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_Ihlp0PcIEeiCiOA5ZDMQdg" sourceNode="_IhgKQPcIEeiCiOA5ZDMQdg" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='publisher']"/>
- <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_IhmQ4PcIEeiCiOA5ZDMQdg" targetArrow="InputClosedArrow" size="2">
- <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
- <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_IhmQ4fcIEeiCiOA5ZDMQdg"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
- </ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DNodeContainer" xmi:id="_SAU1IPcIEeiCiOA5ZDMQdg" name="core" incomingEdges="_SBLwwvcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Extension" href="http://schemas.ogf.org/occi/core#/"/>
<semanticElements xmi:type="occi:Extension" href="http://schemas.ogf.org/occi/core#/"/>
@@ -2468,9 +2267,10 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='ImportContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='ImportContainer']"/>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_SAWqUPcIEeiCiOA5ZDMQdg" name="Entity" incomingEdges="_SBKioPcIEeiCiOA5ZDMQdg _SBLJsPcIEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_SAWqUPcIEeiCiOA5ZDMQdg" name="Entity" visible="false" incomingEdges="_SBKioPcIEeiCiOA5ZDMQdg _SBLJsPcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']"/>
<semanticElements xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_YVPLsBKGEemGUof1NBtbTQ"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
@@ -2479,7 +2279,7 @@
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAXRYvcIEeiCiOA5ZDMQdg" name="occi.core.id">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAXRYvcIEeiCiOA5ZDMQdg" name="occi.core.id" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']/@attributes.0"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']/@attributes.0"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_SAl64PcIEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
@@ -2489,7 +2289,7 @@
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAl64fcIEeiCiOA5ZDMQdg" name="occi.core.title">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAl64fcIEeiCiOA5ZDMQdg" name="occi.core.title" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']/@attributes.1"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='entity']/@attributes.1"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_SAsBgPcIEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
@@ -2501,24 +2301,30 @@
<ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_SAWqUvcIEeiCiOA5ZDMQdg" name="Resource" outgoingEdges="_SBKioPcIEeiCiOA5ZDMQdg" incomingEdges="_SBLJs_cIEeiCiOA5ZDMQdg _SBLJtvcIEeiCiOA5ZDMQdg _SBddkPcIEeiCiOA5ZDMQdg _SBeEoPcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
<semanticElements xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
<ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_SAWqU_cIEeiCiOA5ZDMQdg" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAsBgfcIEeiCiOA5ZDMQdg" name="occi.core.summary">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_SAsBgfcIEeiCiOA5ZDMQdg" name="occi.core.summary" visible="false">
<target xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']/@attributes.0"/>
<semanticElements xmi:type="occi:Attribute" href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']/@attributes.0"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_8ZxJ4BKGEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:Square" xmi:id="_SAsokPcIEeiCiOA5ZDMQdg" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_SAXRYPcIEeiCiOA5ZDMQdg" name="Link" visible="false" outgoingEdges="_SBLJsPcIEeiCiOA5ZDMQdg _SBddkPcIEeiCiOA5ZDMQdg _SBeEoPcIEeiCiOA5ZDMQdg" incomingEdges="_SBLJufcIEeiCiOA5ZDMQdg _tl3hsA9aEemWZoTWtpdGMw">
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_SAXRYPcIEeiCiOA5ZDMQdg" name="Link" outgoingEdges="_SBLJsPcIEeiCiOA5ZDMQdg _SBddkPcIEeiCiOA5ZDMQdg _SBeEoPcIEeiCiOA5ZDMQdg" incomingEdges="_SBLJufcIEeiCiOA5ZDMQdg _K51L8BKFEemGUof1NBtbTQ">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
<semanticElements xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
- <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_Uj0FkPcIEeiCiOA5ZDMQdg"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
<ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_SAXRYfcIEeiCiOA5ZDMQdg" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
@@ -2526,7 +2332,7 @@
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
</ownedDiagramElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBKioPcIEeiCiOA5ZDMQdg" sourceNode="_SAWqUvcIEeiCiOA5ZDMQdg" targetNode="_SAWqUPcIEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBKioPcIEeiCiOA5ZDMQdg" visible="false" sourceNode="_SAWqUvcIEeiCiOA5ZDMQdg" targetNode="_SAWqUPcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='resource']"/>
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SBKiofcIEeiCiOA5ZDMQdg" targetArrow="InputClosedArrow" size="2">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
@@ -2562,6 +2368,7 @@
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBLJufcIEeiCiOA5ZDMQdg" visible="false" sourceNode="_zRw2PPcHEeiCiOA5ZDMQdg" targetNode="_SAXRYPcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_CwlZQBS8Eemw75qyqfsYQw"/>
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SBLwwPcIEeiCiOA5ZDMQdg" targetArrow="InputClosedArrow" size="2">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_SBLwwfcIEeiCiOA5ZDMQdg"/>
@@ -2579,6 +2386,7 @@
</ownedDiagramElements>
<ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBddkPcIEeiCiOA5ZDMQdg" name="source" visible="false" sourceNode="_SAXRYPcIEeiCiOA5ZDMQdg" targetNode="_SAWqUvcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="_VPvaYBKGEemGUof1NBtbTQ"/>
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SBddkfcIEeiCiOA5ZDMQdg" size="2" strokeColor="0,0,0">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='SourceEdge']/@style"/>
<centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_SBddkvcIEeiCiOA5ZDMQdg" labelSize="10" showIcon="false">
@@ -2587,7 +2395,7 @@
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='SourceEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBeEoPcIEeiCiOA5ZDMQdg" name="target" visible="false" sourceNode="_SAXRYPcIEeiCiOA5ZDMQdg" targetNode="_SAWqUvcIEeiCiOA5ZDMQdg">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_SBeEoPcIEeiCiOA5ZDMQdg" name="target" sourceNode="_SAXRYPcIEeiCiOA5ZDMQdg" targetNode="_SAWqUvcIEeiCiOA5ZDMQdg">
<target xmi:type="occi:Kind" href="http://schemas.ogf.org/occi/core#//@kinds[term='link']"/>
<ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_SBersPcIEeiCiOA5ZDMQdg" size="2" strokeColor="0,0,0">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='TargetEdge']/@style"/>
@@ -2597,155 +2405,141 @@
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='TargetEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tlIh4A9aEemWZoTWtpdGMw" name="MonitoringProperty" outgoingEdges="_tl3hsA9aEemWZoTWtpdGMw _tmwSgA9aEemWZoTWtpdGMw">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitoringproperty']"/>
- <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitoringproperty']"/>
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tlpfQA9aEemWZoTWtpdGMw" name="String" visible="false">
+ <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
+ <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
+ <graphicalFilters xmi:type="diagram:HideFilter" xmi:id="__tA4wBKFEemGUof1NBtbTQ"/>
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tlqGUA9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,250,191">
+ <labelFormat>bold</labelFormat>
+ <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']"/>
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlqtYg9aEemWZoTWtpdGMw" name="java.lang.String" visible="false" tooltipText="org.eclipse.cmf.occi.core.impl.StringTypeImpl@67c4c009 (name: String, documentation: null) (pattern: null, length: <unset>, minLength: <unset>, maxLength: <unset>)">
+ <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
+ <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
+ <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_tlr7gA9aEemWZoTWtpdGMw" labelSize="10" showIcon="false">
+ <labelFormat>italic</labelFormat>
+ <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']"/>
+ </ownedElements>
+ </ownedDiagramElements>
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_K5Ng4BKFEemGUof1NBtbTQ" name="DataProcessor" outgoingEdges="_K5zWwBKFEemGUof1NBtbTQ">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='dataprocessor']"/>
+ <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='dataprocessor']"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_K5OH8BKFEemGUof1NBtbTQ" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
+ <labelFormat>bold</labelFormat>
+ <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
+ </ownedDiagramElements>
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_K5OvABKFEemGUof1NBtbTQ" name="ResultProvider" outgoingEdges="_K50k4BKFEemGUof1NBtbTQ" incomingEdges="_K52aEBKFEemGUof1NBtbTQ">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='resultprovider']"/>
+ <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='resultprovider']"/>
+ <arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
+ <arrangeConstraints>KEEP_SIZE</arrangeConstraints>
+ <arrangeConstraints>KEEP_RATIO</arrangeConstraints>
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_K5PWEBKFEemGUof1NBtbTQ" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
+ <labelFormat>bold</labelFormat>
+ <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
+ </ownedStyle>
+ <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
+ </ownedDiagramElements>
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_K5PWERKFEemGUof1NBtbTQ" name="MonitorableProperty" outgoingEdges="_K51L8BKFEemGUof1NBtbTQ _lBf4YBKFEemGUof1NBtbTQ">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitorableproperty']"/>
+ <semanticElements xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitorableproperty']"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tlJI8A9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_K5PWEhKFEemGUof1NBtbTQ" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,47,0" backgroundStyle="GradientTopToBottom" backgroundColor="187,242,196" foregroundColor="255,255,255">
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlK-IA9aEemWZoTWtpdGMw" name="monitoring.property.name: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitoringproperty']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitoringproperty']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlMMQA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_K5QkMBKFEemGUof1NBtbTQ" name="monitoring.property: String">
+ <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitorableproperty']/@attributes.0"/>
+ <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitorableproperty']/@attributes.0"/>
+ <ownedStyle xmi:type="diagram:Square" xmi:id="_K5RLQBKFEemGUof1NBtbTQ" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>italic</labelFormat>
<labelFormat>bold</labelFormat>
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.1/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlMzUA9aEemWZoTWtpdGMw" name="monitoring.property.value: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitoringproperty']/@attributes.1"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitoringproperty']/@attributes.1"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlOogA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_K5RyUBKFEemGUof1NBtbTQ" name="monitoring.result: String">
+ <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitorableproperty']/@attributes.1"/>
+ <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@kinds[term='monitorableproperty']/@attributes.1"/>
+ <ownedStyle xmi:type="diagram:Square" xmi:id="_K5TAcBKFEemGUof1NBtbTQ" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']/@conditionnalStyles.2/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='KindContainer']/@subNodeMappings[name='KindAttribute']"/>
</ownedElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tld5EA9aEemWZoTWtpdGMw" name="MartPublisher" outgoingEdges="_tl5W4A9aEemWZoTWtpdGMw">
- <target xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='martpublisher']"/>
- <semanticElements xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='martpublisher']"/>
+ <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_K5VcsBKFEemGUof1NBtbTQ" name="OCCIResultProvider" outgoingEdges="_K52aEBKFEemGUof1NBtbTQ">
+ <target xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='occiresultprovider']"/>
+ <semanticElements xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='occiresultprovider']"/>
<arrangeConstraints>KEEP_LOCATION</arrangeConstraints>
<arrangeConstraints>KEEP_SIZE</arrangeConstraints>
<arrangeConstraints>KEEP_RATIO</arrangeConstraints>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tld5EQ9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,37,74" backgroundStyle="GradientTopToBottom" backgroundColor="187,221,255" foregroundColor="255,255,255">
+ <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_K5VcsRKFEemGUof1NBtbTQ" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" borderColor="0,37,74" backgroundStyle="GradientTopToBottom" backgroundColor="187,221,255" foregroundColor="255,255,255">
<labelFormat>bold</labelFormat>
<description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlegIA9aEemWZoTWtpdGMw" name="monitoring.property.name: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.0"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.0"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlfHMA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <labelFormat>italic</labelFormat>
+ <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_K5WDwBKFEemGUof1NBtbTQ" name="result.provider.endpoint: String">
+ <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='occiresultprovider']/@attributes.0"/>
+ <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='occiresultprovider']/@attributes.0"/>
+ <ownedStyle xmi:type="diagram:Square" xmi:id="_K5plwBKFEemGUof1NBtbTQ" labelSize="10" labelAlignment="LEFT" labelPosition="node">
<labelFormat>bold</labelFormat>
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']/@conditionnalStyles.1/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlfuQA9aEemWZoTWtpdGMw" name="monitoring.property.id: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.1"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.1"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlnqEA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']/@conditionnalStyles.2/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']"/>
- </ownedElements>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tloRIA9aEemWZoTWtpdGMw" name="monitoring.property.resource: String">
- <target xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.2"/>
- <semanticElements xmi:type="occi:Attribute" href="model/monitoring.occie#//@mixins[term='martpublisher']/@attributes.2"/>
- <ownedStyle xmi:type="diagram:Square" xmi:id="_tlo4MA9aEemWZoTWtpdGMw" labelSize="10" labelAlignment="LEFT" labelPosition="node">
- <labelFormat>italic</labelFormat>
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']/@conditionnalStyles.1/@style"/>
+ <description xmi:type="style:SquareDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']/@conditionnalStyles.3/@style"/>
</ownedStyle>
<actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='MixinContainer']/@subNodeMappings[name='MixinAttribute']"/>
</ownedElements>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tlpfQA9aEemWZoTWtpdGMw" name="DateTime">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tlqGUA9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,250,191">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlqtYg9aEemWZoTWtpdGMw" name="java.lang.String" tooltipText="org.eclipse.cmf.occi.core.impl.StringTypeImpl@5fadbc46 (name: DateTime, documentation: null) (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))?)?)?)$, length: <unset>, minLength: <unset>, maxLength: <unset>)">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.0"/>
- <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_tlr7gA9aEemWZoTWtpdGMw" labelSize="10" showIcon="false">
- <labelFormat>italic</labelFormat>
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']"/>
- </ownedElements>
- </ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tlqGUQ9aEemWZoTWtpdGMw" name="Second">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.1"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.1"/>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tlqGUg9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,250,191">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@style"/>
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_K5zWwBKFEemGUof1NBtbTQ" sourceNode="_K5Ng4BKFEemGUof1NBtbTQ" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='dataprocessor']"/>
+ <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_K5z90BKFEemGUof1NBtbTQ" targetArrow="InputClosedArrow" size="2">
+ <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
+ <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_K5z90RKFEemGUof1NBtbTQ"/>
</ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tlsikA9aEemWZoTWtpdGMw" name="java.lang.String" tooltipText="org.eclipse.cmf.occi.core.impl.StringTypeImpl@78fe3714 (name: Second, documentation: null) (pattern: null, length: <unset>, minLength: <unset>, maxLength: <unset>)">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.1"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.1"/>
- <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_tlsikQ9aEemWZoTWtpdGMw" labelSize="10" showIcon="false">
- <labelFormat>italic</labelFormat>
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']"/>
- </ownedElements>
+ <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DNodeList" xmi:id="_tlqtYA9aEemWZoTWtpdGMw" name="String">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.2"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.2"/>
- <ownedStyle xmi:type="diagram:FlatContainerStyle" xmi:id="_tlqtYQ9aEemWZoTWtpdGMw" labelSize="12" showIcon="false" borderSize="1" borderSizeComputationExpression="1" backgroundStyle="Liquid" foregroundColor="255,250,191">
- <labelFormat>bold</labelFormat>
- <description xmi:type="style:FlatContainerStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@style"/>
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_K50k4BKFEemGUof1NBtbTQ" sourceNode="_K5OvABKFEemGUof1NBtbTQ" targetNode="_zRw2LPcHEeiCiOA5ZDMQdg">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='resultprovider']"/>
+ <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_K50k4RKFEemGUof1NBtbTQ" targetArrow="InputClosedArrow" size="2">
+ <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
+ <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_K50k4hKFEemGUof1NBtbTQ"/>
</ownedStyle>
- <actualMapping xmi:type="description_1:ContainerMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']"/>
- <ownedElements xmi:type="diagram:DNodeListElement" xmi:id="_tltJoA9aEemWZoTWtpdGMw" name="java.lang.String" tooltipText="org.eclipse.cmf.occi.core.impl.StringTypeImpl@4bf44bcd (name: String, documentation: null) (pattern: null, length: <unset>, minLength: <unset>, maxLength: <unset>)">
- <target xmi:type="occi:StringType" href="model/monitoring.occie#//@types.2"/>
- <semanticElements xmi:type="occi:StringType" href="model/monitoring.occie#//@types.2"/>
- <ownedStyle xmi:type="diagram:BundledImage" xmi:id="_tltJoQ9aEemWZoTWtpdGMw" labelSize="10" showIcon="false">
- <labelFormat>italic</labelFormat>
- <description xmi:type="style:BundledImageDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']/@style"/>
- </ownedStyle>
- <actualMapping xmi:type="description_1:NodeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@containerMappings[name='StringTypeContainer']/@subNodeMappings[name='EC_StringType_Type']"/>
- </ownedElements>
+ <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_tl3hsA9aEemWZoTWtpdGMw" visible="false" sourceNode="_tlIh4A9aEemWZoTWtpdGMw" targetNode="_SAXRYPcIEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitoringproperty']"/>
- <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_tl4IwA9aEemWZoTWtpdGMw" targetArrow="InputClosedArrow" size="2">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_K51L8BKFEemGUof1NBtbTQ" sourceNode="_K5PWERKFEemGUof1NBtbTQ" targetNode="_SAXRYPcIEeiCiOA5ZDMQdg">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitorableproperty']"/>
+ <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_K51L8RKFEemGUof1NBtbTQ" targetArrow="InputClosedArrow" size="2">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']/@style"/>
- <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_tl4IwQ9aEemWZoTWtpdGMw"/>
+ <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_K51L8hKFEemGUof1NBtbTQ"/>
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='ParentEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_tl5W4A9aEemWZoTWtpdGMw" sourceNode="_tld5EA9aEemWZoTWtpdGMw" targetNode="_IhgKQPcIEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='martpublisher']"/>
- <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_tl598A9aEemWZoTWtpdGMw" lineStyle="dash" size="2">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_K52aEBKFEemGUof1NBtbTQ" sourceNode="_K5VcsBKFEemGUof1NBtbTQ" targetNode="_K5OvABKFEemGUof1NBtbTQ">
+ <target xmi:type="occi:Mixin" href="model/monitoring.occie#//@mixins[term='occiresultprovider']"/>
+ <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_K53BIBKFEemGUof1NBtbTQ" lineStyle="dash" size="2">
<description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='AppliesEdge']/@style"/>
- <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_tl598Q9aEemWZoTWtpdGMw"/>
+ <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_K53BIRKFEemGUof1NBtbTQ"/>
</ownedStyle>
<actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='AppliesEdge']"/>
</ownedDiagramElements>
- <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_tmwSgA9aEemWZoTWtpdGMw" name="target" sourceNode="_tlIh4A9aEemWZoTWtpdGMw" targetNode="_zRxdRPcHEeiCiOA5ZDMQdg">
- <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitoringproperty']"/>
- <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_tmwSgQ9aEemWZoTWtpdGMw" size="2" strokeColor="0,0,0">
- <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='TargetEdge']/@style"/>
- <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_tmwSgg9aEemWZoTWtpdGMw" labelSize="10" showIcon="false">
+ <ownedDiagramElements xmi:type="diagram:DEdge" xmi:id="_lBf4YBKFEemGUof1NBtbTQ" name="source" sourceNode="_K5PWERKFEemGUof1NBtbTQ" targetNode="_zRxdRPcHEeiCiOA5ZDMQdg">
+ <target xmi:type="occi:Kind" href="model/monitoring.occie#//@kinds[term='monitorableproperty']"/>
+ <ownedStyle xmi:type="diagram:EdgeStyle" xmi:id="_lBf4YRKFEemGUof1NBtbTQ" size="2" strokeColor="0,0,0">
+ <description xmi:type="style:EdgeStyleDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='SourceEdge']/@style"/>
+ <centerLabelStyle xmi:type="diagram:CenterLabelStyle" xmi:id="_lBgfcBKFEemGUof1NBtbTQ" labelSize="10" showIcon="false">
<labelFormat>bold</labelFormat>
</centerLabelStyle>
</ownedStyle>
- <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='TargetEdge']"/>
+ <actualMapping xmi:type="description_1:EdgeMapping" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']/@defaultLayer/@edgeMappings[name='SourceEdge']"/>
</ownedDiagramElements>
<description xmi:type="description_1:DiagramDescription" href="platform:/plugin/org.eclipse.cmf.occi.core.design/description/OCCIware.odesign#//@ownedViewpoints[name='OCCI%20Extension']/@ownedRepresentations[name='Extension%20diagram']"/>
<filterVariableHistory xmi:type="diagram:FilterVariableHistory" xmi:id="_zRxd4_cHEeiCiOA5ZDMQdg"/>
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/AbsScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/AbsScaler.java
new file mode 100644
index 0000000000000000000000000000000000000000..c3aa315cc288b53571c14f036ca283cb709c5b19
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/AbsScaler.java
@@ -0,0 +1,34 @@
+package de.ugoe.cs.rwm.mocci;
+
+import java.nio.file.Path;
+
+import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
+import org.eclipse.cmf.occi.infrastructure.impl.InfrastructureFactoryImpl;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.modmacao.occi.platform.impl.PlatformFactoryImpl;
+import org.modmacao.placement.impl.PlacementFactoryImpl;
+
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import monitoring.impl.MonitoringFactoryImpl;
+
+public abstract class AbsScaler {
+ protected InfrastructureFactoryImpl iFactory = new InfrastructureFactoryImpl();
+ protected OCCIFactoryImpl factory = new OCCIFactoryImpl();
+ protected MonitoringFactoryImpl mFactory = new MonitoringFactoryImpl();
+ protected PlatformFactoryImpl pFactory = new PlatformFactoryImpl();
+ protected PlacementFactoryImpl placeFactory = new PlacementFactoryImpl();
+ protected Resource runtimeModel;
+ protected Connector conn;
+ protected Path runtimePath;
+
+
+ protected org.eclipse.cmf.occi.core.Resource getResourceById(EList<org.eclipse.cmf.occi.core.Resource> eList, String string) {
+ for(org.eclipse.cmf.occi.core.Resource res: eList ) {
+ if(res.getId().equals(string)) {
+ return res;
+ }
+ }
+ return null;
+ }
+}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
new file mode 100644
index 0000000000000000000000000000000000000000..34db99974850f03e71376162f6a0b343298437ef
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/DownScaler.java
@@ -0,0 +1,91 @@
+package de.ugoe.cs.rwm.mocci;
+
+import java.nio.file.Path;
+
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.modmacao.occi.platform.Component;
+
+import de.ugoe.cs.rwm.docci.ModelUtility;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import monitoring.Monitorableproperty;
+
+public class DownScaler extends AbsScaler {
+
+ public DownScaler(Connector conn, Path runtimePath) {
+ this.conn = conn;
+ this.runtimePath = runtimePath;
+ }
+
+ public Resource downScaleNodes() {
+ EList<EObject> toDelete = new BasicEList<EObject>();
+ runtimeModel = ModelUtility.loadOCCIintoEMFResource(conn.loadRuntimeModel(runtimePath));
+ Configuration config = ((Configuration) runtimeModel.getContents().get(0));
+ boolean downScale = false;
+
+ for(org.eclipse.cmf.occi.core.Resource res : config.getResources()) {
+ if(res instanceof Compute) {
+ Compute comp = (Compute) res;
+ if(comp.getTitle().contains("hadoop-worker-additional")) {
+ Monitorableproperty monProp = getAttachedCPUMonProp(comp);
+ if(monProp != null && monProp.getMonitoringResult() != null) {
+ if(monProp.getMonitoringResult().equals("None")) {
+ System.out.println(" VM with None CPU utilization found: " + comp.getId());
+ toDelete.add(comp);
+ toDelete.addAll(linksAndComponents(comp));
+ System.out.println(" Deleting Entities Around: " + comp.getTitle() +" ("+comp.getId()+")");
+ downScale = true;
+ break;
+ }
+ }
+ }
+ }
+ }
+
+ if(downScale == false) {
+ System.out.println(" Every Compute busy/Only one worker! Skipping downScale!");
+ }
+
+ runtimeModel.getContents().removeAll(toDelete);
+ return runtimeModel;
+
+ }
+
+ private Monitorableproperty getAttachedCPUMonProp(Compute comp) {
+ for(Link link: comp.getRlinks()) {
+ //System.out.println("LINK: " + link);
+ if(link instanceof Monitorableproperty) {
+ Monitorableproperty monProp = (Monitorableproperty) link;
+ //System.out.println("MonPROP: " + monProp);
+ //System.out.println("Prop: " + monProp.getMonitoringProperty());
+ if(monProp.getMonitoringProperty().equals("CPU")) {
+ return monProp;
+ }
+ }
+ }
+ return null;
+ }
+
+ private EList<EObject> linksAndComponents(Compute comp) {
+ EList<EObject> toDelete = new BasicEList<EObject>();
+ toDelete.addAll(comp.getLinks());
+ toDelete.addAll(comp.getRlinks());
+
+ for(Link link: comp.getRlinks()) {
+ if(link.getSource() instanceof Component) {
+ toDelete.add(link.getSource());
+ }
+ if(link instanceof Monitorableproperty) {
+ toDelete.add(link.getSource());
+ }
+ }
+
+ return toDelete;
+ }
+
+}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/ExampleClass.java b/src/main/java/de/ugoe/cs/rwm/mocci/ExampleClass.java
deleted file mode 100644
index 9f6dbd4dc9e3a5be09569e965d272faacc94892c..0000000000000000000000000000000000000000
--- a/src/main/java/de/ugoe/cs/rwm/mocci/ExampleClass.java
+++ /dev/null
@@ -1,17 +0,0 @@
-package de.ugoe.cs.rwm.mocci;
-
-/**Making javadoc happy.
- * @author erbel
- *
- */
-public class ExampleClass {
-
- /**Making javadoc happy.
- * @param args Making javadoc happy.
- */
- public static void main(String[] args) {
- System.out.println("Hello world");
-
- }
-
-}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
new file mode 100644
index 0000000000000000000000000000000000000000..c66df9e40be4498d9eb772b66dc47082a8950207
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/MAPE.java
@@ -0,0 +1,193 @@
+package de.ugoe.cs.rwm.mocci;
+
+import java.nio.file.Path;
+import java.nio.file.Paths;
+
+import org.eclipse.cmf.occi.core.AttributeState;
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.impl.OCCIFactoryImpl;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.ComputeStatus;
+import org.eclipse.cmf.occi.infrastructure.Networkinterface;
+import org.eclipse.cmf.occi.infrastructure.impl.InfrastructureFactoryImpl;
+import org.eclipse.emf.common.util.BasicEList;
+import org.eclipse.emf.common.util.EList;
+import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.json.JSONArray;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.PlatformPackage;
+import org.modmacao.occi.platform.Status;
+import org.modmacao.occi.platform.impl.PlatformFactoryImpl;
+import org.modmacao.placement.Placementlink;
+import org.modmacao.placement.impl.PlacementFactoryImpl;
+
+import de.ugoe.cs.rwm.docci.MartDeployer;
+import de.ugoe.cs.rwm.docci.ModelUtility;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.connector.LocalhostConnector;
+import de.ugoe.cs.rwm.docci.executor.Executor;
+import de.ugoe.cs.rwm.tocci.Transformator;
+import de.ugoe.cs.rwm.tocci.TransformatorFactory;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+import monitoring.Datagatherer;
+import monitoring.Dataprocessor;
+import monitoring.Monitorableproperty;
+import monitoring.Resultprovider;
+import monitoring.Sensor;
+import monitoring.impl.MonitoringFactoryImpl;
+
+/**Making javadoc happy.
+ * @author erbel
+ *
+ */
+public class MAPE {
+ static String manNWid = "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339590";
+ static String manNWRuntimeId = "75a4639e-9ce7-4058-b859-8a711b0e2e7b";
+ static String sshKey = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova";
+ static String userData = "I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj";
+ protected static final Path RUNTIMEPATH = Paths.get(System.getProperty("user.home") + "/.rwm/runtime.occic");
+ static Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
+ static MartDeployer deployer = new MartDeployer(conn);
+ static MartQuery executor = new MartQuery(conn);
+ static Resource runtimeModel;
+ static int interval;
+
+ /**Making javadoc happy.
+ * @param args Making javadoc happy.
+ */
+ public static void main(String[] args) {
+ System.out.println("Starting MAPE loop");
+ RegistryAndLoggerSetup.setup();
+ interval=10000;
+
+ initialDeploy();
+ while(true) {
+ try {
+ System.out.println("\n--------------------Waiting for new Cycle: Sleeping " + interval +"--------------------");
+ Thread.sleep(interval);
+
+ Monitor monitor = monitor();
+ String analysis = analyze(monitor);
+ runtimeModel = plan(analysis);
+ execute(runtimeModel);
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ }
+
+ }
+ }
+
+private static Monitor monitor() {
+ int critCPUs = getNumberOfCriticalCPUs();
+ int noneCPUs = getNumberOfNoneCPUs();
+ int allCPUs = getNumberOfAllCPUs();
+ Monitor mon = new Monitor(critCPUs, noneCPUs, allCPUs);
+ System.out.println("Monitor: " + "Monitored CPUs: " + allCPUs + "| Critical CPUs: "+ critCPUs + "| None CPUs: " + noneCPUs);
+ return mon;
+}
+
+
+private static String analyze(Monitor monitor) {
+ int noneCPUs = monitor.getNoneCPUs();
+ int critCPUs = monitor.getCritCPUs();
+ int allCPUs = monitor.getAllCPUs();
+
+ if(noneCPUs == 0 && critCPUs > allCPUs/2 && allCPUs <= 6){
+ System.out.println("Analyze: Critical State Detected");
+ return "upScale";
+ } else {
+ System.out.println("Analyze: Non Critical State Detected");
+ return "downScale";
+ }
+}
+
+private static Resource plan(String analysis) {
+ switch (analysis) {
+ case "upScale": System.out.println("Plan: upScale!");
+ UpScaler upscaler = new UpScaler(conn, RUNTIMEPATH);
+ return upscaler.upScaleNodes();
+ case "downScale": System.out.println("Plan: downScale!");
+ DownScaler downscaler = new DownScaler(conn, RUNTIMEPATH);
+ return downscaler.downScaleNodes();
+ }
+ return null;
+}
+
+
+private static void execute(Resource runtimeModel) {
+ System.out.println("Execute: Deploying adjusted Model");
+ deployer.deploy(runtimeModel);
+
+ }
+
+
+public static void initialDeploy() {
+ System.out.println("Initial Deployment");
+ Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopClusterNewExtWithMem.occic"));
+ Resource model = ModelUtility.loadOCCIintoEMFResource(occiPath);
+
+ Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
+ trans.transform(model, occiPath);
+
+ OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
+
+ trans2.transform(occiPath, occiPath);
+ deployer.deploy(occiPath);
+ executor.executeGetOperation("/resultprovider");
+}
+
+private static int getNumberOfNoneCPUs() {
+ String query = "/monitorableproperty?attribute=monitoring.result&value=None";
+ String result = executor.executeGetOperation(query);
+ if(result.equals("{ }") == false) {
+ String substring = result.substring(result.indexOf("["), (result.lastIndexOf("]")+1));
+ JSONArray arr = new JSONArray(substring);
+ if(arr.length() == 0) {
+ return 1;
+ } else {
+ return arr.length();
+ }
+ } else {
+ return 0;
+ }
+
+}
+
+private static int getNumberOfCriticalCPUs() {
+ String query = "/monitorableproperty?attribute=monitoring.result&value=Critical";
+ String result = executor.executeGetOperation(query);
+ if(result.equals("{ }") == false) {
+ String substring = result.substring(result.indexOf("["), (result.lastIndexOf("]")+1));
+ JSONArray arr = new JSONArray(substring);
+ if(arr.length() == 0) {
+ return 1;
+ } else {
+ return arr.length();
+ }
+ } else {
+ return 0;
+ }
+}
+
+private static int getNumberOfAllCPUs() {
+ String query = "/monitorableproperty?attribute=monitoring.property&value=CPU";
+ String result = executor.executeGetOperation(query);
+ if(result.equals("{ }") == false) {
+ String substring = result.substring(result.indexOf("["), (result.lastIndexOf("]")+1));
+ JSONArray arr = new JSONArray(substring);
+ if(arr.length() == 0) {
+ return 1;
+ } else {
+ return arr.length();
+ }
+ } else {
+ return 0;
+ }
+}
+
+}
\ No newline at end of file
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/MartQuery.java b/src/main/java/de/ugoe/cs/rwm/mocci/MartQuery.java
new file mode 100644
index 0000000000000000000000000000000000000000..8ae31fe6bd1d2ceda52832d547f625aea94624a8
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/MartQuery.java
@@ -0,0 +1,58 @@
+package de.ugoe.cs.rwm.mocci;
+
+import java.net.HttpURLConnection;
+
+import org.eclipse.cmf.occi.core.Action;
+import org.eclipse.cmf.occi.core.AttributeState;
+import org.eclipse.cmf.occi.core.Entity;
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.core.Mixin;
+import org.eclipse.cmf.occi.core.MixinBase;
+import org.eclipse.emf.ecore.EObject;
+
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.executor.AbsExecutor;
+import de.ugoe.cs.rwm.docci.executor.MartExecutor;
+
+/**
+ * Handles execution of OCCI Model Elements.
+ *
+ * @author erbel
+ *
+ */
+public class MartQuery extends MartExecutor {
+
+ /**
+ * Creates an Executor to the OCCI API of the specified connection. Sets
+ * maxTries to 3.
+ *
+ * @param conn
+ */
+ public MartQuery(Connector conn) {
+ super(conn);
+ }
+
+ /**
+ * Creates Executor to the OCCI API of the specified connection. maxTries is
+ * hereby the maximum amount of retries for a request. Should be at least 2 to
+ * handle connection issues.
+ *
+ * @param conn
+ * @param maxTries
+ */
+ public MartQuery(Connector conn, int maxTries) {
+ super(conn, maxTries);
+ }
+
+
+
+ public String executeGetOperation(String query) {
+ String adaptedAddress = "http://" + connector.getAddress() + ":" + connector.getPort() + query;
+ HttpURLConnection conn = establishConnection(adaptedAddress, null, false, null);
+ conn.setRequestProperty("Accept", "application/json");
+
+ //System.out.println("GET" + " " + adaptedAddress);
+
+ return getOutput(conn);
+ }
+}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/Monitor.java b/src/main/java/de/ugoe/cs/rwm/mocci/Monitor.java
new file mode 100644
index 0000000000000000000000000000000000000000..7d7544cba35abc7dbf13518a21964cd19f4ad620
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/Monitor.java
@@ -0,0 +1,39 @@
+package de.ugoe.cs.rwm.mocci;
+
+public class Monitor {
+ private int critCPUs;
+ private int noneCPUs;
+ private int allCPUs;
+
+ public int getAllCPUs() {
+ return allCPUs;
+ }
+
+ public void setAllCPUs(int allCPUs) {
+ this.allCPUs = allCPUs;
+ }
+
+ public Monitor(int critCPUs, int noneCPUs, int allCPUs) {
+ this.critCPUs = critCPUs;
+ this.noneCPUs = noneCPUs;
+ this.allCPUs = allCPUs;
+ }
+
+ public int getCritCPUs() {
+ return critCPUs;
+ }
+
+ public void setCritCPUs(int critCPUs) {
+ this.critCPUs = critCPUs;
+ }
+
+ public int getNoneCPUs() {
+ return noneCPUs;
+ }
+
+ public void setNoneCPUs(int noneCPUs) {
+ this.noneCPUs = noneCPUs;
+ }
+
+
+}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
new file mode 100644
index 0000000000000000000000000000000000000000..2e06587ee771e225970ba4415d464d83b4549e93
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/RegistryAndLoggerSetup.java
@@ -0,0 +1,84 @@
+package de.ugoe.cs.rwm.mocci;
+
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
+import org.eclipse.cmf.occi.core.OCCIPackage;
+import org.eclipse.cmf.occi.core.util.OcciRegistry;
+import org.eclipse.cmf.occi.infrastructure.InfrastructurePackage;
+import org.modmacao.ansibleconfiguration.AnsibleconfigurationPackage;
+import org.modmacao.occi.platform.PlatformPackage;
+import org.modmacao.placement.PlacementPackage;
+
+import de.ugoe.cs.rwm.cocci.Comparator;
+import de.ugoe.cs.rwm.docci.Deployer;
+import de.ugoe.cs.rwm.docci.appdeployer.MartAppDeployerSlave;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.deprovisioner.Deprovisioner;
+import de.ugoe.cs.rwm.docci.executor.Executor;
+import de.ugoe.cs.rwm.docci.provisioner.Provisioner;
+import de.ugoe.cs.rwm.docci.retriever.ModelRetriever;
+import de.ugoe.cs.rwm.tocci.Transformator;
+import modmacao.ModmacaoPackage;
+import monitoring.MonitoringPackage;
+import openstackruntime.OpenstackruntimePackage;
+import ossweruntime.OssweruntimePackage;
+import workflow.WorkflowPackage;
+
+public class RegistryAndLoggerSetup {
+ public static void setup() {
+ loggerSetup();
+ registrySetup();
+
+
+ }
+
+ private static void loggerSetup() {
+ Logger.getLogger(Transformator.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Connector.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(ModelRetriever.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Comparator.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Provisioner.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Deployer.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Deprovisioner.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(Executor.class.getName()).setLevel(Level.OFF);
+ Logger.getLogger(MartAppDeployerSlave.class.getName()).setLevel(Level.OFF);
+ }
+
+ private static void registrySetup() {
+
+ InfrastructurePackage.eINSTANCE.eClass();
+ OCCIPackage.eINSTANCE.eClass();
+ ModmacaoPackage.eINSTANCE.eClass();
+ OpenstackruntimePackage.eINSTANCE.eClass();
+ PlacementPackage.eINSTANCE.eClass();
+ WorkflowPackage.eINSTANCE.eClass();
+ OssweruntimePackage.eINSTANCE.eClass();
+ AnsibleconfigurationPackage.eINSTANCE.eClass();
+ MonitoringPackage.eINSTANCE.eClass();
+
+ PlatformPackage.eINSTANCE.eClass();
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/platform#",
+ PlatformPackage.class.getClassLoader().getResource("model/platform.occie").toString());
+
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/modmacao#",
+ ModmacaoPackage.class.getClassLoader().getResource("model/modmacao.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/runtime#",
+ OpenstackruntimePackage.class.getClassLoader().getResource("model/openstackruntime.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/swe#",
+ OssweruntimePackage.class.getClassLoader().getResource("model/openstackruntime.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/placement#",
+ PlacementPackage.class.getClassLoader().getResource("model/placement.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/infrastructure#",
+ InfrastructurePackage.class.getClassLoader().getResource("model/Infrastructure.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.ogf.org/occi/core#",
+ OCCIPackage.class.getClassLoader().getResource("model/Core.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/workflow#",
+ OCCIPackage.class.getClassLoader().getResource("model/workflow.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/swe#",
+ OCCIPackage.class.getClassLoader().getResource("model/ossweruntime.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/ansible#",
+ OCCIPackage.class.getClassLoader().getResource("model/ansibleconfiguration.occie").toString());
+ OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
+ MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
+ }
+}
diff --git a/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
new file mode 100644
index 0000000000000000000000000000000000000000..a71e26b2176847b495eab8be51f6c2bfdb98fa35
--- /dev/null
+++ b/src/main/java/de/ugoe/cs/rwm/mocci/UpScaler.java
@@ -0,0 +1,189 @@
+package de.ugoe.cs.rwm.mocci;
+
+import java.nio.file.Path;
+
+import org.eclipse.cmf.occi.core.AttributeState;
+import org.eclipse.cmf.occi.core.Configuration;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.ComputeStatus;
+import org.eclipse.cmf.occi.infrastructure.Networkinterface;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.Status;
+import org.modmacao.placement.Placementlink;
+
+import de.ugoe.cs.rwm.docci.ModelUtility;
+import de.ugoe.cs.rwm.docci.connector.Connector;
+import monitoring.Datagatherer;
+import monitoring.Dataprocessor;
+import monitoring.Monitorableproperty;
+import monitoring.Resultprovider;
+import monitoring.Sensor;
+
+public class UpScaler extends AbsScaler {
+
+ public UpScaler(Connector conn, Path runtimePath) {
+ this.conn = conn;
+ this.runtimePath = runtimePath;
+ }
+
+ @SuppressWarnings("unused")
+ public Resource upScaleNodes() {
+ runtimeModel = ModelUtility.loadOCCIintoEMFResource(conn.loadRuntimeModel(runtimePath));
+ Configuration config = ((Configuration) runtimeModel.getContents().get(0));
+ Compute monVM = (Compute) getResourceById(config.getResources(), "urn:uuid:37829092-c690-494a-98fa-335b2fd660ea");
+
+ Compute comp = addCompute(config);
+ Component worker = addWorkerComponent(config, comp);
+ Sensor sens = addSensor(config, comp);
+ Datagatherer dg = addDataGatherer(config, comp, sens);
+ Dataprocessor dp = addDataProcessor(config, monVM, sens, dg);
+ Resultprovider rp = addResultProvider(config, monVM, sens, dp);
+
+ return runtimeModel;
+ }
+
+ private Compute addCompute(Configuration config) {
+ System.out.println("Adding Compute Node to Model");
+ Compute comp = iFactory.createCompute();
+ comp.setTitle("hadoop-worker-additional");
+ comp.setOcciComputeState(ComputeStatus.ACTIVE);
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.compute.state");
+ attr.setValue("active");
+ comp.getAttributes().add(attr);
+ config.getResources().add(comp);
+ //executor.executeOperation("PUT", comp, null);
+
+ Networkinterface nwi = iFactory.createNetworkinterface();
+ nwi.setTarget(getResourceById(config.getResources(), "urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"));
+ nwi.setSource(comp);
+
+ Networkinterface nwimon = iFactory.createNetworkinterface();
+ nwimon.setTarget(getResourceById(config.getResources(), "urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a"));
+ nwimon.setSource(comp);
+ return comp;
+ }
+
+ private Component addWorkerComponent(Configuration config, Compute comp) {
+ System.out.println("Adding Worker Component to Model");
+ Component worker = pFactory.createComponent();
+ worker.setTitle("worker-component");
+ worker.setOcciComponentState(Status.ACTIVE);
+ config.getResources().add(worker);
+
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.core.id");
+ attr.setValue(worker.getId());
+ worker.getAttributes().add(attr);
+
+ Placementlink pLink = placeFactory.createPlacementlink();
+ pLink.setSource(worker);
+ pLink.setTarget(comp);
+
+ Componentlink compLink = pFactory.createComponentlink();
+ compLink.setSource(getResourceById(config.getResources(), "urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d"));
+ compLink.setTarget(worker);
+ return worker;
+ }
+
+ private Sensor addSensor(Configuration config, Compute comp) {
+ System.out.println("Adding Sensor to Model");
+ Sensor sens = mFactory.createSensor();
+ sens.setTitle("CPUSensor");
+ config.getResources().add(sens);
+ //executor.executeOperation("PUT", sens, null);
+
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.core.id");
+ attr.setValue(sens.getId());
+ sens.getAttributes().add(attr);
+
+ Monitorableproperty mp = mFactory.createMonitorableproperty();
+ mp.setTitle("monProp");
+ mp.setMonitoringProperty("CPU");
+ AttributeState attrProp = factory.createAttributeState();
+ attrProp.setName("monitoring.property");
+ attrProp.setValue("CPU");
+ mp.getAttributes().add(attrProp);
+ mp.setSource(sens);
+ mp.setTarget(comp);
+ //executor.executeOperation("PUT", mp, null);
+
+ return sens;
+ }
+
+ private Datagatherer addDataGatherer(Configuration config, Compute comp, Sensor sens) {
+ System.out.println(" Adding Datagatherer to Model");
+ Datagatherer dg = mFactory.createDatagatherer();
+ dg.setTitle("CPUGatherer");
+ config.getResources().add(dg);
+
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.core.id");
+ attr.setValue(dg.getId());
+ dg.getAttributes().add(attr);
+
+ //executor.executeOperation("PUT", dg, null);
+ Componentlink c1 = pFactory.createComponentlink();
+ c1.setSource(sens);
+ c1.setTarget(dg);
+ //executor.executeOperation("PUT", c1, null);
+
+ Placementlink pl = placeFactory.createPlacementlink();
+ pl.setSource(dg);
+ pl.setTarget(comp);
+
+ return dg;
+ }
+
+ private Dataprocessor addDataProcessor(Configuration config, Compute comp, Sensor sens, Datagatherer dg) {
+ System.out.println(" Adding Dataprocessor to Model");
+ Dataprocessor dp = mFactory.createDataprocessor();
+ dp.setTitle("CPUProcessor");
+ config.getResources().add(dp);
+
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.core.id");
+ attr.setValue(dp.getId());
+ dp.getAttributes().add(attr);
+
+ Componentlink c2 = pFactory.createComponentlink();
+ c2.setSource(sens);
+ c2.setTarget(dp);
+ Placementlink pl = placeFactory.createPlacementlink();
+ pl.setSource(dp);
+ pl.setTarget(comp);
+ Componentlink cl = pFactory.createComponentlink();
+ cl.setSource(dp);
+ cl.setTarget(dg);
+ return dp;
+ }
+
+ private Resultprovider addResultProvider(Configuration config, Compute comp, Sensor sens, Dataprocessor dp) {
+ System.out.println(" Adding Resultprovider to Model");
+ Resultprovider rp = mFactory.createResultprovider();
+ rp.setTitle("CPUProvider");
+ config.getResources().add(rp);
+
+ AttributeState attr = factory.createAttributeState();
+ attr.setName("occi.core.id");
+ attr.setValue(rp.getId());
+ rp.getAttributes().add(attr);
+
+ Componentlink c3 = pFactory.createComponentlink();
+ c3.setSource(sens);
+ c3.setTarget(rp);
+
+ Placementlink pl = placeFactory.createPlacementlink();
+ pl.setSource(rp);
+ pl.setTarget(comp);
+
+ Componentlink cl = pFactory.createComponentlink();
+ cl.setSource(rp);
+ cl.setTarget(dp);
+
+ return rp;
+ }
+}
diff --git a/src/main/resources/mape.sh b/src/main/resources/mape.sh
new file mode 100755
index 0000000000000000000000000000000000000000..bcdb2727927b293bb908d3886254bec86341e8fa
--- /dev/null
+++ b/src/main/resources/mape.sh
@@ -0,0 +1,38 @@
+#! /bin/bash
+
+state=DownScaled
+sequence=3
+url='http://localhost:8080/monitorableproperty?attribute=monitoring.result&value=Critical'
+
+
+echo "Starting MAPE script"
+echo "Requesting $url every $sequence seconds!"
+
+
+while true; do
+ echo "Monitor"
+ m=$(curl -s $url)
+ echo "$m"
+ echo "Analyze"
+ if echo $m | grep -q /compute/ ; then
+ echo "Critical Compute Detected"
+ echo "Plan: Scale up VM"
+ if [ "$state" == DownScaled ]; then
+ state=UpScaled
+ echo "State: $state"
+ echo "Execute"
+ curl -v -X PUT http://localhost:8080/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/ -H 'Content-Type: text/occi' -H 'Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind", ssh_key; scheme="http://schemas.ogf.org/occi/infrastructure/credentials#"; class="mixin", user_data; scheme="http://schemas.ogf.org/occi/infrastructure/compute#"; class="mixin", ubuntu_xenialxerus; scheme="http://schemas.modmacao.org/openstack/swe#"; class="mixin"' -H 'X-OCCI-Attribute:occi.core.id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf", occi.core.title="hadoop-worker-1", occi.core.summary="", occi.compute.architecture="x86", occi.compute.cores="8", occi.compute.hostname="hadoop-worker-1", occi.compute.share="0", occi.compute.speed="0", occi.compute.memory="8192", occi.compute.state="active", occi.compute.state.message="", occi.credentials.ssh.publickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova", occi.compute.userdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"'
+ fi
+ else
+ echo "No Crtical Compute Detected"
+ echo "Plan: Scale down VM"
+ if [ "$state" == UpScaled ]; then
+ state=DownScaled
+ echo "State: $state"
+ curl -v -X PUT http://localhost:8080/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/ -H 'Content-Type: text/occi' -H 'Category: compute; scheme="http://schemas.ogf.org/occi/infrastructure#"; class="kind", ssh_key; scheme="http://schemas.ogf.org/occi/infrastructure/credentials#"; class="mixin", user_data; scheme="http://schemas.ogf.org/occi/infrastructure/compute#"; class="mixin", ubuntu_xenialxerus; scheme="http://schemas.modmacao.org/openstack/swe#"; class="mixin"' -H 'X-OCCI-Attribute:occi.core.id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf", occi.core.title="hadoop-worker-1", occi.core.summary="", occi.compute.architecture="x86", occi.compute.cores="2", occi.compute.hostname="hadoop-worker-1", occi.compute.share="0", occi.compute.speed="0", occi.compute.memory="4096", occi.compute.state="active", occi.compute.state.message="", occi.credentials.ssh.publickey="ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQC6H7Ydi45BTHid4qNppGAi5mzjbnZgt7bi6xLGmZG9CiLmhMsxOuk3Z05Nn+pmoN98qS0eY8S240PPk5VOlYqBY0vdRAwrZSHHaLdMp6I7ARNrI2KraYduweqz7ZQxPXQfwIeYx2HKQxEF2r+4//Fo4WfgdBkLuulvl/Gw3TUzJNQHvgpaiNo9+PI5CZydHnZbjUkRikS12pT+CbNKj+0QKeQztbCd41aKxDv5H0DjltVRcpPppv4dmiU/zoCAIngWLO1PPgfYWyze8Z9IoyBT7Qdg30U91TYZBuxzXR5lq7Fh64y/IZ/SjdOdSIvIuDjtmJDULRdLJzrvubrKY+YH Generated-by-Nova", occi.compute.userdata="I2Nsb3VkLWNvbmZpZwoKIyBVcGdyYWRlIHRoZSBpbnN0YW5jZSBvbiBmaXJzdCBib290CiMgKGllIHJ1biBhcHQtZ2V0IHVwZ3JhZGUpCiMKIyBEZWZhdWx0OiBmYWxzZQojIEFsaWFzZXM6IGFwdF91cGdyYWRlCnBhY2thZ2VfdXBncmFkZTogdHJ1ZQoKcGFja2FnZXM6CiAtIHB5dGhvbgoKd3JpdGVfZmlsZXM6CiAgLSBwYXRoOiAvZXRjL25ldHdvcmsvaW50ZXJmYWNlcy5kLzUwLWNsb3VkLWluaXQuY2ZnCiAgICBjb250ZW50OiB8CiAgICAgIGF1dG8gbG8KICAgICAgaWZhY2UgbG8gaW5ldCBsb29wYmFjawogICAgICAKICAgICAgYXV0byBlbnMwCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMAogICAgICBpZmFjZSBlbnMwIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMQogICAgICBpZmFjZSBlbnMxIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMyCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMgogICAgICBpZmFjZSBlbnMyIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMzCiAgICAgIGFsbG93LWhvdHBsdWcgZW5zMwogICAgICBpZmFjZSBlbnMzIGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM0CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNAogICAgICBpZmFjZSBlbnM0IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM1CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNQogICAgICBpZmFjZSBlbnM1IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM2CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNgogICAgICBpZmFjZSBlbnM2IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM3CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zNwogICAgICBpZmFjZSBlbnM3IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM4CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOAogICAgICBpZmFjZSBlbnM4IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnM5CiAgICAgIGFsbG93LWhvdHBsdWcgZW5zOQogICAgICBpZmFjZSBlbnM5IGluZXQgZGhjcAogICAgICAKICAgICAgYXV0byBlbnMxMAogICAgICBhbGxvdy1ob3RwbHVnIGVuczEwCiAgICAgIGlmYWNlIGVuczEwIGluZXQgZGhjcAoKIyMj"'
+ fi
+fi
+
+
+ sleep $sequence
+done
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopNode2Test.java b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopNode2Test.java
new file mode 100644
index 0000000000000000000000000000000000000000..366b5dbf43e3c5bffb65c4f5baad4f44d69e949d
--- /dev/null
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/DeployHadoopNode2Test.java
@@ -0,0 +1,82 @@
+package de.ugoe.cs.rwm.mocci;
+
+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.tocci.Transformator;
+import de.ugoe.cs.rwm.tocci.TransformatorFactory;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+import monitoring.MonitoringPackage;
+
+public class DeployHadoopNode2Test {
+ 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 LocalhostConnector("localhost", 8080, "ubuntu");
+ MartDeployer deployer = new MartDeployer(conn);
+ deployer.deploy(occiPath);
+ }
+
+ @Test
+ public void deployHadoopWithNewMonitoring() {
+ CachedResourceSet.getCache().clear();
+ System.out.println(OcciRegistry.getInstance().getRegisteredExtensions());
+ //Logger.getRootLogger().setLevel(Level.FATAL);
+ Path occiPath = Paths.get(ModelUtility.getPathToResource("occi/hadoopCluster2Nodes.occic"));
+
+ Transformator trans = TransformatorFactory.getTransformator("OCCI2OCCI");
+ trans.transform(occiPath, occiPath);
+
+ OCCI2OPENSTACKTransformator trans2 = OCCI2OPENSTACKTransformator.getInstance();
+ trans2.setTransformationProperties(manNWRuntimeId, sshKey, userData, manNWid);
+
+ trans2.transform(occiPath, occiPath);
+
+
+ Connector conn = new LocalhostConnector("localhost", 8080, "ubuntu");
+ MartDeployer deployer = new MartDeployer(conn);
+
+ deployer.deploy(occiPath);
+
+ assertTrue(TestUtility.equalsRuntime(occiPath, conn));
+
+ }
+}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..00f6e08b44afccbb45243462c3ddf495a4bf20ca
--- /dev/null
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/MapeTest.java
@@ -0,0 +1,23 @@
+package de.ugoe.cs.rwm.mocci;
+
+import org.eclipse.epsilon.emc.emf.CachedResourceSet;
+import org.junit.Test;
+import org.modmacao.occi.platform.Componentlink;
+
+import org.modmacao.occi.platform.impl.PlatformFactoryImpl;
+
+
+public class MapeTest {
+
+
+ @Test
+ public void deployHadoopWithNewMonitoring() {
+ TestUtility.loggerSetup();
+ TestUtility.extensionRegistrySetup();
+
+ CachedResourceSet.getCache().clear();
+ PlatformFactoryImpl pFactory = new PlatformFactoryImpl();
+ Componentlink cl = pFactory.createComponentlink();
+ System.out.println(cl);
+ }
+}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java b/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
index 82dd9d10849aea494f5c96ec37d51a2074fd2a58..6b888e236a103046fe5caee1230c92bb148f73b7 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/ResolveProxyTest.java
@@ -22,6 +22,8 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Ignore;
import org.junit.Test;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.impl.PlatformFactoryImpl;
import de.ugoe.cs.rwm.docci.MartDeployer;
import de.ugoe.cs.rwm.docci.ModelUtility;
@@ -50,6 +52,7 @@ public class ResolveProxyTest {
EList<EObject> newModel = de.ugoe.cs.rwm.docci.ModelUtility.loadOCCI(newOCCI);
+
for (org.eclipse.cmf.occi.core.Resource res : de.ugoe.cs.rwm.docci.ModelUtility.getResources(newModel)) {
System.out.println("Resource Title: " + res.getTitle());
System.out.println(" Kind: " + res.getKind());
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
index ae582dca7818539cc75310675a65952ce03d96e4..0c1e6c72a746321ed4ecf491fc9087df7ee6671a 100644
--- a/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/TestUtility.java
@@ -4,6 +4,7 @@ import java.io.File;
import java.io.IOException;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.util.Map;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -12,7 +13,11 @@ import org.eclipse.cmf.occi.core.OCCIPackage;
import org.eclipse.cmf.occi.core.util.OcciRegistry;
import org.eclipse.cmf.occi.infrastructure.InfrastructurePackage;
import org.eclipse.emf.ecore.EObject;
+import org.eclipse.emf.ecore.resource.Resource;
+import org.eclipse.emf.ecore.resource.ResourceSet;
import org.modmacao.ansibleconfiguration.AnsibleconfigurationPackage;
+import org.modmacao.occi.platform.PlatformPackage;
+import org.modmacao.occi.platform.impl.PlatformFactoryImpl;
import org.modmacao.placement.PlacementPackage;
import de.ugoe.cs.rwm.cocci.Comparator;
@@ -43,17 +48,18 @@ public class TestUtility {
WorkflowPackage.eINSTANCE.eClass();
OssweruntimePackage.eINSTANCE.eClass();
AnsibleconfigurationPackage.eINSTANCE.eClass();
-
-
+ PlatformPackage.eINSTANCE.eClass();
MonitoringPackage.eINSTANCE.eClass();
+
+
OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
- //OcciRegistry.getInstance().registerExtension("http://schemas.ugoe.cs.rwm/monitoring#",
- // MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
-
+ OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/platform#",
+ PlatformPackage.class.getClassLoader().getResource("model/platform.occie").toString());
+
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/modmacao#",
ModmacaoPackage.class.getClassLoader().getResource("model/modmacao.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/openstack/runtime#",
@@ -72,6 +78,7 @@ public class TestUtility {
OCCIPackage.class.getClassLoader().getResource("model/ossweruntime.occie").toString());
OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/ansible#",
OCCIPackage.class.getClassLoader().getResource("model/ansibleconfiguration.occie").toString());
+
}
diff --git a/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopNode2TestLive.java b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopNode2TestLive.java
new file mode 100644
index 0000000000000000000000000000000000000000..623184895a49c47cf336890e68032e9238865550
--- /dev/null
+++ b/src/test/java/de/ugoe/cs/rwm/mocci/live/DeployHadoopNode2TestLive.java
@@ -0,0 +1,64 @@
+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.eclipse.epsilon.emc.emf.CachedResourceSet;
+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.docci.connector.Connector;
+import de.ugoe.cs.rwm.docci.connector.MartConnector;
+import de.ugoe.cs.rwm.mocci.TestUtility;
+import de.ugoe.cs.rwm.tocci.Transformator;
+import de.ugoe.cs.rwm.tocci.TransformatorFactory;
+import de.ugoe.cs.rwm.tocci.occi2openstack.OCCI2OPENSTACKTransformator;
+
+public class DeployHadoopNode2TestLive {
+ 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();
+ }
+
+ //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/hadoopCluster2Nodes.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/resources/occi/hadoopCluster2Nodes.occic b/src/test/resources/occi/hadoopCluster2Nodes.occic
new file mode 100644
index 0000000000000000000000000000000000000000..7dd0e1546d064abac739924cf6ea825c35711f2f
--- /dev/null
+++ b/src/test/resources/occi/hadoopCluster2Nodes.occic
@@ -0,0 +1,400 @@
+<?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:monitoring="http://schemas.ugoe.cs.rwm/monitoring/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">
+ <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/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">
+ <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="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:ea482951-5c26-471d-aa1b-8e03b1e6096c" title="link3" location="/networkinterface/urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c" target="//@resources.6">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ea482951-5c26-471d-aa1b-8e03b1e6096c"/>
+ <attributes name="occi.core.title" value="link3"/>
+ <attributes name="occi.networkinterface.address" value="10.254.1.5"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.5" occiNetworkinterfaceGateway="10.254.1.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="HJob" 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="HJob"/>
+ <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.0">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b929"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ </resources>
+ <resources xsi:type="platform:Component" id="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897" title="HMaster" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/" rlinks="//@resources.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"/>
+ <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.0">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b928"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <attributes name="occi.core.source" value="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255897/"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ </links>
+ </resources>
+ <resources xsi:type="platform:Application" id="urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" title="hadoopcluster" location="/application/urn:uuid:a4888ba9-a0ea-48f2-a29e-901c876ab42d" occiAppName="hadoopcluster" 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.app.name" value="hadoopcluster"/>
+ <attributes name="occi.app.state" value="active"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" title="ComponentLink" location="/componentlink/urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef" target="//@resources.2">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9aa31c50-c605-4370-aa60-2c7c461051ef"/>
+ <attributes name="occi.core.title" value="ComponentLink"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1" target="//@resources.5">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da1"/>
+ <attributes name="occi.core.title" value="link4"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da2" title="link4" location="/componentlink/urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da2" target="//@resources.17">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:7890f02b-6f56-4809-865f-d8c686fd9da2"/>
+ <attributes name="occi.core.title" value="link4"/>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf" title="hadoop-worker-1" location="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf/" rlinks="//@resources.5/@links.0 //@resources.8/@links.0 //@resources.7/@links.3 //@resources.15/@links.3" occiComputeCores="2" occiComputeHostname="vm2" occiComputeMemory="4096.0" occiComputeState="active">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='compute']"/>
+ <attributes name="occi.core.id" value="urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166cf"/>
+ <attributes name="occi.core.title" value="hadoop-worker-1"/>
+ <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="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:c8c49905-3d5e-43b2-8d09-fabf92d29722" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722" target="//@resources.6">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29722"/>
+ <attributes name="occi.core.title" value="link2"/>
+ <attributes name="occi.networkinterface.address" value="10.254.1.8"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.8" occiNetworkinterfaceGateway="10.254.1.254">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ <links xsi:type="infrastructure:Networkinterface" id="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d" title="monNwLink" target="//@resources.12" occiNetworkinterfaceInterface="100.254.1.35" occiNetworkinterfaceMac="">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:03f91178-136f-4023-876e-84509f8a5a2d"/>
+ <attributes name="occi.core.title" value="monNwLink"/>
+ <attributes name="occi.networkinterface.address" value="100.254.1.35"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.35" 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-d9f1a8255898" title="HWorker" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898/" rlinks="//@resources.3/@links.1" occiComponentStateMessage="">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='component']"/>
+ <attributes name="occi.core.id" value="urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255898"/>
+ <attributes name="occi.core.title" value="HWorker"/>
+ <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.4">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b917"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591" title="HNetwork" location="/network/urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591/" rlinks="//@resources.0/@links.0 //@resources.4/@links.0 //@resources.16/@links.0" occiNetworkState="active">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='network']"/>
+ <attributes name="occi.core.id" value="urn:uuid:29d78078-fb4c-47aa-a9af-b8aaf3339591"/>
+ <attributes name="occi.core.title" value="HNetwork"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.network.vlan" value="0"/>
+ <attributes name="occi.network.label" value=""/>
+ <attributes name="occi.network.state" value="active"/>
+ <attributes name="occi.network.state.message" value=""/>
+ <parts>
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="10.254.1.1/24"/>
+ </parts>
+ </resources>
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbb" title="CPUSensor" occiAppName="CPUSensor" occiAppState="active">
+ <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="CPUSensor"/>
+ <attributes name="occi.app.state" value="active"/>
+ <attributes name="occi.app.name" value="CPUSensor"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a" title="link1" target="//@resources.8">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52a"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a" title="link2" target="//@resources.9">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5a"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3" title="link3" target="//@resources.10">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e3"/>
+ <attributes name="occi.core.title" value="link3"/>
+ </links>
+ <links xsi:type="monitoring:Monitorableproperty" id="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed72" title="CPU" location="" target="//@resources.4" monitoringProperty="CPU" monitoringResult="Critical">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='monitorableproperty']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed72"/>
+ <attributes name="occi.core.title" value="CPU"/>
+ <attributes name="monitoring.property" value="CPU"/>
+ <attributes name="monitoring.result" value="Critical"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Datagatherer" id="urn:uuid:051affdc-d686-48f8-884c-83fe81718a48" title="Glances" rlinks="//@resources.7/@links.0 //@resources.9/@links.0 //@resources.13/@links.0 //@resources.15/@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="Glances"/>
+ <parts mixin="//@mixins.3"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:60cc05ca-4fd7-465b-8fd0-945dcbf8867f" title="link1" target="//@resources.4">
+ <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"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Dataprocessor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc" title="CPUAggregator" rlinks="//@resources.10/@links.0 //@resources.7/@links.1">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='dataprocessor']"/>
+ <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdc"/>
+ <attributes name="occi.core.title" value="CPUAggregator"/>
+ <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"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f4"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Resultprovider" id="urn:uuid:588f705e-5279-4847-9337-846af2c86972" title="CPUProvider" rlinks="//@resources.7/@links.2" occiComponentState="active">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='resultprovider']"/>
+ <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86972"/>
+ <attributes name="occi.core.title" value="CPUProvider"/>
+ <attributes name="occi.component.state" value="active"/>
+ <parts mixin="//@mixins.5"/>
+ <parts xsi:type="monitoring:Occiresultprovider">
+ <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='occiresultprovider']"/>
+ <attributes name="result.provider.endpoint" value="192.168.35.45:8080"/>
+ </parts>
+ <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"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3616"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:37829092-c690-494a-98fa-335b2fd660ea" title="MonVm" rlinks="//@resources.9/@links.1 //@resources.10/@links.1 //@resources.13/@links.1 //@resources.14/@links.1" occiComputeHostname="monVM" 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="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"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="100.254.1.25">
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetworkinterface']"/>
+ </parts>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Network" id="urn:uuid:7a9fca2c-24fb-473c-aa9c-8dc9e68a432a" title="MonNetwork" rlinks="//@resources.11/@links.0 //@resources.4/@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="MonNetwork"/>
+ <attributes name="occi.core.summary" value=""/>
+ <attributes name="occi.network.vlan" value="0"/>
+ <attributes name="occi.network.label" value=""/>
+ <attributes name="occi.network.state" value="active"/>
+ <attributes name="occi.network.state.message" value=""/>
+ <parts>
+ <mixin href="http://schemas.ogf.org/occi/infrastructure#//@mixins[term='ipnetwork']"/>
+ <attributes name="occi.network.address" value="100.254.1.1/24"/>
+ </parts>
+ </resources>
+ <resources xsi:type="monitoring:Dataprocessor" id="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdd" title="Processor" rlinks="//@resources.14/@links.0 //@resources.15/@links.2">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='dataprocessor']"/>
+ <attributes name="occi.core.title" value="Processor"/>
+ <attributes name="occi.core.id" value="urn:uuid:1bda25ab-723b-47e7-9704-5134db26ebdd"/>
+ <parts mixin="//@mixins.6"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:1a821776-7886-4cb4-8b80-46a8403acf41" 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-46a8403acf41"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f5" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff7019e4-a9dc-48dc-83c3-ab77714a25f5"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Resultprovider" id="urn:uuid:588f705e-5279-4847-9337-846af2c86973" title="Resultprovider" rlinks="//@resources.15/@links.1">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='resultprovider']"/>
+ <attributes name="occi.core.id" value="urn:uuid:588f705e-5279-4847-9337-846af2c86973"/>
+ <attributes name="occi.core.title" value="Resultprovider"/>
+ <parts mixin="//@mixins.7"/>
+ <parts xsi:type="monitoring:Occiresultprovider">
+ <mixin href="http://schemas.ugoe.cs.rwm/monitoring#//@mixins[term='occiresultprovider']"/>
+ <attributes name="result.provider.endpoint" value="192.168.35.45:8080"/>
+ </parts>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b83" title="link1" target="//@resources.13">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9551c357-59f8-4ac1-8c85-0e886e206b83"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3618" title="link2" target="//@resources.11">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:275b5bce-084c-46f0-88bc-1f6f31bf3618"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ </resources>
+ <resources xsi:type="monitoring:Sensor" id="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbc" title="Sensor" occiAppStateMessage="">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='sensor']"/>
+ <attributes name="occi.core.title" value="Sensor"/>
+ <attributes name="occi.core.id" value="urn:uuid:efb0f50a-7a7c-4153-b939-4846d6554dbc"/>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:04cf6483-706d-4a2a-9114-9918ab2bb52b" 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-9918ab2bb52b"/>
+ <attributes name="occi.core.title" value="link1"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5b" title="link2" target="//@resources.14">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:9c604867-3135-4fa1-af9e-2bb11018ff5b"/>
+ <attributes name="occi.core.title" value="link2"/>
+ </links>
+ <links xsi:type="platform:Componentlink" id="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e4" title="link3" target="//@resources.13">
+ <kind href="http://schemas.modmacao.org/occi/platform#//@kinds[term='componentlink']"/>
+ <attributes name="occi.core.id" value="urn:uuid:93f08e31-f350-42b7-a73b-c139eba4a8e4"/>
+ <attributes name="occi.core.title" value="link3"/>
+ </links>
+ <links xsi:type="monitoring:Monitorableproperty" id="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed73" title="MEM Monitoring" location="" target="//@resources.4" monitoringProperty="Mem" monitoringResult="">
+ <kind href="http://schemas.ugoe.cs.rwm/monitoring#//@kinds[term='monitorableproperty']"/>
+ <attributes name="occi.core.title" value="MEM Monitoring"/>
+ <attributes name="occi.core.id" value="urn:uuid:ba16f4ee-1601-4192-a259-eae4274aed73"/>
+ <attributes name="monitoring.property" value="Mem"/>
+ <attributes name="monitoring.result" value=""/>
+ </links>
+ </resources>
+ <resources xsi:type="infrastructure:Compute" id="urn:uuid:69394b72-b2de-43cd-b89f-616a5c7a6f66" title="hadoop-worker-2" location="/compute/urn:uuid:69394b72-b2de-43cd-b89f-616a5c7a6f66/" rlinks="//@resources.17/@links.0" occiComputeCores="2" occiComputeHostname="vm2" 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:69394b72-b2de-43cd-b89f-616a5c7a6f66"/>
+ <attributes name="occi.core.title" value="hadoop-worker-2"/>
+ <attributes name="occi.core.summary" value=""/>
+ <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:c8c49905-3d5e-43b2-8d09-fabf92d29728" title="link2" location="/networkinterface/urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29728" target="//@resources.6">
+ <kind href="http://schemas.ogf.org/occi/infrastructure#//@kinds[term='networkinterface']"/>
+ <attributes name="occi.core.id" value="urn:uuid:c8c49905-3d5e-43b2-8d09-fabf92d29728"/>
+ <attributes name="occi.core.title" value="link2"/>
+ <attributes name="occi.networkinterface.address" value="10.254.1.12"/>
+ <parts xsi:type="infrastructure:Ipnetworkinterface" occiNetworkinterfaceAddress="10.254.1.12" occiNetworkinterfaceGateway="10.254.1.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-d9f1a8255899" title="HWorker2" location="/component/urn:uuid:f934d445-d0c8-4f2f-8086-d9f1a8255899/" rlinks="//@resources.3/@links.2" 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-d9f1a8255899"/>
+ <attributes name="occi.core.title" value="HWorker2"/>
+ <attributes name="occi.component.state" value="active"/>
+ <attributes name="occi.component.state.message" value=""/>
+ <parts mixin="//@mixins.8"/>
+ <links xsi:type="placement:Placementlink" id="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b927" title="link1" location="/placementlink/urn:uuid:ff292f08-d263-41b6-88c8-84d33783b927/" target="//@resources.16">
+ <kind href="http://schemas.modmacao.org/placement#//@kinds[term='placementlink']"/>
+ <attributes name="occi.core.title" value="link1"/>
+ <attributes name="occi.core.id" value="urn:uuid:ff292f08-d263-41b6-88c8-84d33783b927"/>
+ <attributes name="occi.core.target" value="/compute/urn:uuid:2e6a73d0-faaa-476a-bd25-ca461dd166ce/"/>
+ </links>
+ </resources>
+ <mixins name="hJob" scheme="http://schemas.modmacao.org/usermixins#" title="Hjob"/>
+ <mixins name="hMaster" scheme="http://schemas.modmacao.org/usermixins#" title="HMaster"/>
+ <mixins name="hWorker" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker"/>
+ <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"/>
+ <mixins name="MemProcessor" scheme="http://schemas.modmacao.org/usermixins#" title="MemProcessor"/>
+ <mixins name="MemPublisher" scheme="http://schemas.modmacao.org/usermixins#" title="MemPublisher"/>
+ <mixins name="hWorker2" scheme="http://schemas.modmacao.org/usermixins#" title="HWorker2"/>
+</occi:Configuration>