You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by dm...@apache.org on 2014/05/20 19:36:11 UTC

git commit: AMBARI-5832. "service_name" field unavailable from Hosts API (dlysnichenko)

Repository: ambari
Updated Branches:
  refs/heads/trunk 836691a65 -> 2bd7b1a09


AMBARI-5832. "service_name" field unavailable from Hosts API (dlysnichenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/2bd7b1a0
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/2bd7b1a0
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/2bd7b1a0

Branch: refs/heads/trunk
Commit: 2bd7b1a09d2d4c5444fa344c2091370cd6258ddb
Parents: 836691a
Author: Lisnichenko Dmitro <dl...@hortonworks.com>
Authored: Tue May 20 20:34:20 2014 +0300
Committer: Lisnichenko Dmitro <dl...@hortonworks.com>
Committed: Tue May 20 20:35:51 2014 +0300

----------------------------------------------------------------------
 ambari-server/src/main/resources/properties.json                   | 1 +
 .../controller/internal/HostComponentResourceProviderTest.java     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/2bd7b1a0/ambari-server/src/main/resources/properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/properties.json b/ambari-server/src/main/resources/properties.json
index 3d2a036..0cb32e7 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -72,6 +72,7 @@
         "HostRoles/stale_configs",
         "HostRoles/desired_admin_state",
         "HostRoles/maintenance_state",
+        "HostRoles/service_name",
         "_"
     ],
     "Configuration":[

http://git-wip-us.apache.org/repos/asf/ambari/blob/2bd7b1a0/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
index bd31b7e..08a72bb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/HostComponentResourceProviderTest.java
@@ -254,7 +254,7 @@ public class HostComponentResourceProviderTest {
         EasyMock.<Set<ServiceComponentHostRequest>>anyObject())).andReturn(nameResponse).once();
     expect(managementController.updateHostComponents(
         AbstractResourceProviderTest.Matcher.getHostComponentRequestSet(
-            "Cluster102", null, "Component100", "Host100", null, "STARTED"),
+            "Cluster102", "Service100", "Component100", "Host100", null, "STARTED"),
             eq(mapRequestProps), eq(false))).andReturn(response).once();
     
     expect(resourceProviderFactory.getHostComponentResourceProvider(anyObject(Set.class),