de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderHelper.java

+/**
+ * Copyright (c) 2018-2019 University of Goettingen
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * - Johannes Erbel <johannes.erbel@cs.uni-goettingen.de>
+ */
+
+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();
+				}
+			}
+		}
+	}
+
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/ResultproviderSimulation.java

+/**
+ * Copyright (c) 2018-2019 University of Goettingen
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * - Johannes Erbel <johannes.erbel@cs.uni-goettingen.de>
+ */
+
+package de.ugoe.cs.rwm.mocci.connector;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+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 int interval;
+	private List<String> results;
+
+	public ResultproviderSimulation(Monitorableproperty monProp) {
+		this.monProp = monProp;
+		String property = getProperty(monProp.getMonitoringProperty());
+		LOGGER.info("Monitoring property for" + monProp.getMonitoringProperty() + ": " + property);
+		List<String> items = new ArrayList<String>(Arrays.asList(property.split("\\s*,\\s*")));
+		this.interval = Integer.parseInt(items.get(items.size() - 1));
+		items.remove(items.get(items.size() - 1));
+
+		String itemsString = String.join(",", items);
+		Pattern p = Pattern.compile("\'([^\']*)\'");
+		Matcher m = p.matcher(itemsString);
+		if (m.find() == true) {
+			items.clear();
+			while (m.find()) {
+				items.add(m.group(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);
+
+	}
+
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/SensorConnector.java

 /**
  * Copyright (c) 2016-2017 Inria
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  * - Philippe Merle <philippe.merle@inria.fr>
  * - Faiez Zalila <faiez.zalila@inria.fr>
  *
  * Generated at Wed Dec 05 12:12:23 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
  */
+
 package de.ugoe.cs.rwm.mocci.connector;
 
 import java.util.LinkedList;
 import java.util.List;
 
 import org.eclipse.cmf.occi.core.Link;
-import org.modmacao.cm.ConfigurationManagementTool;
-import org.modmacao.cm.ansible.AnsibleCMTool;
-import org.modmacao.core.connector.ApplicationConnector;
 import org.modmacao.occi.platform.Component;
 import org.modmacao.occi.platform.Componentlink;
 import org.modmacao.occi.platform.Status;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 /**
- * Connector implementation for the OCCI kind:
- * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: sensor
- * - title: Sensor Component
+ * Connector implementation for the OCCI kind: - scheme:
+ * http://schemas.ugoe.cs.rwm/monitoring# - term: sensor - title: Sensor
+ * Component
  */
-public class SensorConnector extends monitoring.impl.SensorImpl
-{
-	
-	
+public class SensorConnector extends monitoring.impl.SensorImpl {
+
 	/**
 	 * Initialize the logger.
 	 */
@@ -48,8 +41,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 	/**
 	 * Constructs a sensor connector.
 	 */
-	SensorConnector()
-	{
+	SensorConnector() {
 		LOGGER.debug("Constructor called on " + this);
 		// TODO: Implement this constructor.
 	}
@@ -57,14 +49,13 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 	//
 	// OCCI CRUD callback operations.
 	//
-	
+
 	// Start of user code SensorocciCreate
 	/**
 	 * Called when this Sensor instance is completely created.
 	 */
 	@Override
-	public void occiCreate()
-	{
+	public void occiCreate() {
 		LOGGER.debug("occiCreate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -75,8 +66,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 	 * Called when this Sensor instance must be retrieved.
 	 */
 	@Override
-	public void occiRetrieve()
-	{
+	public void occiRetrieve() {
 		LOGGER.debug("occiRetrieve() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -87,8 +77,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 	 * Called when this Sensor instance is completely updated.
 	 */
 	@Override
-	public void occiUpdate()
-	{
+	public void occiUpdate() {
 		LOGGER.debug("occiUpdate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -99,8 +88,7 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 	 * Called when this Sensor instance will be deleted.
 	 */
 	@Override
-	public void occiDelete()
-	{
+	public void occiDelete() {
 		LOGGER.debug("occiDelete() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -112,224 +100,206 @@ public class SensorConnector extends monitoring.impl.SensorImpl
 
 	// Start of user code Sensor_Kind_deploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: deploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: deploy -
+	 * title:
 	 */
 	@Override
-	public void deploy()
-	{
+	public void deploy() {
 		LOGGER.debug("Action deploy() called on " + this);
 
 		// Application State Machine.
-		switch(getOcciAppState().getValue()) {
+		switch (getOcciAppState().getValue()) {
 
 		case Status.UNDEPLOYED_VALUE:
 			LOGGER.debug("Fire transition(state=undeployed, action=\"deploy\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.deploy();
 			}
-			
-				setOcciAppState(Status.DEPLOYED);
 
-}
+			setOcciAppState(Status.DEPLOYED);
+
+			break;
+
+		default:
+			break;
+		}
 	}
+
 	// End of user code
 	// Start of user code Sensor_Kind_undeploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: undeploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: undeploy
+	 * - title:
 	 */
 	@Override
-	public void undeploy()
-	{
+	public void undeploy() {
 		LOGGER.debug("Action undeploy() called on " + this);
 
 		// Application State Machine.
-		switch(getOcciAppState().getValue()) {
+		switch (getOcciAppState().getValue()) {
 
 		case Status.ACTIVE_VALUE:
 			LOGGER.debug("Fire transition(state=active, action=\"undeploy\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.stop();
 			}
 			this.stop();
-			
-			for (Component component: this.getConnectedComponents()) {
+
+			for (Component component : this.getConnectedComponents()) {
 				component.undeploy();
 			}
-				setOcciAppState(Status.UNDEPLOYED);
+			setOcciAppState(Status.UNDEPLOYED);
 
 			break;
 		case Status.INACTIVE_VALUE:
 			LOGGER.debug("Fire transition(state=inactive, action=\"undeploy\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.undeploy();
 			}
-	
-				setOcciAppState(Status.UNDEPLOYED);
+
+			setOcciAppState(Status.UNDEPLOYED);
 			break;
 		case Status.DEPLOYED_VALUE:
 			LOGGER.debug("Fire transition(state=deployed, action=\"undeploy\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.undeploy();
 			}
-		
-				setOcciAppState(Status.UNDEPLOYED);
+
+			setOcciAppState(Status.UNDEPLOYED);
 			break;
 		case Status.ERROR_VALUE:
 			LOGGER.debug("Fire transition(state=error, action=\"undeploy\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.undeploy();
 			}
-		
-				setOcciAppState(Status.UNDEPLOYED);
+
+			setOcciAppState(Status.UNDEPLOYED);
 			break;
 
 		default:
 			break;
-}
+		}
 	}
+
 	// End of user code
 	// Start of user code Sensor_Kind_Stop_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: stop
-     * - title: Stop the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: stop -
+	 * title: Stop the application.
 	 */
 	@Override
-	public void stop()
-	{
+	public void stop() {
 		LOGGER.debug("Action stop() called on " + this);
 
 		// Application State Machine.
-		switch(getOcciAppState().getValue()) {
+		switch (getOcciAppState().getValue()) {
 
 		case Status.ACTIVE_VALUE:
 			LOGGER.debug("Fire transition(state=active, action=\"stop\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.stop();
 			}
-		
-				setOcciAppState(Status.INACTIVE);
+
+			setOcciAppState(Status.INACTIVE);
 			break;
 
 		default:
 			break;
-}
+		}
 
 		// TODO: Implement how to stop this sensor.
 	}
+
 	// End of user code
 	// Start of user code Sensor_Kind_configure_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: configure
+	 * - title:
 	 */
 	@Override
-	public void configure()
-	{
-		int status = -1;
+	public void configure() {
 		LOGGER.debug("Action configure() called on " + this);
 
 		// Application State Machine.
-		switch(getOcciAppState().getValue()) {
+		switch (getOcciAppState().getValue()) {
 
 		case Status.DEPLOYED_VALUE:
 			LOGGER.debug("Fire transition(state=deployed, action=\"configure\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.configure();
 			}
-			
-		
-				setOcciAppState(Status.INACTIVE);
+
+			setOcciAppState(Status.INACTIVE);
 			break;
 
 		default:
 			break;
-}
+		}
 	}
+
 	// End of user code
 	// Start of user code Sensor_Kind_Start_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: start
-     * - title: Start the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: start -
+	 * title: Start the application.
 	 */
 	@Override
-	public void start()
-	{
-		int status = -1;
+	public void start() {
 		LOGGER.debug("Action start() called on " + this);
-		
+
 		// Application State Machine.
-		switch(getOcciAppState().getValue()) {
+		switch (getOcciAppState().getValue()) {
 
 		case Status.INACTIVE_VALUE:
 			LOGGER.debug("Fire transition(state=inactive, action=\"start\")...");
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.start();
 			}
-		
-				setOcciAppState(Status.ACTIVE);
-			break;
 
+			setOcciAppState(Status.ACTIVE);
+			break;
 
 		case Status.UNDEPLOYED_VALUE:
 			LOGGER.debug("Fire transition(state=undeployed, action=\"start\")...");
 			// First deploy components
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.deploy();
 			}
 			this.deploy();
-			
+
 			// then configure them
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.configure();
 			}
 			this.configure();
-			
+
 			// then start them
-			for (Component component: this.getConnectedComponents()) {
+			for (Component component : this.getConnectedComponents()) {
 				component.start();
 			}
-				setOcciAppState(Status.ACTIVE);
+			setOcciAppState(Status.ACTIVE);
 			break;
 
 		default:
 			break;
-}
+		}
 	}
+
 	// End of user code
 	private List<Component> getConnectedComponents() {
 		LinkedList<Component> connectedComponents = new LinkedList<Component>();
-		for (Link link: this.getLinks()) {
+		for (Link link : this.getLinks()) {
 			if (link instanceof Componentlink) {
 				connectedComponents.add((Component) link.getTarget());
 			}
 		}
 		return connectedComponents;
-		
-	}
-	
-	private boolean assertCompsStatusEquals(List<Component> components, Status status) {
-		for (Component component: components) {
-			if (component.getOcciComponentState().getValue() != status.getValue()) {
-				LOGGER.debug("Missmatching state of component " + component.getTitle() + " detected. "
-						+ "Expected " + status.getName() + " but was " 
-						+ component.getOcciComponentState().getName() + ".");
-				return false;
-			}
-		}	
-		return true;
-}
 
+	}
 
-}	
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/package-info.java

+/*******************************************************************************
+ * Copyright (c) 2019 University of Goettingen.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     - Johannes Erbel <johannes.erbel@cs.uni-goettingen.de>
+ *******************************************************************************/
+/**
+ *
+ */
+/**
+ * Main package for mocci connector dummy.
+ *
+ * @author erbel
+ *
+ */
+package de.ugoe.cs.rwm.mocci.connector;
\ No newline at end of file

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/DatagathererTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.NoSuchElementException;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.InfrastructureFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.PlatformFactory;
+import org.modmacao.occi.platform.Status;
+
+import de.ugoe.cs.rwm.mocci.connector.ConnectorFactory;
+import monitoring.Datagatherer;
+import monitoring.Monitorableproperty;
+import monitoring.Sensor;
+
+public class DatagathererTest {
+	ConnectorFactory fac = new ConnectorFactory();
+	PlatformFactory pFac = PlatformFactory.eINSTANCE;
+
+	@BeforeClass
+	public static void OCCIRegistrySetup() {
+		TestUtility.extensionRegistrySetup();
+
+	}
+
+	@Test
+	public void occiCreateDatagatherer() {
+		Datagatherer dg = fac.createDatagatherer();
+		dg.occiCreate();
+		assertTrue(true);
+	}
+
+	@Test
+	public void getDatagathererInactive() {
+		Datagatherer dg = createDatagatherer(Status.UNDEPLOYED);
+		Monitorableproperty monProp = getMonProp(getSensor(dg));
+		assertTrue(monProp.getMonitoringResult() == null);
+		dg.occiRetrieve();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertTrue(monProp.getMonitoringResult() == null);
+
+	}
+
+	@Test
+	public void DatagathererLifecycleToStart() {
+		Datagatherer dg = createDatagatherer(Status.UNDEPLOYED);
+		dg.deploy();
+		assertTrue(inState(dg, Status.DEPLOYED));
+		dg.configure();
+		assertTrue(inState(dg, Status.INACTIVE));
+		dg.start();
+		assertTrue(inState(dg, Status.ACTIVE));
+	}
+
+	@Test
+	public void DatagathererLifecycleToUndeployed() {
+		Datagatherer dg = createDatagatherer(Status.ACTIVE);
+		dg.stop();
+		assertTrue(inState(dg, Status.INACTIVE));
+		dg.undeploy();
+		assertTrue(inState(dg, Status.UNDEPLOYED));
+
+		Datagatherer rp2 = createDatagatherer(Status.DEPLOYED);
+		rp2.undeploy();
+		assertTrue(inState(dg, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DatagathererLifecycleDeployToUndeployed() {
+		Datagatherer dg = createDatagatherer(Status.DEPLOYED);
+		dg.undeploy();
+		assertTrue(inState(dg, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DatagathererLifecycleActiveToUndeploy() {
+		Datagatherer dg = createDatagatherer(Status.UNDEPLOYED);
+		dg.start();
+		dg.undeploy();
+		assertTrue(inState(dg, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DatagathererLifecycleActiveToStop() {
+		Datagatherer dg = createDatagatherer(Status.UNDEPLOYED);
+		dg.start();
+		dg.stop();
+		assertTrue(inState(dg, Status.INACTIVE));
+		dg.start();
+		assertTrue(inState(dg, Status.ACTIVE));
+	}
+
+	@Test
+	public void occiDatagathererRequests() {
+		Datagatherer dg = createDatagatherer(Status.UNDEPLOYED);
+		dg.occiCreate();
+		dg.occiRetrieve();
+		dg.occiUpdate();
+		dg.occiDelete();
+		assertTrue(true);
+	}
+
+	private Boolean inState(Datagatherer dg, Status deployed) {
+		return dg.getOcciComponentState().getValue() == deployed.getValue();
+	}
+
+	private Sensor getSensor(Datagatherer dg) {
+		for (Link link : dg.getRlinks()) {
+			if (link.getSource() instanceof Sensor) {
+				return ((Sensor) link.getSource());
+			}
+		}
+		throw new NoSuchElementException("No containing sensor found!");
+	}
+
+	private Monitorableproperty getMonProp(Sensor sensor) {
+		for (Link link : sensor.getLinks()) {
+			if (link instanceof Monitorableproperty) {
+				return ((Monitorableproperty) link);
+			}
+		}
+		throw new NoSuchElementException("No monitorableproperty found in sensor!");
+	}
+
+	private Datagatherer createDatagatherer(Status state) {
+		Sensor sens = fac.createSensor();
+
+		Datagatherer dg = fac.createDatagatherer();
+		dg.setOcciComponentState(state);
+		Componentlink cLink = pFac.createComponentlink();
+		cLink.setSource(sens);
+		cLink.setTarget(dg);
+
+		Compute vm = InfrastructureFactory.eINSTANCE.createCompute();
+		Monitorableproperty monProp = fac.createMonitorableproperty();
+		monProp.setSource(sens);
+		monProp.setTarget(vm);
+		monProp.setMonitoringProperty("CPU");
+
+		return dg;
+
+	}
+
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/DataprocessorTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertTrue;
+
+import java.util.NoSuchElementException;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.InfrastructureFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.PlatformFactory;
+import org.modmacao.occi.platform.Status;
+
+import de.ugoe.cs.rwm.mocci.connector.ConnectorFactory;
+import monitoring.Dataprocessor;
+import monitoring.Monitorableproperty;
+import monitoring.Sensor;
+
+public class DataprocessorTest {
+	ConnectorFactory fac = new ConnectorFactory();
+	PlatformFactory pFac = PlatformFactory.eINSTANCE;
+
+	@BeforeClass
+	public static void OCCIRegistrySetup() {
+		TestUtility.extensionRegistrySetup();
+
+	}
+
+	@Test
+	public void occiCreateDataprocessor() {
+		Dataprocessor dp = fac.createDataprocessor();
+		dp.occiCreate();
+		assertTrue(true);
+	}
+
+	@Test
+	public void getDataprocessorInactive() {
+		Dataprocessor dp = createDataprocessor(Status.UNDEPLOYED);
+		Monitorableproperty monProp = getMonProp(getSensor(dp));
+		assertTrue(monProp.getMonitoringResult() == null);
+		dp.occiRetrieve();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertTrue(monProp.getMonitoringResult() == null);
+
+	}
+
+	@Test
+	public void DataprocessorLifecycleToStart() {
+		Dataprocessor dp = createDataprocessor(Status.UNDEPLOYED);
+		dp.deploy();
+		assertTrue(inState(dp, Status.DEPLOYED));
+		dp.configure();
+		assertTrue(inState(dp, Status.INACTIVE));
+		dp.start();
+		assertTrue(inState(dp, Status.ACTIVE));
+	}
+
+	@Test
+	public void DataprocessorLifecycleToUndeployed() {
+		Dataprocessor dp = createDataprocessor(Status.ACTIVE);
+		dp.stop();
+		assertTrue(inState(dp, Status.INACTIVE));
+		dp.undeploy();
+		assertTrue(inState(dp, Status.UNDEPLOYED));
+
+		Dataprocessor rp2 = createDataprocessor(Status.DEPLOYED);
+		rp2.undeploy();
+		assertTrue(inState(dp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DataprocessorLifecycleDeployToUndeployed() {
+		Dataprocessor dp = createDataprocessor(Status.DEPLOYED);
+		dp.undeploy();
+		assertTrue(inState(dp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DataprocessorLifecycleActiveToUndeploy() {
+		Dataprocessor dp = createDataprocessor(Status.UNDEPLOYED);
+		dp.start();
+		dp.undeploy();
+		assertTrue(inState(dp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void DataprocessorLifecycleActiveToStop() {
+		Dataprocessor dp = createDataprocessor(Status.UNDEPLOYED);
+		dp.start();
+		dp.stop();
+		assertTrue(inState(dp, Status.INACTIVE));
+		dp.start();
+		assertTrue(inState(dp, Status.ACTIVE));
+	}
+
+	@Test
+	public void occiDataprocessorRequests() {
+		Dataprocessor dp = createDataprocessor(Status.UNDEPLOYED);
+		dp.occiCreate();
+		dp.occiRetrieve();
+		dp.occiUpdate();
+		dp.occiDelete();
+		assertTrue(true);
+	}
+
+	private Boolean inState(Dataprocessor dp, Status deployed) {
+		return dp.getOcciComponentState().getValue() == deployed.getValue();
+	}
+
+	private Sensor getSensor(Dataprocessor dp) {
+		for (Link link : dp.getRlinks()) {
+			if (link.getSource() instanceof Sensor) {
+				return ((Sensor) link.getSource());
+			}
+		}
+		throw new NoSuchElementException("No containing sensor found!");
+	}
+
+	private Monitorableproperty getMonProp(Sensor sensor) {
+		for (Link link : sensor.getLinks()) {
+			if (link instanceof Monitorableproperty) {
+				return ((Monitorableproperty) link);
+			}
+		}
+		throw new NoSuchElementException("No monitorableproperty found in sensor!");
+	}
+
+	private Dataprocessor createDataprocessor(Status state) {
+		Sensor sens = fac.createSensor();
+
+		Dataprocessor dp = fac.createDataprocessor();
+		dp.setOcciComponentState(state);
+		Componentlink cLink = pFac.createComponentlink();
+		cLink.setSource(sens);
+		cLink.setTarget(dp);
+
+		Compute vm = InfrastructureFactory.eINSTANCE.createCompute();
+		Monitorableproperty monProp = fac.createMonitorableproperty();
+		monProp.setSource(sens);
+		monProp.setTarget(vm);
+		monProp.setMonitoringProperty("CPU");
+
+		return dp;
+
+	}
+
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/HelperTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.Properties;
+
+import org.junit.Test;
+
+import de.ugoe.cs.rwm.mocci.connector.ResultproviderHelper;
+
+public class HelperTest {
+
+	@Test
+	public void testGetProperties() {
+		ResultproviderHelper helper = new ResultproviderHelper();
+		Properties props = helper.getProperties();
+		assertEquals("None,Low,Medium,High,Critical,3000", props.getProperty("CPU"));
+	}
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/MonitorablepropertyTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertTrue;
+
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.modmacao.occi.platform.PlatformFactory;
+
+import de.ugoe.cs.rwm.mocci.connector.ConnectorFactory;
+import monitoring.Monitorableproperty;
+
+public class MonitorablepropertyTest {
+	ConnectorFactory fac = new ConnectorFactory();
+	PlatformFactory pFac = PlatformFactory.eINSTANCE;
+
+	@BeforeClass
+	public static void OCCIRegistrySetup() {
+		TestUtility.extensionRegistrySetup();
+
+	}
+
+	@Test
+	public void occiDataprocessorRequests() {
+		Monitorableproperty monprop = fac.createMonitorableproperty();
+		monprop.occiCreate();
+		monprop.occiRetrieve();
+		monprop.occiUpdate();
+		monprop.occiDelete();
+		assertTrue(true);
+	}
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/ResultproviderTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Field;
+import java.util.NoSuchElementException;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.InfrastructureFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.PlatformFactory;
+import org.modmacao.occi.platform.Status;
+
+import de.ugoe.cs.rwm.mocci.connector.ConnectorFactory;
+import de.ugoe.cs.rwm.mocci.connector.ResultproviderConnector;
+import monitoring.Monitorableproperty;
+import monitoring.Occiresultprovider;
+import monitoring.Resultprovider;
+import monitoring.Sensor;
+
+public class ResultproviderTest {
+	ConnectorFactory fac = new ConnectorFactory();
+	PlatformFactory pFac = PlatformFactory.eINSTANCE;
+
+	@BeforeClass
+	public static void OCCIRegistrySetup() {
+		TestUtility.extensionRegistrySetup();
+
+	}
+
+	@Test(expected = NoSuchElementException.class)
+	public void startSimulationWithoutSensor() {
+		Resultprovider rp = fac.createResultprovider();
+		rp.start();
+	}
+
+	@Test
+	public void startSimulationWithSensor() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		Monitorableproperty monProp = getMonProp(getSensor(rp));
+		assertTrue(monProp.getMonitoringResult() == null);
+		rp.start();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertFalse(monProp.getMonitoringResult().contains(","));
+	}
+
+	@Test
+	public void startSimulationWithSensorQuotes() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		Monitorableproperty monProp = getMonProp(getSensor(rp));
+		monProp.setMonitoringProperty("MecoTaskResultForEach");
+		assertTrue(monProp.getMonitoringResult() == null);
+		rp.start();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertTrue(monProp.getMonitoringResult().contains(","));
+	}
+
+	@Test
+	public void occiCreateResultprovider() {
+		Resultprovider rp = fac.createResultprovider();
+		rp.occiCreate();
+		assertTrue(true);
+	}
+
+	@Test
+	public void getResultproviderActiveState() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.setOcciComponentState(Status.ACTIVE);
+		Monitorableproperty monProp = getMonProp(getSensor(rp));
+		assertTrue(monProp.getMonitoringResult() == null);
+		rp.occiRetrieve();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertTrue(monProp.getMonitoringResult() != null);
+
+	}
+
+	@Test
+	public void getResultproviderInactive() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		Monitorableproperty monProp = getMonProp(getSensor(rp));
+		assertTrue(monProp.getMonitoringResult() == null);
+		rp.occiRetrieve();
+
+		try {
+			Thread.sleep(4000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		assertTrue(monProp.getMonitoringResult() == null);
+
+	}
+
+	@Test
+	public void stopResultproviderInactive() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.start();
+		Thread t = getSimulationThread(rp);
+		assertTrue(t.isAlive());
+		rp.occiDelete();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		assertFalse(t.isAlive());
+	}
+
+	@Test
+	public void ResultproviderLifecycleToStart() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.deploy();
+		assertTrue(inState(rp, Status.DEPLOYED));
+		rp.configure();
+		assertTrue(inState(rp, Status.INACTIVE));
+		rp.start();
+		assertTrue(inState(rp, Status.ACTIVE));
+	}
+
+	@Test
+	public void ResultproviderLifecycleToUndeployed() {
+		Resultprovider rp = createResultprovider(Status.ACTIVE);
+		rp.stop();
+		assertTrue(inState(rp, Status.INACTIVE));
+		rp.undeploy();
+		assertTrue(inState(rp, Status.UNDEPLOYED));
+
+		Resultprovider rp2 = createResultprovider(Status.DEPLOYED);
+		rp2.undeploy();
+		assertTrue(inState(rp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void ResultproviderLifecycleDeployToUndeployed() {
+		Resultprovider rp = createResultprovider(Status.DEPLOYED);
+		rp.undeploy();
+		assertTrue(inState(rp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void ResultproviderLifecycleActiveToUndeploy() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.start();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Thread t = getSimulationThread(rp);
+		assertTrue(t.isAlive());
+
+		rp.undeploy();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		assertFalse(t.isAlive());
+		assertTrue(inState(rp, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void ResultproviderLifecycleActiveToStop() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.start();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Thread t = getSimulationThread(rp);
+		assertTrue(t.isAlive());
+
+		rp.stop();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		assertFalse(t.isAlive());
+		assertTrue(inState(rp, Status.INACTIVE));
+		rp.start();
+		try {
+			Thread.sleep(1000);
+		} catch (InterruptedException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+		Thread newT = getSimulationThread(rp);
+		assertTrue(newT.isAlive());
+		assertTrue(inState(rp, Status.ACTIVE));
+	}
+
+	@Test
+	public void occiRequestsResultprovider() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		rp.occiCreate();
+		rp.occiRetrieve();
+		rp.occiUpdate();
+		rp.occiDelete();
+		assertTrue(true);
+	}
+
+	@Test
+	public void occiResultproviderRequests() {
+		Resultprovider rp = createResultprovider(Status.UNDEPLOYED);
+		Occiresultprovider orp = fac.createOcciresultprovider();
+		rp.getParts().add(orp);
+		assertTrue(true);
+	}
+
+	private Boolean inState(Resultprovider rp, Status deployed) {
+		return rp.getOcciComponentState().getValue() == deployed.getValue();
+	}
+
+	private Thread getSimulationThread(Resultprovider rp) {
+		Class<ResultproviderConnector> rpc = ResultproviderConnector.class;
+		Field f = null;
+		try {
+			f = rpc.getDeclaredField("simulation");
+			f.setAccessible(true);
+			return (Thread) f.get(rp);
+		} catch (NoSuchFieldException | SecurityException | IllegalArgumentException | IllegalAccessException e) {
+			assertTrue(false);
+		}
+		throw new NoSuchElementException("Simulation thread could not be found!");
+	}
+
+	private Sensor getSensor(Resultprovider rp) {
+		for (Link link : rp.getRlinks()) {
+			if (link.getSource() instanceof Sensor) {
+				return ((Sensor) link.getSource());
+			}
+		}
+		throw new NoSuchElementException("No containing sensor found!");
+	}
+
+	private Monitorableproperty getMonProp(Sensor sensor) {
+		for (Link link : sensor.getLinks()) {
+			if (link instanceof Monitorableproperty) {
+				return ((Monitorableproperty) link);
+			}
+		}
+		throw new NoSuchElementException("No monitorableproperty found in sensor!");
+	}
+
+	private Resultprovider createResultprovider(Status state) {
+		Sensor sens = fac.createSensor();
+
+		Resultprovider rp = fac.createResultprovider();
+		rp.setOcciComponentState(state);
+		Componentlink cLink = pFac.createComponentlink();
+		cLink.setSource(sens);
+		cLink.setTarget(rp);
+
+		Compute vm = InfrastructureFactory.eINSTANCE.createCompute();
+		Monitorableproperty monProp = fac.createMonitorableproperty();
+		monProp.setSource(sens);
+		monProp.setTarget(vm);
+		monProp.setMonitoringProperty("CPU");
+
+		return rp;
+
+	}
+
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/SensorTest.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+import static org.junit.Assert.assertTrue;
+
+import org.eclipse.cmf.occi.core.Link;
+import org.eclipse.cmf.occi.infrastructure.Compute;
+import org.eclipse.cmf.occi.infrastructure.InfrastructureFactory;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.modmacao.occi.platform.Component;
+import org.modmacao.occi.platform.Componentlink;
+import org.modmacao.occi.platform.PlatformFactory;
+import org.modmacao.occi.platform.Status;
+
+import de.ugoe.cs.rwm.mocci.connector.ConnectorFactory;
+import monitoring.Datagatherer;
+import monitoring.Dataprocessor;
+import monitoring.Monitorableproperty;
+import monitoring.Resultprovider;
+import monitoring.Sensor;
+
+public class SensorTest {
+	ConnectorFactory fac = new ConnectorFactory();
+	PlatformFactory pFac = PlatformFactory.eINSTANCE;
+
+	@BeforeClass
+	public static void OCCIRegistrySetup() {
+		TestUtility.extensionRegistrySetup();
+	}
+
+	@Test
+	public void startSensorLifecycleToStart() {
+		Sensor sens = createSensor(Status.UNDEPLOYED);
+		sens.deploy();
+		assertTrue(inState(sens, Status.DEPLOYED));
+		sens.configure();
+		assertTrue(inState(sens, Status.INACTIVE));
+		sens.start();
+		assertTrue(inState(sens, Status.ACTIVE));
+	}
+
+	@Test
+	public void startSensorLifecycleToUndeploy() {
+		Sensor sens = createSensor(Status.ACTIVE);
+		sens.stop();
+		assertTrue(inState(sens, Status.INACTIVE));
+		sens.undeploy();
+		assertTrue(inState(sens, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void stopSensorActiveToUndeploy() {
+		Sensor sens = createSensor(Status.ACTIVE);
+		sens.undeploy();
+		assertTrue(inState(sens, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void stopSensorUndeployToStart() {
+		Sensor sens = createSensor(Status.UNDEPLOYED);
+		sens.start();
+		assertTrue(inState(sens, Status.ACTIVE));
+	}
+
+	@Test
+	public void startSensorDeployToUndeploy() {
+		Sensor sens = createSensor(Status.DEPLOYED);
+		sens.undeploy();
+		assertTrue(inState(sens, Status.UNDEPLOYED));
+	}
+
+	@Test
+	public void occiSensorRequests() {
+		Sensor sens = createSensor(Status.UNDEPLOYED);
+		sens.occiCreate();
+		sens.occiRetrieve();
+		sens.occiUpdate();
+		sens.occiDelete();
+		assertTrue(true);
+	}
+
+	private Boolean inState(Sensor sens, Status state) {
+		System.out.println(sens.getOcciAppState());
+		if (sens.getOcciAppState().getValue() != state.getValue()) {
+			return false;
+		}
+		for (Link link : sens.getLinks()) {
+			if (link instanceof Componentlink) {
+				Component comp = (Component) link.getTarget();
+				System.out.println(comp.getOcciComponentState());
+				if ((comp.getOcciComponentState().getValue() == state.getValue()) == false) {
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	private Sensor createSensor(Status state) {
+		Sensor sens = fac.createSensor();
+		sens.setOcciAppState(state);
+
+		Resultprovider rp = fac.createResultprovider();
+		rp.setOcciComponentState(state);
+		rp.setOcciComponentState(state);
+		Componentlink cLink = pFac.createComponentlink();
+		cLink.setSource(sens);
+		cLink.setTarget(rp);
+
+		Compute vm = InfrastructureFactory.eINSTANCE.createCompute();
+		Monitorableproperty monProp = fac.createMonitorableproperty();
+		monProp.setSource(sens);
+		monProp.setTarget(vm);
+		monProp.setMonitoringProperty("CPU");
+
+		Datagatherer dg = fac.createDatagatherer();
+		dg.setOcciComponentState(state);
+		Componentlink cLink2 = pFac.createComponentlink();
+		cLink2.setSource(sens);
+		cLink2.setTarget(dg);
+
+		Dataprocessor dp = fac.createDataprocessor();
+		dp.setOcciComponentState(state);
+		Componentlink cLink3 = pFac.createComponentlink();
+		cLink3.setSource(sens);
+		cLink3.setTarget(dp);
+
+		return sens;
+
+	}
+}

de.ugoe.cs.rwm.mocci.connector.dummy/src-test/de/ugoe/cs/rwm/mocci/connector/dummy/TestUtility.java

+package de.ugoe.cs.rwm.mocci.connector.dummy;
+
+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.occi.platform.PlatformPackage;
+
+import monitoring.MonitoringPackage;
+
+public class TestUtility {
+	public static void extensionRegistrySetup() {
+		InfrastructurePackage.eINSTANCE.eClass();
+		OCCIPackage.eINSTANCE.eClass();
+		PlatformPackage.eINSTANCE.eClass();
+		MonitoringPackage.eINSTANCE.eClass();
+
+		OcciRegistry.getInstance().registerExtension("http://schemas.modmacao.org/occi/platform#",
+				PlatformPackage.class.getClassLoader().getResource("model/platform.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/monitoring#",
+				MonitoringPackage.class.getClassLoader().getResource("model/monitoring.occie").toString());
+
+	}
+}

de.ugoe.cs.rwm.mocci.connector/.settings/org.eclipse.buildship.core.prefs

-connection.project.dir=
+connection.project.dir=../de.ugoe.cs.rwm.mocci.connector.dummy
 eclipse.preferences.version=1

de.ugoe.cs.rwm.mocci.connector/README.md

+# Monitoring Connector
+Each element in the monitoring extension has a single file in the connector implementing how to react on different REST requests addressing the corresponding OCCI element.
+As the elements of the monitoring extension mainly inherit from elements of the enhanced platform extension provided by [MoDMaCAO](https://github.com/occiware/MoDMaCAO), the implementation of the lifecycle actions is quite similar. To handle the management of each individual component of a sensor, configuration management scripts have to be attached to them. Thus, in comparison to the [dummy connector](https://gitlab.gwdg.de/rwm/de.ugoe.cs.rwm.mocci/tree/master/de.ugoe.cs.rwm.mocci.connector.dummy), this connector allows for an actual deployment and management of sensors in a cloud environment. The skeleton for the connector of the OCCI monitoring extension is generated using [OCCI-Studio](https://github.com/occiware/OCCI-Studio).
+
+
+## Attaching Configuration Management Scripts
+To attach a configuration management script to a component, a user mixin serving as tag has to be created.
+Moreover, the component managed over the defined script has to have this mixin attached.
+Finally, the script itself is located on the MartServer, typically in a folder called roles, and has the same name
+as the mixin tag.
+The following figure gives an example of such an attachment. 
+Here, the blue element is the User Mixin which is attached to the DataGatherer which is managed over lifecycle
+actions as described in the configuration management script called glances, located in the roles folder of the MartServer.
+
+
+![Attachment](./example.jpg "Attachment")
+
+*Note:* Currently, MoDMaCAO only provides a connector for [ansible](https://docs.ansible.com/).

de.ugoe.cs.rwm.mocci.connector/build.gradle

-// Apply the java-library plugin to add support for Java Library
-apply plugin : 'eclipse'
-apply plugin: 'java'
-apply plugin: 'maven'
-
-
-// In this section you declare where to find the dependencies of your project
-repositories {
-    // Use jcenter for resolving your dependencies.
-    // You can declare any Maven/Ivy/file repository here.
-    //mavenLocal()
-    mavenCentral()
-    
-    maven {
-          url "https://nexus.informatik.uni-goettingen.de/content/repositories/thirdparty/"
-    }
-    maven {
-          url "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/"
-    }
-}
-
 dependencies {
-
-//Require-Bundle: org.eclipse.core.runtime,
-// org.eclipse.emf.ecore;visibility:=reexport,
-
- //org.eclipse.ocl.examples.codegen;visibility:=reexport,
-
     //Nexus
     compile group: 'org.eclipse.ocl', name: 'pivot', version: '1.3.0'
-    //compile group: 'de.ugoe.cs.rwm.wocci', name: 'model', version: '1.0.0'
     //occiware
     compile group: 'org.eclipse.cmf.occi', name: 'core', version: '1.0.0'
     compile group: 'org.modmacao.occi', name: 'platform', version: '1.0.0'
     compile group: 'org.modmacao', name: 'cm', version: '1.0.0'
     compile group: 'org.modmacao', name: 'core', version: '1.0.0'
-    compile group: 'org.modmacao.core', name: 'connector', version : '1.0.0'
+    compile group: 'org.modmacao.core', name: 'connector', version: '1.0.0'
     compile group: 'commons-io', name: 'commons-io', version: '2.6'
-    
-    
-    
+
     //maven
     compile group: 'org.slf4j', name: 'slf4j-api', version: '1.7.25'
-        compile group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.15.0'
+    compile group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore', version: '2.15.0'
     compile group: 'org.eclipse.emf', name: 'org.eclipse.emf.ecore.xmi', version: '2.15.0'
 
-    
     testCompile group: 'junit', name: 'junit', version: '4.12'
 }
 
@@ -52,27 +21,32 @@ sourceSets {
     main {
         java {
             srcDir 'src-gen'
-            }
-        //output.classesDir = "$workDir/client/program"
         }
+        //output.classesDir = "$workDir/client/program"
     }
-    
+}
+
 processResources {
-   from("."){
-    include("plugin.xml")
-   }
+    from(".") {
+        include("plugin.xml")
+        include("mocci.properties")
+    }
 }
-   
-    
+
+
 uploadArchives {
     repositories {
-       mavenDeployer {
-             repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
-             authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
+        mavenDeployer {
+            repository(url: "https://nexus.informatik.uni-goettingen.de/content/repositories/rwm/") {
+                authentication(userName: System.getenv('NEXUSUSER'), password: System.getenv('NEXUSPASSWORD'))
             }
-            pom.version = "1.0.0"
-             pom.artifactId = "connector"
-             pom.groupId = "de.ugoe.cs.rwm.mocci"
-       }
+            if (System.getenv('VERSION') != null) {
+                pom.version = System.getenv('VERSION')
+                println "Version is set to: " + System.getenv('VERSION')
+            }
+            pom.version = "SNAPSHOT"
+            pom.artifactId = "connector"
+            pom.groupId = "de.ugoe.cs.rwm.mocci"
+        }
     }
 }

de.ugoe.cs.rwm.mocci.connector/mocci.properties

+default_endpoint=172.19.0.1:8080
\ No newline at end of file

de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ComponentManager.java

@@ -5,6 +5,7 @@ import java.util.List;
 
 import org.eclipse.cmf.occi.core.Link;
 import org.eclipse.cmf.occi.core.MixinBase;
+import org.eclipse.cmf.occi.infrastructure.Compute;
 import org.modmacao.cm.ConfigurationManagementTool;
 import org.modmacao.cm.ansible.AnsibleCMTool;
 import org.modmacao.occi.platform.Component;
@@ -15,211 +16,206 @@ import modmacao.Installationdependency;
 
 public class ComponentManager {
 
-	
 	private ConfigurationManagementTool cmtool = new AnsibleCMTool();
 	private Component comp;
-	
+
 	public ComponentManager(Component comp) {
 		this.comp = comp;
 	}
-	
 
 	public void undeploy() {
 
-				switch(comp.getOcciComponentState().getValue()) {
-
-				case Status.ACTIVE_VALUE:
-					
-					comp.stop();
-					cmtool.undeploy(comp);
-					comp.setOcciComponentState(Status.UNDEPLOYED);
-					break;
-
+		switch (comp.getOcciComponentState().getValue()) {
 
-				case Status.INACTIVE_VALUE:
-					cmtool.undeploy(comp);
-					comp.setOcciComponentState(Status.UNDEPLOYED);
-					break;
+		case Status.ACTIVE_VALUE:
 
+			comp.stop();
+			cmtool.undeploy(comp);
+			comp.setOcciComponentState(Status.UNDEPLOYED);
+			break;
 
-				case Status.DEPLOYED_VALUE:
-					cmtool.undeploy(comp);
-					comp.setOcciComponentState(Status.UNDEPLOYED);
-					break;
+		case Status.INACTIVE_VALUE:
+			cmtool.undeploy(comp);
+			comp.setOcciComponentState(Status.UNDEPLOYED);
+			break;
 
+		case Status.DEPLOYED_VALUE:
+			cmtool.undeploy(comp);
+			comp.setOcciComponentState(Status.UNDEPLOYED);
+			break;
 
-				case Status.ERROR_VALUE:
-					cmtool.undeploy(comp);
-					comp.setOcciComponentState(Status.UNDEPLOYED);
-					break;
+		case Status.ERROR_VALUE:
+			cmtool.undeploy(comp);
+			comp.setOcciComponentState(Status.UNDEPLOYED);
+			break;
 
-				default:
-					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: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: deploy -
+	 * title:
 	 */
-	public void deploy()
-	{
+	public void deploy() {
 		int status = -1;
 
 		// Component State Machine.
-		switch(comp.getOcciComponentState().getValue()) {
+		switch (comp.getOcciComponentState().getValue()) {
 
 		case Status.UNDEPLOYED_VALUE:
-			for (Component component: getInstallDependendComps()) {
+			for (Component component : getInstallDependendComps()) {
 				component.deploy();
 			}
 			status = cmtool.deploy(comp);
-			
-			if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.DEPLOYED))
+
+			if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.DEPLOYED)) {
 				comp.setOcciComponentState(Status.DEPLOYED);
-			else
+			} else {
 				comp.setOcciComponentState(Status.ERROR);
+			}
 			break;
 
 		default:
 			break;
-}
+		}
 	}
+
 	// End of user code
 	// Start of user code Publisher_Kind_configure_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: configure
+	 * - title:
 	 */
-	public void configure()
-	{
+	public void configure() {
 		int status = -1;
 
 		// Component State Machine.
-		switch(comp.getOcciComponentState().getValue()) {
+		switch (comp.getOcciComponentState().getValue()) {
 
 		case Status.DEPLOYED_VALUE:
-			for (Component component: getInstallDependendComps()) {
+			for (Component component : getInstallDependendComps()) {
 				component.configure();
 			}
 			status = cmtool.configure(comp);
-			
-			if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.INACTIVE))
+
+			if (status == 0 && assertCompsStatusEquals(getInstallDependendComps(), Status.INACTIVE)) {
 				comp.setOcciComponentState(Status.INACTIVE);
-			else
+			} else {
 				comp.setOcciComponentState(Status.ERROR);
+			}
 			break;
 
 		default:
 			break;
-}
+		}
 	}
+
 	// End of user code
 	// Start of user code Publisher_Kind_Start_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: start
-     * - title: Start the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: start -
+	 * title: Start the application.
 	 */
-	public void start()
-	{
+	public void start() {
 		int status = -1;
 
 		// Component State Machine.
-		switch(comp.getOcciComponentState().getValue()) {
+		switch (comp.getOcciComponentState().getValue()) {
 
 		case Status.INACTIVE_VALUE:
-			for (Component component: getExecutionDependendComps()) {
+			for (Component component : getExecutionDependendComps()) {
 				component.start();
 			}
-			
+
 			status = cmtool.start(comp);
-						
-			if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE))
+
+			if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE)) {
 				comp.setOcciComponentState(Status.ACTIVE);
-			else
+			} else {
 				comp.setOcciComponentState(Status.ERROR);
-			
-			break;
+			}
 
+			break;
 
 		case Status.UNDEPLOYED_VALUE:
-			for (Component component: getInstallDependendComps()) {
+			for (Component component : getInstallDependendComps()) {
 				component.deploy();
 			}
 			comp.deploy();
-			
-			for (Component component: getInstallDependendComps()) {
+
+			for (Component component : getInstallDependendComps()) {
 				component.configure();
 			}
 			comp.configure();
-			
-			for (Component component: getExecutionDependendComps()) {
+
+			for (Component component : getExecutionDependendComps()) {
 				component.start();
 			}
-			
+
 			status = cmtool.start(comp);
-			
-			if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE))
+
+			if (status == 0 && assertCompsStatusEquals(getExecutionDependendComps(), Status.ACTIVE)) {
 				comp.setOcciComponentState(Status.ACTIVE);
-			else 
+			} else {
 				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.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: stop -
+	 * title: Stop the application.
 	 */
-	public void stop()
-	{
-		int status = -1;
+	public void stop() {
 		// Component State Machine.
-		switch(comp.getOcciComponentState().getValue()) {
+		switch (comp.getOcciComponentState().getValue()) {
 
 		case Status.ACTIVE_VALUE:
-			
-			status = cmtool.stop(comp);
-						
+
+			cmtool.stop(comp);
+
 			comp.setOcciComponentState(Status.INACTIVE);
-		
+
 			break;
 
 		default:
 			break;
-}
+		}
 	}
 	// End of user code
-		
-	private List<Component> getInstallDependendComps(){
+
+	private List<Component> getInstallDependendComps() {
 		LinkedList<Component> dependendComponents = new LinkedList<Component>();
-		for (Link link: comp.getLinks()) {
-			for (MixinBase mixin: link.getParts()) {
+		for (Link link : comp.getLinks()) {
+			for (MixinBase mixin : link.getParts()) {
 				if (mixin instanceof Installationdependency) {
 					dependendComponents.add((Component) link.getTarget());
 					break;
 				}
 			}
 		}
-		return dependendComponents;		
+		return dependendComponents;
 	}
-	
-	private List<Component> getExecutionDependendComps(){
+
+	private List<Component> getExecutionDependendComps() {
 		LinkedList<Component> dependendComponents = new LinkedList<Component>();
-		for (Link link: comp.getLinks()) {
-			for (MixinBase mixin: link.getParts()) {
+		for (Link link : comp.getLinks()) {
+			for (MixinBase mixin : link.getParts()) {
 				if (mixin instanceof Executiondependency) {
 					dependendComponents.add((Component) link.getTarget());
 					break;
@@ -228,14 +224,24 @@ public class ComponentManager {
 		}
 		return dependendComponents;
 	}
-	
+
 	private boolean assertCompsStatusEquals(List<Component> components, Status status) {
-		for (Component component: components) {
+		for (Component component : components) {
 			if (component.getOcciComponentState().getValue() != status.getValue()) {
 				return false;
 			}
-		}	
+		}
 		return true;
-}
+	}
 
-}	
\ No newline at end of file
+	public static boolean isConnectedToCompute(Component comp) {
+		for (Link link : comp.getLinks()) {
+			if (link.getTarget() != null) {
+				if (link.getTarget() instanceof Compute) {
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
\ No newline at end of file

de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ConnectorFactory.java

 /**
  * Copyright (c) 2016-2017 Inria
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  * - Philippe Merle <philippe.merle@inria.fr>
  * - Faiez Zalila <faiez.zalila@inria.fr>
  *
- * Generated at Wed Dec 19 11:10:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
+ * Generated at Wed Jan 02 16:14:48 CET 2019 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
  */
+
 package de.ugoe.cs.rwm.mocci.connector;
 
 /**
- * Connector EFactory for the OCCI extension:
- * - name: monitoring
- * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
+ * Connector EFactory for the OCCI extension: - name: monitoring - scheme:
+ * http://schemas.ugoe.cs.rwm/monitoring#
  */
-public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
-{
+public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl {
 	/**
-	 * EFactory method for OCCI kind:
-	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: sensor
-	 * - title: Sensor Component
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: sensor - title: Sensor
+	 * Component
 	 */
 	@Override
 	public monitoring.Sensor createSensor() {
@@ -33,10 +31,9 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	}
 
 	/**
-	 * EFactory method for OCCI kind:
-	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: datagatherer
-	 * - title: DataGatherer Resource
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: datagatherer - title:
+	 * DataGatherer Resource
 	 */
 	@Override
 	public monitoring.Datagatherer createDatagatherer() {
@@ -44,36 +41,43 @@ public class ConnectorFactory extends monitoring.impl.MonitoringFactoryImpl
 	}
 
 	/**
-	 * EFactory method for OCCI kind:
-	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: processor
-	 * - title: Processor Resource
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: processor - title: Processor
+	 * Resource
+	 */
+	@Override
+	public monitoring.Dataprocessor createDataprocessor() {
+		return new DataprocessorConnector();
+	}
+
+	/**
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: publisher - title: Publisher
+	 * Resource
 	 */
 	@Override
-	public monitoring.Processor createProcessor() {
-		return new ProcessorConnector();
+	public monitoring.Resultprovider createResultprovider() {
+		return new ResultproviderConnector();
 	}
 
 	/**
-	 * EFactory method for OCCI kind:
-	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: publisher
-	 * - title: Publisher Resource
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: monitoringproperty - title:
+	 * MonitoringProperty Component
 	 */
 	@Override
-	public monitoring.Publisher createPublisher() {
-		return new PublisherConnector();
+	public monitoring.Monitorableproperty createMonitorableproperty() {
+		return new MonitorablepropertyConnector();
 	}
 
 	/**
-	 * EFactory method for OCCI kind:
-	 * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
-	 * - term: monitoringproperties
-	 * - title: MonitoringProperty Mixin
+	 * EFactory method for OCCI kind: - scheme:
+	 * http://schemas.ugoe.cs.rwm/monitoring# - term: martpublisher - title:
+	 * MartPublisher Mixin
 	 */
 	@Override
-	public monitoring.Monitoringproperties createMonitoringproperties() {
-		return new MonitoringpropertiesConnector();
+	public monitoring.Occiresultprovider createOcciresultprovider() {
+		return new OcciresultproviderConnector();
 	}
 
 }

de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java

 /**
  * Copyright (c) 2016-2017 Inria
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  * - Philippe Merle <philippe.merle@inria.fr>
  * - Faiez Zalila <faiez.zalila@inria.fr>
  *
  * Generated at Wed Dec 19 11:10:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
  */
+
 package de.ugoe.cs.rwm.mocci.connector;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 /**
- * Connector implementation for the OCCI kind:
- * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: datagatherer
- * - title: DataGatherer Resource
+ * Connector implementation for the OCCI kind: - scheme:
+ * http://schemas.ugoe.cs.rwm/monitoring# - term: datagatherer - title:
+ * DataGatherer Resource
  */
-public class DatagathererConnector extends monitoring.impl.DatagathererImpl
-{
+public class DatagathererConnector extends monitoring.impl.DatagathererImpl {
 	/**
 	 * Initialize the logger.
 	 */
 	private static Logger LOGGER = LoggerFactory.getLogger(DatagathererConnector.class);
 	private ComponentManager compMan;
+
 	// Start of user code Datagathererconnector_constructor
 	/**
 	 * Constructs a datagatherer connector.
 	 */
-	DatagathererConnector()
-	{
+	DatagathererConnector() {
 		LOGGER.debug("Constructor called on " + this);
 		this.compMan = new ComponentManager(this);
 		// TODO: Implement this constructor.
@@ -46,14 +43,13 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
 	//
 	// OCCI CRUD callback operations.
 	//
-	
+
 	// Start of user code DatagathererocciCreate
 	/**
 	 * Called when this Datagatherer instance is completely created.
 	 */
 	@Override
-	public void occiCreate()
-	{
+	public void occiCreate() {
 		LOGGER.debug("occiCreate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -64,8 +60,7 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
 	 * Called when this Datagatherer instance must be retrieved.
 	 */
 	@Override
-	public void occiRetrieve()
-	{
+	public void occiRetrieve() {
 		LOGGER.debug("occiRetrieve() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -76,8 +71,7 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
 	 * Called when this Datagatherer instance is completely updated.
 	 */
 	@Override
-	public void occiUpdate()
-	{
+	public void occiUpdate() {
 		LOGGER.debug("occiUpdate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -88,10 +82,12 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
 	 * Called when this Datagatherer instance will be deleted.
 	 */
 	@Override
-	public void occiDelete()
-	{
+	public void occiDelete() {
 		LOGGER.debug("occiDelete() called on " + this);
-		// TODO: Implement this callback or remove this method.
+		if (ComponentManager.isConnectedToCompute(this)) {
+			this.stop();
+			this.undeploy();
+		}
 	}
 	// End of user code
 
@@ -101,80 +97,72 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
 
 	// Start of user code Datagatherer_Kind_deploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: deploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: deploy -
+	 * title:
 	 */
 	@Override
-	public void deploy()
-	{
+	public void deploy() {
 		LOGGER.debug("Action deploy() called on " + this);
 		compMan.deploy();
 		// TODO: Implement how to deploy this datagatherer.
 	}
+
 	// End of user code
 	// Start of user code Datagatherer_Kind_Stop_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: stop
-     * - title: Stop the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: stop -
+	 * title: Stop the application.
 	 */
 	@Override
-	public void stop()
-	{
+	public void stop() {
 		LOGGER.debug("Action stop() called on " + this);
 		compMan.stop();
 		// TODO: Implement how to stop this datagatherer.
 	}
+
 	// End of user code
 	// Start of user code Datagatherer_Kind_Start_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: start
-     * - title: Start the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: start -
+	 * title: Start the application.
 	 */
 	@Override
-	public void start()
-	{
+	public void start() {
 		LOGGER.debug("Action start() called on " + this);
 		compMan.start();
 		// TODO: Implement how to start this datagatherer.
 	}
+
 	// End of user code
 	// Start of user code Datagatherer_Kind_configure_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: configure
+	 * - title:
 	 */
 	@Override
-	public void configure()
-	{
+	public void configure() {
 		LOGGER.debug("Action configure() called on " + this);
 		compMan.configure();
 		// TODO: Implement how to configure this datagatherer.
 	}
+
 	// End of user code
 	// Start of user code Datagatherer_Kind_undeploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: undeploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: undeploy
+	 * - title:
 	 */
 	@Override
-	public void undeploy()
-	{
+	public void undeploy() {
 		LOGGER.debug("Action undeploy() called on " + this);
 		compMan.undeploy();
 		// TODO: Implement how to undeploy this datagatherer.
 	}
 	// End of user code
-		
-
 
-}	
+}

de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/ProcessorConnector.java → de.ugoe.cs.rwm.mocci.connector/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java

 /**
  * Copyright (c) 2016-2017 Inria
- *  
+ *
  * All rights reserved. This program and the accompanying materials
  * are made available under the terms of the Eclipse Public License v1.0
  * which accompanies this distribution, and is available at
  * http://www.eclipse.org/legal/epl-v10.html
- * 
+ *
  * Contributors:
  * - Philippe Merle <philippe.merle@inria.fr>
  * - Faiez Zalila <faiez.zalila@inria.fr>
  *
  * Generated at Wed Dec 19 11:10:50 CET 2018 from platform:/resource/monitoring/model/monitoring.occie by org.eclipse.cmf.occi.core.gen.connector
  */
+
 package de.ugoe.cs.rwm.mocci.connector;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-
-
 /**
- * Connector implementation for the OCCI kind:
- * - scheme: http://schemas.ugoe.cs.rwm/monitoring#
- * - term: processor
- * - title: Processor Resource
+ * Connector implementation for the OCCI kind: - scheme:
+ * http://schemas.ugoe.cs.rwm/monitoring# - term: processor - title: Processor
+ * Resource
  */
-public class ProcessorConnector extends monitoring.impl.ProcessorImpl
-{
+public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl {
 	/**
 	 * Initialize the logger.
 	 */
-	private static Logger LOGGER = LoggerFactory.getLogger(ProcessorConnector.class);
+	private static Logger LOGGER = LoggerFactory.getLogger(DataprocessorConnector.class);
 	private ComponentManager compMan;
+
 	// Start of user code Processorconnector_constructor
 	/**
 	 * Constructs a processor connector.
 	 */
-	ProcessorConnector()
-	{
+	DataprocessorConnector() {
 		LOGGER.debug("Constructor called on " + this);
 		this.compMan = new ComponentManager(this);
 		// TODO: Implement this constructor.
@@ -46,14 +43,13 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 	//
 	// OCCI CRUD callback operations.
 	//
-	
+
 	// Start of user code ProcessorocciCreate
 	/**
 	 * Called when this Processor instance is completely created.
 	 */
 	@Override
-	public void occiCreate()
-	{
+	public void occiCreate() {
 		LOGGER.debug("occiCreate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -64,8 +60,7 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 	 * Called when this Processor instance must be retrieved.
 	 */
 	@Override
-	public void occiRetrieve()
-	{
+	public void occiRetrieve() {
 		LOGGER.debug("occiRetrieve() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -76,8 +71,7 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 	 * Called when this Processor instance is completely updated.
 	 */
 	@Override
-	public void occiUpdate()
-	{
+	public void occiUpdate() {
 		LOGGER.debug("occiUpdate() called on " + this);
 		// TODO: Implement this callback or remove this method.
 	}
@@ -88,10 +82,12 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 	 * Called when this Processor instance will be deleted.
 	 */
 	@Override
-	public void occiDelete()
-	{
+	public void occiDelete() {
 		LOGGER.debug("occiDelete() called on " + this);
-		// TODO: Implement this callback or remove this method.
+		if (ComponentManager.isConnectedToCompute(this)) {
+			this.stop();
+			this.undeploy();
+		}
 	}
 	// End of user code
 
@@ -101,81 +97,73 @@ public class ProcessorConnector extends monitoring.impl.ProcessorImpl
 
 	// Start of user code Processor_Kind_deploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: deploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: deploy -
+	 * title:
 	 */
 	@Override
-	public void deploy()
-	{
+	public void deploy() {
 		LOGGER.debug("Action deploy() called on " + this);
 		compMan.deploy();
 		// TODO: Implement how to deploy this processor.
 	}
+
 	// End of user code
 	// Start of user code Processor_Kind_Stop_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: stop
-     * - title: Stop the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: stop -
+	 * title: Stop the application.
 	 */
 	@Override
-	public void stop()
-	{
+	public void stop() {
 		LOGGER.debug("Action stop() called on " + this);
 		compMan.stop();
 
 		// TODO: Implement how to stop this processor.
 	}
+
 	// End of user code
 	// Start of user code Processor_Kind_Start_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: start
-     * - title: Start the application.
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: start -
+	 * title: Start the application.
 	 */
 	@Override
-	public void start()
-	{
+	public void start() {
 		LOGGER.debug("Action start() called on " + this);
 		compMan.start();
 		// TODO: Implement how to start this processor.
 	}
+
 	// End of user code
 	// Start of user code Processor_Kind_configure_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: configure
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: configure
+	 * - title:
 	 */
 	@Override
-	public void configure()
-	{
+	public void configure() {
 		LOGGER.debug("Action configure() called on " + this);
 		compMan.configure();
 		// TODO: Implement how to configure this processor.
 	}
+
 	// End of user code
 	// Start of user code Processor_Kind_undeploy_action
 	/**
-	 * Implement OCCI action:
-     * - scheme: http://schemas.modmacao.org/occi/platform/component/action#
-     * - term: undeploy
-     * - title: 
+	 * Implement OCCI action: - scheme:
+	 * http://schemas.modmacao.org/occi/platform/component/action# - term: undeploy
+	 * - title:
 	 */
 	@Override
-	public void undeploy()
-	{
+	public void undeploy() {
 		LOGGER.debug("Action undeploy() called on " + this);
 		compMan.undeploy();
 		// TODO: Implement how to undeploy this processor.
 	}
 	// End of user code
-		
-
 
-}	
+}