Component creation transparency

src/main/java/org/hobbit/core/Constants.java

@@ -161,4 +161,6 @@ private Constants() {
 
     public static final TimeZone DEFAULT_TIME_ZONE = TimeZone.getTimeZone("GMT");
 
+	public static final String RABBIT_CONTAINER_SERVICE = "RABBIT_CONTAINER_SERVICE";
+
 }

src/main/java/org/hobbit/core/components/AbstractBenchmarkController.java

@@ -34,6 +34,9 @@
 import org.apache.jena.vocabulary.RDF;
 import org.hobbit.core.Commands;
 import org.hobbit.core.Constants;
+import org.hobbit.core.containerservice.ContainerCreation;
+import org.hobbit.core.containerservice.ContainerCreationFactory;
+import org.hobbit.core.containerservice.RabbitMQContainerCreator;
 import org.hobbit.core.rabbit.RabbitMQUtils;
 import org.hobbit.utils.EnvVariables;
 import org.hobbit.vocab.HOBBIT;
@@ -135,6 +138,10 @@ public abstract class AbstractBenchmarkController extends AbstractPlatformConnec
      * The URI of the experiment.
      */
     protected String experimentUri;
+    /**
+     * The instance to create container  
+     */
+    protected ContainerCreation containerCreation;
 
     public AbstractBenchmarkController() {
         defaultContainerType = Constants.CONTAINER_TYPE_BENCHMARK;
@@ -143,6 +150,7 @@ public AbstractBenchmarkController() {
     @Override
     public void init() throws Exception {
         super.init();
+        containerCreation = ContainerCreationFactory.getContainerCreationObject(EnvVariables.getString(Constants.RABBIT_CONTAINER_SERVICE, LOGGER), this);
         // benchmark controllers should be able to accept broadcasts
         addCommandHeaderId(Constants.HOBBIT_SESSION_ID_FOR_BROADCASTS);
 
@@ -206,7 +214,7 @@ protected void createTaskGenerators(String taskGeneratorImageName, int numberOfT
      * @param generatorIds
      *            set of generator container names
      */
-    private void createGenerator(String generatorImageName, int numberOfGenerators, String[] envVariables,
+    public void createGenerator(String generatorImageName, int numberOfGenerators, String[] envVariables,
             Set<String> generatorIds) {
         String containerId;
         String variables[] = envVariables != null ? Arrays.copyOf(envVariables, envVariables.length + 2)
@@ -608,4 +616,23 @@ protected void containerCrashed(String containerName) {
         sendResultModel(resultModel);
         System.exit(1);
     }
+
+	public Set<String> getDataGenContainerIds() {
+		return dataGenContainerIds;
+	}
+
+	public Set<String> getTaskGenContainerIds() {
+		return taskGenContainerIds;
+	}
+
+	public String getEvalStoreContainerId() {
+		return evalStoreContainerId;
+	}
+
+	public void setEvalStoreContainerId(String evalStoreContainerId) {
+		this.evalStoreContainerId = evalStoreContainerId;
+	}
+
+
+
 }

src/main/java/org/hobbit/core/components/AbstractCommandReceivingComponent.java

@@ -64,17 +64,17 @@ public abstract class AbstractCommandReceivingComponent extends AbstractComponen
     /**
      * Name of this Docker container.
      */
-    private String containerName;
+    protected String containerName;
     /**
      * Name of the queue that is used to receive responses for messages that are
      * sent via the command queue and for which an answer is expected.
      */
-    private String responseQueueName = null;
+    protected String responseQueueName = null;
     /**
      * Mapping of RabbitMQ's correlationIDs to Future objects corresponding
      * to that RPC call.
      */
-    private Map<String, SettableFuture<String>> responseFutures = Collections.synchronizedMap(new LinkedHashMap<>());
+    protected Map<String, SettableFuture<String>> responseFutures = Collections.synchronizedMap(new LinkedHashMap<>());
     /**
      * Consumer of the queue that is used to receive responses for messages that
      * are sent via the command queue and for which an answer is expected.
@@ -291,7 +291,7 @@ protected String createContainer(String imageName, String[] envVariables) {
      *            user-provided array of environment variables
      * @return the extended array of environment variables
      */
-    protected String[] extendContainerEnvVariables(String[] envVariables) {
+    public String[] extendContainerEnvVariables(String[] envVariables) {
         if (envVariables == null) {
             envVariables = new String[0];
         }
@@ -334,7 +334,7 @@ protected String[] extendContainerEnvVariables(String[] envVariables) {
      *            container
      * @return the name of the container instance or null if an error occurred
      */
-    protected String createContainer(String imageName, String containerType, String[] envVariables) {
+    public String createContainer(String imageName, String containerType, String[] envVariables) {
         return createContainer(imageName, containerType, envVariables, null);
     }
 
@@ -461,7 +461,15 @@ protected Future<String> createContainerAsync(String imageName, String container
         return null;
     }
 
-    /**
+    public Map<String, SettableFuture<String>> getResponseFutures() {
+		return responseFutures;
+	}
+
+	public String getResponseQueueName() {
+		return responseQueueName;
+	}
+
+	/**
      * This method sends a {@link Commands#DOCKER_CONTAINER_STOP} command to
      * stop the container with the given id.
      *
@@ -484,7 +492,7 @@ protected void stopContainer(String containerName) {
      * @throws IOException
      *             if a communication problem occurs
      */
-    private void initResponseQueue() throws IOException {
+    public void initResponseQueue() throws IOException {
         if (responseQueueName == null) {
             responseQueueName = cmdChannel.queueDeclare().getQueue();
         }
@@ -554,5 +562,28 @@ public void close() throws IOException {
         }
         super.close();
     }
+
+    public String getContainerName() {
+		return containerName;
+	}
+
+	public void setContainerName(String containerName) {
+		this.containerName = containerName;
+	}
+
+	public Gson getGson() {
+		return gson;
+	}
+
+	public void setGson(Gson gson) {
+		this.gson = gson;
+	}
+
+	public void createDummyComponent(byte command, byte[] data, String sessionId, BasicProperties props) {
+		// TODO Auto-generated method stub
+
+	}
+
+
 
 }

src/main/java/org/hobbit/core/components/AbstractTaskGenerator.java

@@ -132,6 +132,7 @@ public void init() throws Exception {
         dataGenReceiver = DataReceiverImpl.builder().dataHandler(new DataHandler() {
             @Override
             public void handleData(byte[] data) {
+
                 receiveGeneratedData(data);
             }
         }).maxParallelProcessedMsgs(maxParallelProcessedMsgs).queue(getFactoryForIncomingDataQueues(),

src/main/java/org/hobbit/core/containerservice/ContainerCreation.java

@@ -0,0 +1,21 @@
+package org.hobbit.core.containerservice;
+
+import org.hobbit.core.components.AbstractCommandReceivingComponent;
+/**
+ * ContainerCreation provides the facility to implement the functionalities 
+ * to create {@link DirectContainerCreator} or {@link RabbitMQContainerCreator}
+ * @author altaf, sourabh, yamini, melisa
+ *
+ */
+public interface ContainerCreation {
+
+	void createDataGenerators(String dataGeneratorImageName, int numberOfDataGenerators,
+            String[] envVariables, AbstractCommandReceivingComponent dummyComponent);
+
+	void createTaskGenerators(String taskGeneratorImageName, int numberOfTaskGenerators,
+            String[] envVariables, AbstractCommandReceivingComponent dummyComponent);
+
+	void createEvaluationStorage(String evalStorageImageName, String[] envVariables,
+			AbstractCommandReceivingComponent dummyComponent);
+
+}

src/main/java/org/hobbit/core/containerservice/ContainerCreationFactory.java

@@ -0,0 +1,24 @@
+package org.hobbit.core.containerservice;
+
+import org.hobbit.core.Constants;
+import org.hobbit.core.components.AbstractBenchmarkController;
+
+/**
+ * Factory that provides functionality to get an instance of {@link ContainerCreation}
+ * @author altaf, sourabh, yamini, melisa
+ *
+ */
+public class ContainerCreationFactory {
+
+	/**
+	 * This method returns the instance of {@link RabbitMQContainerCreator} or {@link DirectContainerCreator}
+	 * based on the environment variable {@link Constants#RABBIT_CONTAINER_SERVICE}
+	 */
+	public static ContainerCreation getContainerCreationObject(String isRabbitContainerService, AbstractBenchmarkController abstractBenchmarkController) {
+		if(isRabbitContainerService.equals("true")) {
+			return new RabbitMQContainerCreator(abstractBenchmarkController);
+		}
+		return new DirectContainerCreator(abstractBenchmarkController);
+	}
+
+}