Commit b92cd4ed authored by chiaming2000's avatar chiaming2000
Browse files

Update Capacity admin API to use names defined (updated) in the kinetic 

protocol. Such as Capacity.getNominalCapacityInBytes() and
Capacity.getPortionFull().
parent 75c0373a

kinetic-client/src/main/java/com/seagate/kinetic/admin/impl/DefaultKineticLog.java

+2 −2
Original line number Diff line number Diff line
@@ -122,11 +122,11 @@ public class DefaultKineticLog implements KineticLog { 
        Capacity capacInfo = new Capacity();



        if (capacity.hasNominalCapacityInBytes()) {

            capacInfo.setTotal(capacity.getNominalCapacityInBytes());

            capacInfo.setNominalCapacityInBytes(capacity.getNominalCapacityInBytes());

        }



        if (capacity.hasPortionFull()) {

            capacInfo.setRemaining(capacity.getPortionFull());

            capacInfo.setPortionFull(capacity.getPortionFull());

        }



        return capacInfo;

kinetic-client/src/main/java/kinetic/admin/Capacity.java

+10 −10
Original line number Diff line number Diff line
@@ -19,24 +19,24 @@ package kinetic.admin; 


public class Capacity {

	// total capacity of hard disk

	private long total;

	private long nominalCapacityInBytes;



	// remaining capacity of hard disk

	private float remaining;

	private float portionFull;



	public long getTotal() {

		return total;

	public long getNominalCapacityInBytes() {

		return nominalCapacityInBytes;

	}



	public void setTotal(long total) {

		this.total = total;

	public void setNominalCapacityInBytes(long total) {

		this.nominalCapacityInBytes = total;

	}



	public float getRemaining() {

		return remaining;

	public float getPortionFull() {

		return portionFull;

	}



	public void setRemaining(float remaining) {

		this.remaining = remaining;

	public void setPortionFull(float remaining) {

		this.portionFull = remaining;

	}

}

kinetic-test/src/test/java/com/seagate/kinetic/adminAPI/KineticAdminTest.java

+24 −4
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ import com.seagate.kinetic.proto.Kinetic.Message.Security; 
import com.seagate.kinetic.proto.Kinetic.Message.Security.ACL.HMACAlgorithm;

import com.seagate.kinetic.proto.Kinetic.Message.Security.ACL.Permission;

import com.seagate.kinetic.proto.Kinetic.Message.Security.ACL.Scope;

import com.seagate.kinetic.proto.Kinetic.Message.MessageType;

import com.seagate.kinetic.proto.Kinetic.Message.Setup;

import com.seagate.kinetic.proto.Kinetic.Message.Status;

import com.seagate.kinetic.proto.Kinetic.MessageOrBuilder;
@@ -327,8 +328,8 @@ public class KineticAdminTest extends IntegrationTestCase { 
        assertTrue(log.getStatistics().size() > 0);

        assertTrue(log.getMessages().length > 0);



        assertTrue(log.getCapacity().getRemaining() >= 0);

        assertTrue(log.getCapacity().getTotal() >= 0);

        assertTrue(log.getCapacity().getPortionFull() >= 0);

        assertTrue(log.getCapacity().getNominalCapacityInBytes() >= 0);



        assertTrue(log.getLimits().getMaxKeySize() == 4096);

        assertTrue(log.getLimits().getMaxValueSize() == 1024 * 1024);
@@ -1342,8 +1343,8 @@ public class KineticAdminTest extends IntegrationTestCase { 
        KineticLog log = getAdminClient().getLog(listOfLogType);



        Capacity capacity = log.getCapacity();

        assertTrue(capacity.getRemaining() >= 0);

        assertTrue(capacity.getTotal() >= 0);

        assertTrue(capacity.getPortionFull() >= 0);

        assertTrue(capacity.getNominalCapacityInBytes() >= 0);



        Configuration configuration = log.getConfiguration();

        assertTrue(configuration.getCompilationDate().length() > 0);
@@ -1449,6 +1450,25 @@ public class KineticAdminTest extends IntegrationTestCase { 
                .getCapacity().getNominalCapacityInBytes());

    }

    

    @Test

    public void testGetConfiguration() throws KineticException {



        Message.Builder request1 = Message.newBuilder();

        GetLog.Builder getLog1 = request1.getCommandBuilder().getBodyBuilder()

                .getGetLogBuilder();

        getLog1.addType(Type.CONFIGURATION);



        KineticMessage km1 = new KineticMessage();

        km1.setMessage(request1);



        Message respond1 = (Message) getAdminClient().getLog(km1).getMessage();



        assertTrue(respond1.getCommand().getStatus().getCode()

                .equals(Status.StatusCode.SUCCESS));

        

        assertTrue(respond1.getCommand().getHeader().getMessageType().equals(MessageType.GETLOG_RESPONSE));

    }



    @Test

    public void testGetTemperature() throws KineticException {

kinetic-test/src/test/java/com/seagate/kinetic/example/admin/AdminApiUsage.java

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ public class AdminApiUsage { 
		// get capacity info from kineticLog

		Capacity capacity = kineticLog.getCapacity();

		System.out.println("Drive capacity (MB) info"

				+ "\nDrive total capacity: " + capacity.getTotal()

				+ "\nDrive remaining capacity: " + capacity.getRemaining()

				+ "\nDrive total capacity: " + capacity.getNominalCapacityInBytes()

				+ "\nDrive remaining capacity: " + capacity.getPortionFull()

				+ "\n");



		// get utilization info from kineticLog