diff options
Diffstat (limited to 'com.gluster.storage.management.server/src')
3 files changed, 34 insertions, 3 deletions
diff --git a/com.gluster.storage.management.server/src/applicationContext.xml b/com.gluster.storage.management.server/src/applicationContext.xml index 90566c7f..a6d21e6d 100644 --- a/com.gluster.storage.management.server/src/applicationContext.xml +++ b/com.gluster.storage.management.server/src/applicationContext.xml @@ -17,6 +17,6 @@ </task:scheduled-tasks> <bean id="environment" class="java.lang.String"> - <constructor-arg value="aws"/> + <constructor-arg value="vmware"/> </bean> </beans>
\ No newline at end of file diff --git a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ServerResource.java b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ServerResource.java index 8fb85757..97b874e2 100644 --- a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ServerResource.java +++ b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/resources/ServerResource.java @@ -26,6 +26,9 @@ import javax.ws.rs.Produces; import javax.ws.rs.core.MediaType;
import com.gluster.storage.management.core.utils.FileUtil;
+import com.gluster.storage.management.core.utils.MD5Crypt;
+import com.gluster.storage.management.core.utils.ProcessResult;
+import com.gluster.storage.management.core.utils.ProcessUtil;
@Path("/server")
public class ServerResource {
@@ -50,4 +53,20 @@ public class ServerResource { public String discoveredServers() {
return GetDiscoveredServers();
}
+
+ private String GetDetails() {
+ ProcessResult result = new ProcessUtil().executeCommand("get-server-details.py");
+ if (!result.isSuccess()) {
+ //TODO:Generate error message and return
+ }
+ return result.getOutput();
+ }
+
+ @Path("/details")
+ @GET
+ @Produces(MediaType.TEXT_XML)
+ public String serverDetails() {
+ return GetDetails();
+ }
+
}
diff --git a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java index 6bc25e81..05337405 100644 --- a/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java +++ b/com.gluster.storage.management.server/src/com/gluster/storage/management/server/tasks/ServerDiscoveryTask.java @@ -20,9 +20,14 @@ */ package com.gluster.storage.management.server.tasks; +import java.util.ArrayList; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; +import com.gluster.storage.management.server.resources.DiscoveredServersResource; + /** * Task for auto-discovery of servers eligible to be added to the Gluster cluster. This task runs periodically and keeps * the discovered server list at a common place. The server resource can then pick it and send to client whenever @@ -35,6 +40,9 @@ public class ServerDiscoveryTask { private static final String ENV_PHYCAL = "physical"; @Autowired + private DiscoveredServersResource discoveredServersResource; + + @Autowired private String environment; public void discoverServers() { @@ -44,8 +52,12 @@ public class ServerDiscoveryTask { * TODO: Flow should be as follows <br> * 1) Get the discovery policy specific for the environment <br> * 2) Execute discovery to get list of auto-discovered server <br> - * 3) Probe each one of them to fetch server details <br> - * 4) Store the details in a common place which can be read by the server resource <br> + * 3) Set the discovered servers list in the discovered servers resource <br> */ + + List<String> discoveredServers = new ArrayList<String>(); + discoveredServers.add("yserver1"); + + discoveredServersResource.setDiscoveredServerNames(discoveredServers); } }
\ No newline at end of file |