From 599234839f5418ce299e6c4793a2d2a0ca5d5a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Membr=C3=A9?= Date: Mon, 26 Sep 2016 13:06:02 +0200 Subject: [PATCH] Fixes #9122: Use hostname for Nodes instead of name in compliance api names --- .../rudder/web/rest/compliance/ComplianceAPIService.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/rudder-web/src/main/scala/com/normation/rudder/web/rest/compliance/ComplianceAPIService.scala b/rudder-web/src/main/scala/com/normation/rudder/web/rest/compliance/ComplianceAPIService.scala index adaa99b2741..3885a6d0bb5 100644 --- a/rudder-web/src/main/scala/com/normation/rudder/web/rest/compliance/ComplianceAPIService.scala +++ b/rudder-web/src/main/scala/com/normation/rudder/web/rest/compliance/ComplianceAPIService.scala @@ -125,7 +125,7 @@ class ComplianceAPIService( byNode.map { case (nodeId, components) => ByRuleNodeCompliance( nodeId - , nodeInfos.get(nodeId).map(_.name).getOrElse("Unknown node") + , nodeInfos.get(nodeId).map(_.hostname).getOrElse("Unknown node") , components.toSeq.sortBy(_._2.componentName).flatMap(_._2.componentValues.values) ) }.toSeq @@ -198,7 +198,7 @@ class ComplianceAPIService( (nodeId, ByNodeNodeCompliance( nodeId - , nodeInfos.get(nodeId).map(_.name).getOrElse("Unknown node") + , nodeInfos.get(nodeId).map(_.hostname).getOrElse("Unknown node") , ComplianceLevel(noAnswer = rulesForNode.size) , (rulesForNode.map { rule => ByNodeRuleCompliance( @@ -219,7 +219,7 @@ class ComplianceAPIService( nodeId, ByNodeNodeCompliance( nodeId - , nodeInfos.get(nodeId).map(_.name).getOrElse("Unknown node") + , nodeInfos.get(nodeId).map(_.hostname).getOrElse("Unknown node") , ComplianceLevel.sum(ruleNodeStatusReports.map(_.compliance)) , ruleNodeStatusReports.toSeq.map(r => ByNodeRuleCompliance(