From 8093535fdfa36a9e0225b8e3b7fc92350715eee0 Mon Sep 17 00:00:00 2001
From: erbel <johannes.erbel@cs.uni-goettingen.de>
Date: Thu, 7 Mar 2019 09:20:09 +0100
Subject: [PATCH] Improved Dummy States
---
.../connector/DatagathererConnector.java | 63 +++++++++++++++--
.../connector/DataprocessorConnector.java | 67 ++++++++++++++++---
2 files changed, 112 insertions(+), 18 deletions(-)
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
index 7e9e3db..a645fc4 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DatagathererConnector.java
@@ -14,6 +14,7 @@
*/
package de.ugoe.cs.rwm.mocci.connector;
+import org.modmacao.occi.platform.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -109,8 +110,15 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void configure()
{
LOGGER.debug("Action configure() called on " + this);
-
- // TODO: Implement how to configure this datagatherer.
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.DEPLOYED_VALUE:
+ this.setOcciComponentState(Status.INACTIVE);
+ break;
+
+ default:
+ break;
+ }
}
// End of user code
// Start of user code Datagatherer_Kind_deploy_action
@@ -124,8 +132,15 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void deploy()
{
LOGGER.debug("Action deploy() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
- // TODO: Implement how to deploy this datagatherer.
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.DEPLOYED);
+ break;
+
+ default:
+ break;
+ }
}
// End of user code
// Start of user code Datagatherer_Kind_undeploy_action
@@ -139,8 +154,30 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.INACTIVE_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+
+ case Status.DEPLOYED_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
- // TODO: Implement how to undeploy this datagatherer.
+ case Status.ERROR_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ break;
+
+ default:
+ break;
+}
}
// End of user code
// Start of user code Datagatherer_Kind_Stop_action
@@ -154,8 +191,7 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void stop()
{
LOGGER.debug("Action stop() called on " + this);
-
- // TODO: Implement how to stop this datagatherer.
+ setOcciComponentState(Status.INACTIVE);
}
// End of user code
// Start of user code Datagatherer_Kind_Start_action
@@ -169,8 +205,21 @@ public class DatagathererConnector extends monitoring.impl.DatagathererImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.INACTIVE_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ break;
+
- // TODO: Implement how to start this datagatherer.
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ break;
+
+ default:
+ break;
+
+ }
}
// End of user code
diff --git a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
index 60cb80c..4271abf 100644
--- a/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
+++ b/de.ugoe.cs.rwm.mocci.connector.dummy/src-gen/de/ugoe/cs/rwm/mocci/connector/DataprocessorConnector.java
@@ -15,6 +15,7 @@
package de.ugoe.cs.rwm.mocci.connector;
import org.eclipse.cmf.occi.core.AttributeState;
+import org.modmacao.occi.platform.Status;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -110,8 +111,15 @@ public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
public void configure()
{
LOGGER.debug("Action configure() called on " + this);
-
- // TODO: Implement how to configure this processor.
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.DEPLOYED_VALUE:
+ this.setOcciComponentState(Status.INACTIVE);
+ break;
+
+ default:
+ break;
+ }
}
// End of user code
// Start of user code Processor_Kind_deploy_action
@@ -125,8 +133,15 @@ public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
public void deploy()
{
LOGGER.debug("Action deploy() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
- // TODO: Implement how to deploy this processor.
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.DEPLOYED);
+ break;
+
+ default:
+ break;
+ }
}
// End of user code
// Start of user code Processor_Kind_undeploy_action
@@ -140,8 +155,30 @@ public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
public void undeploy()
{
LOGGER.debug("Action undeploy() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
+
+ case Status.ACTIVE_VALUE:
+ this.setOcciComponentState(Status.UNDEPLOYED);
+ 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;
- // TODO: Implement how to undeploy this processor.
+ default:
+ break;
+}
}
// End of user code
// Start of user code Processor_Kind_Stop_action
@@ -155,8 +192,7 @@ public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
public void stop()
{
LOGGER.debug("Action stop() called on " + this);
-
- // TODO: Implement how to stop this processor.
+ setOcciComponentState(Status.INACTIVE);
}
// End of user code
// Start of user code Processor_Kind_Start_action
@@ -170,12 +206,21 @@ public class DataprocessorConnector extends monitoring.impl.DataprocessorImpl
public void start()
{
LOGGER.debug("Action start() called on " + this);
- LOGGER.debug("Action start() called on " + this);
+ switch(this.getOcciComponentState().getValue()) {
- System.out.println(this.attributes);
- LOGGER.debug("Action start() called on " + this);
- //this.attributes.remove(sensorlocation);
- System.out.println(this.attributes);
+ case Status.INACTIVE_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ break;
+
+
+ case Status.UNDEPLOYED_VALUE:
+ this.setOcciComponentState(Status.ACTIVE);
+ break;
+
+ default:
+ break;
+
+ }
}
// End of user code
--
GitLab