Updated NetworkStatsFactory to convert bytes/sec to KiB/sec

7 files changed, 21 insertions, 19 deletions

diff --git a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
index 45cf5980..0a9fd383 100644
--- a/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
+++ b/src/com.gluster.storage.management.core/src/com/gluster/storage/management/core/constants/RESTConstants.java
@@ -105,6 +105,8 @@ public class RESTConstants {
 	public static final String QUERY_PARAM_TYPE = "type";
 	public static final String QUERY_PARAM_PERIOD = "period";
 	public static final String QUERY_PARAM_INTERFACE = "interface";
+	public static final String QUERY_PARAM_MAX_COUNT = "maxCount";
+	public static final String QUERY_PARAM_NEXT_TO = "nextTo";
 	
 	public static final String STATISTICS_TYPE_CPU = "cpu";
 	public static final String STATISTICS_TYPE_NETWORK = "network";
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
index 6830db00..f149b214 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/GlusterServersResource.java
@@ -27,6 +27,8 @@ import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_
 import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_INTERFACE;
 import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_PERIOD;
 import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_TYPE;
+import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_MAX_COUNT;
+import static com.gluster.storage.management.core.constants.RESTConstants.QUERY_PARAM_NEXT_TO;
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_DISKS;
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_PATH_CLUSTERS;
 import static com.gluster.storage.management.core.constants.RESTConstants.RESOURCE_SERVERS;
@@ -118,18 +120,21 @@ public class GlusterServersResource extends AbstractResource {
 	@GET
 	@Produces(MediaType.APPLICATION_JSON)
 	public Response getGlusterServersJSON(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
-			@QueryParam(QUERY_PARAM_DETAILS) Boolean details) {
-		return getGlusterServers(clusterName, MediaType.APPLICATION_JSON, details);
+			@QueryParam(QUERY_PARAM_DETAILS) Boolean details, @QueryParam(QUERY_PARAM_MAX_COUNT) Integer maxCount,
+			@QueryParam(QUERY_PARAM_NEXT_TO) String previousServerName) {
+		return getGlusterServers(clusterName, MediaType.APPLICATION_JSON, details, maxCount, previousServerName);
 	}
 
 	@GET
 	@Produces(MediaType.APPLICATION_XML)
 	public Response getGlusterServersXML(@PathParam(PATH_PARAM_CLUSTER_NAME) String clusterName,
-			@QueryParam(QUERY_PARAM_DETAILS) Boolean details) {
-		return getGlusterServers(clusterName, MediaType.APPLICATION_XML, details);
+			@QueryParam(QUERY_PARAM_DETAILS) Boolean details, @QueryParam(QUERY_PARAM_MAX_COUNT) Integer maxCount,
+			@QueryParam(QUERY_PARAM_NEXT_TO) String previousServerName) {
+		return getGlusterServers(clusterName, MediaType.APPLICATION_XML, details, maxCount, previousServerName);
 	}
 	
-	private Response getGlusterServers(String clusterName, String mediaType, Boolean fetchDetails) {
+	private Response getGlusterServers(String clusterName, String mediaType, Boolean fetchDetails, Integer maxCount,
+			String previousServerName) {
 		if(fetchDetails == null) {
 			// by default, fetch the server details
 			fetchDetails = true;
@@ -151,7 +156,7 @@ public class GlusterServersResource extends AbstractResource {
 		}
 
 		try {
-			glusterServers = glusterServerService.getGlusterServers(clusterName, fetchDetails);
+			glusterServers = glusterServerService.getGlusterServers(clusterName, fetchDetails, maxCount, previousServerName);
 		} catch (Exception e) {
 			return errorResponse(e.getMessage());
 		}
@@ -444,7 +449,7 @@ public class GlusterServersResource extends AbstractResource {
 			return okResponse(new ServerStats(), mediaType);
 		}
 
-		List<String> serverNames = getServerNames(glusterServerService.getGlusterServers(clusterName, false));
+		List<String> serverNames = getServerNames(glusterServerService.getGlusterServers(clusterName, false, null, null));
 		return okResponse(getStatsFactory(type).fetchAggregatedStats(serverNames, period), mediaType);
 	}
 
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
index 82644c4d..1c109ed3 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/resources/v1_0/VolumesResource.java
@@ -97,7 +97,6 @@ import com.gluster.storage.management.core.model.Volume;
 import com.gluster.storage.management.core.model.Volume.NAS_PROTOCOL;
 import com.gluster.storage.management.core.model.Volume.VOLUME_TYPE;
 import com.gluster.storage.management.core.model.VolumeLogMessage;
-import com.gluster.storage.management.core.response.GenericResponse;
 import com.gluster.storage.management.core.response.LogMessageListResponse;
 import com.gluster.storage.management.core.response.VolumeListResponse;
 import com.gluster.storage.management.core.response.VolumeOptionInfoListResponse;
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
index d1437cec..45c06b99 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/services/GlusterServerService.java
@@ -56,7 +56,9 @@ public class GlusterServerService {
 		}
 	}
 	
-	public List<GlusterServer> getGlusterServers(String clusterName, boolean fetchDetails) {
+	// TODO: Introduce logic to fetch records based on maxCount and previousServerName
+	public List<GlusterServer> getGlusterServers(String clusterName, boolean fetchDetails, Integer maxCount,
+			String previousServerName) {
 		List<GlusterServer> glusterServers;
 		GlusterServer onlineServer = clusterService.getOnlineServer(clusterName);
 		if (onlineServer == null) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
index 113c0e6a..5f2d7e16 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/tasks/ServerSyncTask.java
@@ -80,7 +80,8 @@ public class ServerSyncTask {
 		for(ClusterInfo cluster : clusters) {
 			try {
 				List<ServerInfo> servers = cluster.getServers();
-				List<GlusterServer> actualServers = glusterServerService.getGlusterServers(cluster.getName(), false);
+				List<GlusterServer> actualServers = glusterServerService.getGlusterServers(cluster.getName(), false,
+						null, null);
 				updateRemovedServers(cluster, servers, actualServers);
 				updateAddedServers(cluster, servers, actualServers);
 			} catch(Exception e) {
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
index d3d47c58..ee5eb050 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/NetworkStatsFactory.java
@@ -108,13 +108,12 @@ public class NetworkStatsFactory extends AbstractStatsFactory {
 	public ServerStats fetchStats(String serverName, String period, String... args) {
 		ServerStats stats = super.fetchStats(serverName, period, args);
 
-		// the data returned by rrd contains "bytes" transferred in the given time step. Update the stats object to represent KiB/s
-		int step = stats.getMetadata().getStep();
+		// the data returned by rrd contains "bytes/sec". Update the stats object to represent KiB/s
 		for(ServerStatsRow row : stats.getRows()) {
 			List<Double> data = row.getUsageData();
 			for (int i = 0; i < data.size(); i++) {
 				Double val = data.get(i);
-				data.set(i, val / 1024 / step);
+				data.set(i, val / 1024);
 			}
 		}
 		
diff --git a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
index 73292197..b6a0daa5 100644
--- a/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
+++ b/src/com.gluster.storage.management.gateway/src/com/gluster/storage/management/gateway/utils/ServerUtil.java
@@ -21,7 +21,6 @@
 package com.gluster.storage.management.gateway.utils;
 
 import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
@@ -29,7 +28,6 @@ import java.util.List;
 import javax.servlet.ServletContext;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
 import javax.xml.bind.Unmarshaller;
 
 import org.apache.log4j.Logger;
@@ -37,13 +35,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import com.gluster.storage.management.core.constants.CoreConstants;
-import com.gluster.storage.management.core.exceptions.ConnectionException;
 import com.gluster.storage.management.core.exceptions.GlusterRuntimeException;
 import com.gluster.storage.management.core.model.Server;
-import com.gluster.storage.management.core.model.ServerStats;
-import com.gluster.storage.management.core.model.ServerStatsRow;
 import com.gluster.storage.management.core.model.Status;
-import com.gluster.storage.management.core.response.GenericResponse;
 import com.gluster.storage.management.core.utils.ProcessResult;
 import com.gluster.storage.management.core.utils.ProcessUtil;