Merge remote branch 'upstream/master'

Conflicts:
	src/com.gluster.storage.management.server.scripts/src/get_server_details.py

2 files changed, 221 insertions, 0 deletions

diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TaskResource.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TaskResource.java
new file mode 100644
index 00000000..c5540dff
--- /dev/null
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/TaskResource.java
@@ -0,0 +1,148 @@
+/**
+ * TaskResource.java
+ *
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package com.gluster.storage.management.server.resources;
+
+import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_CLUSTER_NAME;
+import static com.gluster.storage.management.core.constants.RESTConstants.PATH_PARAM_TASK_ID;
+import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TASK_OPERATION;
+import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
+import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_TASKS;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.PUT;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+
+import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
+import com.gluster.storage.management.core.model.Status;
+import com.gluster.storage.management.core.model.Task;
+import com.gluster.storage.management.core.model.Task.TASK_TYPE;
+import com.gluster.storage.management.core.model.TaskInfo;
+import com.gluster.storage.management.core.response.TaskListResponse;
+import com.gluster.storage.management.core.response.TaskResponse;
+import com.gluster.storage.management.server.runningtasks.managers.MigrateDiskManager;
+import com.gluster.storage.management.server.tasks.MigrateDiskTask;
+import com.sun.jersey.spi.resource.Singleton;
+
+@Path(RESOURCE_PATH_CLUSTERS + "/{" + PATH_PARAM_CLUSTER_NAME + "}/" + RESOURCE_TASKS)
+@Singleton
+public class TaskResource {
+	private Map<String, Task> tasks;
+
+	private TaskResource() {
+	}
+
+	public void addTask(Task task) {
+		tasks.put(task.getId(), task);
+	}
+
+	public void removeTask(Task task) {
+		tasks.remove(task);
+	}
+
+	public List<Task> getAllTasks() {
+		List<Task> allTasks = new ArrayList<Task>();
+		for (Map.Entry<String, Task> entry : tasks.entrySet()) {
+			allTasks.add(entry.getValue());
+		}
+		return allTasks;
+	}
+
+	public Task getTask(String taskId) {
+		for (Map.Entry<String, Task> entry : tasks.entrySet()) {
+			if (entry.getValue().getId().equals(taskId)) {
+				return entry.getValue();
+			}
+		}
+		return null;
+	}
+
+	@GET
+	@Produces(MediaType.TEXT_XML)
+	public TaskListResponse getTasks() {
+		TaskListResponse taskListResponse = new TaskListResponse();
+		List<TaskInfo> taskInfoList = new ArrayList<TaskInfo>();
+		try {
+			for (Task task : getAllTasks()) {
+				taskInfoList.add(task.getTaskInfo());
+			}
+			taskListResponse.setData(taskInfoList);
+			taskListResponse.setStatus(new Status(Status.STATUS_CODE_SUCCESS, ""));
+		} catch (GlusterRuntimeException e) {
+			taskListResponse.setStatus(new Status(e));
+		}
+		return taskListResponse;
+	}
+
+	@PUT
+	@Path("/{" + PATH_PARAM_TASK_ID + "}")
+	@Produces(MediaType.TEXT_XML)
+	public TaskResponse performTask(@PathParam(PATH_PARAM_TASK_ID) String taskId,
+			@QueryParam(QUERY_PARAM_TASK_OPERATION) String taskOperation) {
+		Task task = getTask(taskId);
+		TaskInfo taskInfo = null;
+		TaskResponse taskResponse = new TaskResponse();
+
+		try {
+			if (taskOperation.equals("resume")) {
+				taskInfo = task.resume();
+			}
+			if (taskOperation.equals("pause")) {
+				taskInfo = task.pause();
+			}
+			if (taskOperation.equals("stop")) {
+				taskInfo = task.stop();
+			}
+			taskResponse.setData(taskInfo);
+			taskResponse.setStatus(new Status(Status.STATUS_CODE_SUCCESS, ""));
+		} catch (GlusterRuntimeException e) {
+			taskResponse.setStatus(new Status(e));
+		}
+		return taskResponse;
+	}
+
+	@DELETE
+	@Path("/{" + PATH_PARAM_TASK_ID + "}")
+	@Produces(MediaType.TEXT_XML)
+	public TaskResponse deleteTask(@PathParam(PATH_PARAM_TASK_ID) String taskId,
+			@QueryParam(QUERY_PARAM_TASK_OPERATION) String taskOperation) {
+		TaskResponse taskResponse = new TaskResponse();
+		Task task = getTask(taskId);
+		if (task == null) {
+			taskResponse.setStatus( new Status(Status.STATUS_CODE_FAILURE, "No such task " + taskId + "is found ")); 
+		}
+		if (taskOperation.equals("delete")) {
+			removeTask(task);
+			taskResponse.setStatus(new Status(Status.STATUS_CODE_SUCCESS, "Task [" + taskId
+						+ "] removed successfully"));
+					}
+		return null;
+	}
+
+}
diff --git a/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java
new file mode 100644
index 00000000..97f3d2aa
--- /dev/null
+++ b/src/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/MigrateDiskTask.java
@@ -0,0 +1,73 @@
+/**
+ * MigrateDiskTask.java
+ *
+ * Copyright (c) 2011 Gluster, Inc. <http://www.gluster.com>
+ * This file is part of Gluster Management Console.
+ *
+ * Gluster Management Console is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License as published
+ * by the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Gluster Management Console is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Affero General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+package com.gluster.storage.management.server.tasks;
+
+import com.gluster.storage.management.core.model.Task;
+import com.gluster.storage.management.core.model.TaskInfo;
+
+public class MigrateDiskTask extends Task {
+
+	public MigrateDiskTask(TASK_TYPE type, String reference, String description ) {
+		super(type, reference, description );
+	}
+	
+	public MigrateDiskTask(TaskInfo info) {
+		super(info);
+	}
+	
+	
+	@Override
+	public String getId() {
+		return getInfo().getId();
+	}
+	
+	@Override
+	public TaskInfo resume() {
+		// To make a decision is the task has the ability to start the task
+		return null;
+	}
+
+	
+	@Override
+	public TaskInfo stop() {
+		// To make a decision is the task has the ability to stop the task
+		return null;
+	}
+
+	
+	@Override
+	public TaskInfo pause() {
+		// To make a decision is the task has the ability to pause the task
+		return null;
+	}
+
+	
+	@Override
+	public TASK_TYPE getType() {
+		
+		return null;
+	}
+
+	@Override
+	public TaskInfo getTaskInfo() {
+		return getInfo();
+	}
+}