You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@uima.apache.org by de...@apache.org on 2016/03/04 23:06:00 UTC
svn commit: r1733662 - in /uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src:
main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
Author: degenaro
Date: Fri Mar 4 22:06:00 2016
New Revision: 1733662
URL: http://svn.apache.org/viewvc?rev=1733662&view=rev
Log:
UIMA-4815 DUCC Web Server (WS) System Machines page re-imagined
Modified:
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java?rev=1733662&r1=1733661&r2=1733662&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/main/java/org/apache/uima/ducc/cli/ws/json/MachineFacts.java Fri Mar 4 22:06:00 2016
@@ -36,6 +36,7 @@ public class MachineFacts implements Ser
public String swapInuse;
public String swapDelta;
public String swapFree;
+ public double cpu;
public boolean cgroups = false;
public List<String> aliens;
public String heartbeat;
@@ -48,6 +49,7 @@ public class MachineFacts implements Ser
String swapInuse,
String swapDelta,
String swapFree,
+ double cpu,
boolean cgroups,
List<String> aliens,
String heartbeat
@@ -64,6 +66,7 @@ public class MachineFacts implements Ser
this.swapInuse = swapInuse;
this.swapDelta = swapDelta;
this.swapFree = swapFree;
+ this.cpu = cpu;
this.cgroups = cgroups;
this.aliens = aliens;
this.heartbeat = heartbeat;
Modified: uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java
URL: http://svn.apache.org/viewvc/uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java?rev=1733662&r1=1733661&r2=1733662&view=diff
==============================================================================
--- uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java (original)
+++ uima/sandbox/uima-ducc/trunk/uima-ducc-cli/src/test/java/org/apache/uima/ducc/cli/test/MachineFactsTest.java Fri Mar 4 22:06:00 2016
@@ -88,6 +88,10 @@ public class MachineFactsTest {
return free;
}
+ private double createCPU() {
+ return random.nextDouble();
+ }
+
private boolean createCgroups() {
return random.nextBoolean();
}
@@ -125,10 +129,11 @@ public class MachineFactsTest {
String swap = createSwap();
String delta = createSwap();
String free = createFree();
+ double cpu = createCPU();
boolean cgroups = createCgroups();
List<String> aliens = createAliens();
String heartbeat = createHeartbeat();
- MachineFacts machineFacts = new MachineFacts(status,ip,name, memTotal, memFree, swap, delta, free, cgroups, aliens, heartbeat);
+ MachineFacts machineFacts = new MachineFacts(status,ip,name, memTotal, memFree, swap, delta, free, cpu, cgroups, aliens, heartbeat);
return machineFacts;
}