Implement correcty routing key extraction for sensors.

tools.descartes.prisma.core/src/tools/descartes/prisma/core/scopes/AgentScope.java

@@ -6,10 +6,11 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
+import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.resource.Resource;
 
-import edu.kit.ipd.descartes.core.NamedElement;
+import edu.kit.ipd.descartes.core.CorePackage;
 import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationPointDescriptions;
 import edu.kit.ipd.descartes.mm.adaptationpoints.AdaptationpointsFactory;
 import tools.descartes.prisma.core.MessageBus;
@@ -51,12 +52,18 @@ public abstract class AgentScope extends Scope {
 	private final List<NotificationDefinition> notifications = new ArrayList<>();
 
 	protected class NotificationDefinition {
+		private EAttribute routingKey;
 		private final Class<?> key;
 		private final String exchange;
 
 		public NotificationDefinition(Class<?> key, String exchange) {
+			this(key, exchange, CorePackage.Literals.NAMED_ELEMENT__NAME);
+		}
+
+		public NotificationDefinition(Class<?> key, String exchange, EAttribute routingKey) {
 			this.key = key;
 			this.exchange = exchange;
+			this.routingKey = routingKey;
 		}
 
 		public void create() {
@@ -67,13 +74,13 @@ public abstract class AgentScope extends Scope {
 			return key.isInstance(o);
 		}
 
-		public void send(String notificationType, Object o) {
+		public void send(String notificationType, EObject o) {
 			getMessageBus().publishMessage(exchange, getRoutingKey(o), "",
 					new ModelNotification(getModelRepository(), notificationType, key, o));
 		}
 
-		public String getRoutingKey(Object o) {
-			return ((NamedElement) o).getName();
+		public String getRoutingKey(EObject o) {
+			return o.eGet(routingKey).toString();
 		}
 	}
 

tools.descartes.prisma.core/src/tools/descartes/prisma/core/scopes/LogicalInfrastructureScope.java

 package tools.descartes.prisma.core.scopes;
 
+import org.eclipse.emf.ecore.EObject;
+
 import edu.kit.ipd.descartes.mm.resourcelandscape.RuntimeEnvironment;
 import edu.kit.ipd.descartes.mm.runtimeenvironmentclasses.RuntimeEnvironmentClasses;
 import tools.descartes.prisma.core.MessageBus;
@@ -70,7 +72,12 @@ public class LogicalInfrastructureScope extends ContainerScope {
 					}
 				});
 		declareNotification(
-				new NotificationDefinition(Sensor.class, getHypervisorSensorExchange()));
+				new NotificationDefinition(Sensor.class, getHypervisorSensorExchange()) {
+					@Override
+					public String getRoutingKey(EObject o) {
+						return ((Sensor<?>) o).getMetric().getId();
+					}
+				});
 
 		declareIncomingPort(getHypervisorExchange());