[onos-6879] Adding configuration property to node metrics app
Change-Id: I64f7a42c44be7b61ec2db291ed90a02434844041
diff --git a/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeCpuUsageCommand.java b/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeCpuUsageCommand.java
index a122791..12dd649 100644
--- a/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeCpuUsageCommand.java
+++ b/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeCpuUsageCommand.java
@@ -20,7 +20,7 @@
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
-import org.onosproject.nodemetrics.NodeCpu;
+import org.onosproject.nodemetrics.NodeCpuUsage;
import org.onosproject.nodemetrics.NodeMetricsService;
import java.util.Collection;
@@ -42,19 +42,19 @@
@Override
protected void execute() {
if (nodeId != null) {
- NodeCpu cpu = nodeService.cpu(NodeId.nodeId(nodeId));
+ NodeCpuUsage cpu = nodeService.cpu(NodeId.nodeId(nodeId));
if (Objects.nonNull(cpu)) {
print("CPU usage : %s ", cpu);
} else {
print("Node %s doesn't exists", nodeId);
}
} else {
- Collection<NodeCpu> cpu = nodeService.cpu().values();
+ Collection<NodeCpuUsage> cpu = nodeService.cpu().values();
printCpuUsage(cpu);
}
}
- private void printCpuUsage(Collection<NodeCpu> cpuList) {
+ private void printCpuUsage(Collection<NodeCpuUsage> cpuList) {
cpuList.forEach(cpu -> print("%s", cpu));
}
}
diff --git a/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryCommand.java b/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryUsageCommand.java
similarity index 81%
rename from apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryCommand.java
rename to apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryUsageCommand.java
index 3c6ec5b..2f18c43 100644
--- a/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryCommand.java
+++ b/apps/nodemetrics/mgr/src/main/java/org/onosproject/nodemetrics/cli/ShowNodeMemoryUsageCommand.java
@@ -20,7 +20,7 @@
import org.apache.karaf.shell.commands.Command;
import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.cluster.NodeId;
-import org.onosproject.nodemetrics.NodeMemory;
+import org.onosproject.nodemetrics.NodeMemoryUsage;
import org.onosproject.nodemetrics.NodeMetricsService;
import java.util.Collection;
@@ -31,7 +31,7 @@
*/
@Command(scope = "onos", name = "node-memory",
description = "Lists all node memory utilization")
-public class ShowNodeMemoryCommand extends AbstractShellCommand {
+public class ShowNodeMemoryUsageCommand extends AbstractShellCommand {
@Argument(index = 0, name = "nodeId", description = "Node identity",
required = false, multiValued = false)
@@ -42,19 +42,19 @@
@Override
protected void execute() {
if (nodeId != null) {
- NodeMemory memory = nodeService.memory(NodeId.nodeId(nodeId));
+ NodeMemoryUsage memory = nodeService.memory(NodeId.nodeId(nodeId));
if (Objects.nonNull(memory)) {
print("Memory usage : %s", memory.toString());
} else {
print("Node %s doesn't exists");
}
} else {
- Collection<NodeMemory> memory = nodeService.memory().values();
- printMemory(memory);
+ Collection<NodeMemoryUsage> memory = nodeService.memory().values();
+ printMemoryUsage(memory);
}
}
- private void printMemory(Collection<NodeMemory> memoryList) {
+ private void printMemoryUsage(Collection<NodeMemoryUsage> memoryList) {
memoryList.forEach(memory -> print("%s", memory));
}
}