From 1682147cf3ff463845ac9bcd65347624142dbb81 Mon Sep 17 00:00:00 2001
From: Leonardo Menezes <mail@lmenezes.com>
Date: Mon, 16 Oct 2017 08:28:37 +0200
Subject: [PATCH] Revert "add node.role to nodes api"
This reverts commit 3f3572501f94276fd61b7e3312ccced525ac07d0.
---
app/models/commons/NodeRoles.scala | 13 -------------
app/models/nodes/Node.scala | 9 ++++-----
test/models/nodes/NodeSpec.scala | 6 ++----
tests/components/nodes/controller.tests.js | 4 ++--
4 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/app/models/commons/NodeRoles.scala b/app/models/commons/NodeRoles.scala
index 4f7bb8f..33aef89 100644
--- a/app/models/commons/NodeRoles.scala
+++ b/app/models/commons/NodeRoles.scala
@@ -6,19 +6,6 @@ case class NodeRoles(master: Boolean, data: Boolean, ingest: Boolean) {
def coordinating: Boolean = !master && !data && !ingest
- def toEsString = {
- val builder = StringBuilder.newBuilder
- if (master)
- builder.append("m")
- if (data)
- builder.append("d")
- if (ingest)
- builder.append("i")
- if (builder.isEmpty)
- builder.append("-")
- builder.toString()
- }
-
}
object NodeRoles {
diff --git a/app/models/nodes/Node.scala b/app/models/nodes/Node.scala
index ce73444..58270d4 100644
--- a/app/models/nodes/Node.scala
+++ b/app/models/nodes/Node.scala
@@ -7,7 +7,6 @@ object Node {
def apply(id: String, currentMaster: Boolean, info: JsValue, stats: JsValue): JsValue = {
val jvmVersion = (info \ "jvm" \ "version").asOpt[JsString].getOrElse(JsNull)
- val nodeRoles = NodeRoles(info)
Json.obj(
"id" -> JsString(id),
@@ -18,12 +17,12 @@ object Node {
"cpu" -> cpu(stats),
"uptime" -> (stats \ "jvm" \ "uptime_in_millis").as[JsValue],
"jvm" -> jvmVersion,
- "version" -> (info \ "version").as[JsValue],
- "node.role" -> JsString(nodeRoles.toEsString)
- ) ++ roles(nodeRoles)
+ "version" -> (info \ "version").as[JsValue]
+ ) ++ roles(info)
}
- private def roles(roles: NodeRoles): JsObject = {
+ private def roles(info: JsValue): JsObject = {
+ val roles = NodeRoles(info)
Json.obj(
"master" -> JsBoolean(roles.master),
"coordinating" -> JsBoolean(roles.coordinating),
diff --git a/test/models/nodes/NodeSpec.scala b/test/models/nodes/NodeSpec.scala
index a79410d..9ca6c59 100644
--- a/test/models/nodes/NodeSpec.scala
+++ b/test/models/nodes/NodeSpec.scala
@@ -41,8 +41,7 @@ object NodeSpec extends Specification {
| "master": true,
| "name": "-qkZcMt",
| "uptime": 109228,
- | "version": "5.1.1",
- | "node.role":"mdi"
+ | "version": "5.1.1"
|}
""".stripMargin
)
@@ -78,8 +77,7 @@ object NodeSpec extends Specification {
| "master": true,
| "name": "007ywNv",
| "uptime": 492790575,
- | "version": "5.1.1",
- | "node.role":"mdi"
+ | "version": "5.1.1"
|}
""".stripMargin
)
diff --git a/tests/components/nodes/controller.tests.js b/tests/components/nodes/controller.tests.js
index b8802a9..d399d76 100644
--- a/tests/components/nodes/controller.tests.js
+++ b/tests/components/nodes/controller.tests.js
@@ -116,8 +116,8 @@ describe('NodesController', function() {
it('refresh list of visible nodes by applying the filter to the complete list',
function() {
var nodes = [
- {name: 'a', master: true, data: true, client: false, 'node.role': 'md'},
- {name: 'b', master: true, data: true, client: false, 'node.role': 'md'}
+ {name: 'a', master: true, data: true, client: false},
+ {name: 'b', master: true, data: true, client: false}
];
this.scope.filter.name = 'b';
this.scope._nodes = nodes;
--
GitLab