ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlun...@apache.org
Subject [3/3] ambari git commit: AMBARI-22164: Update services API to user service_name, service_type instead of service_display_name, service_name (jluniya)
Date Mon, 09 Oct 2017 04:40:14 GMT
AMBARI-22164: Update services API to user service_name, service_type instead of service_display_name, service_name (jluniya)


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

Branch: refs/heads/branch-feature-AMBARI-14714
Commit: ba1ec6ddb3fd8f5f33bbf6922eb58ca94866d1f7
Parents: 53333da
Author: Jayush Luniya <jluniya@hortonworks.com>
Authored: Sun Oct 8 21:40:06 2017 -0700
Committer: Jayush Luniya <jluniya@hortonworks.com>
Committed: Sun Oct 8 21:40:06 2017 -0700

----------------------------------------------------------------------
 .../ServiceComponentNotFoundException.java      |   4 +-
 .../ambari/server/ServiceNotFoundException.java |   4 +-
 .../ambari/server/agent/HeartbeatMonitor.java   |  10 +-
 .../ambari/server/agent/HeartbeatProcessor.java |   6 +-
 .../ambari/server/agent/StatusCommand.java      |  10 +-
 .../server/api/services/AmbariMetaInfo.java     |  74 +++++-----
 .../server/api/services/ComponentService.java   |  30 ++--
 .../server/api/services/ServiceService.java     | 146 +++++++++----------
 .../checks/SecondaryNamenodeDeletedCheck.java   |   2 +-
 .../AmbariManagementControllerImpl.java         |  50 +++----
 .../controller/ServiceComponentHostRequest.java |  16 +-
 .../ServiceComponentHostResponse.java           |  18 +--
 .../controller/ServiceComponentRequest.java     |  30 ++--
 .../controller/ServiceComponentResponse.java    |  18 +--
 .../server/controller/ServiceRequest.java       |  20 +--
 .../server/controller/ServiceResponse.java      |  20 +--
 .../internal/ClientConfigResourceProvider.java  |   2 +-
 .../internal/ComponentResourceProvider.java     |  38 ++---
 .../internal/HostComponentResourceProvider.java |  28 ++--
 .../internal/ServiceResourceProvider.java       | 112 +++++++-------
 .../controller/utilities/DatabaseChecker.java   |  43 +++---
 .../events/ServiceComponentInstalledEvent.java  |   7 +-
 .../ServiceComponentUninstalledEvent.java       |   6 +-
 .../ambari/server/events/ServiceEvent.java      |  12 +-
 .../server/events/ServiceInstalledEvent.java    |   8 +-
 .../server/events/ServiceRemovedEvent.java      |   6 +-
 .../upgrade/HostVersionOutOfSyncListener.java   |  16 +-
 .../orm/entities/ClusterServiceEntity.java      |  16 +-
 .../org/apache/ambari/server/state/Cluster.java |   2 +-
 .../org/apache/ambari/server/state/Service.java |   4 +-
 .../ambari/server/state/ServiceComponent.java   |   2 +-
 .../server/state/ServiceComponentHost.java      |   6 +-
 .../server/state/ServiceComponentImpl.java      |   4 +-
 .../ambari/server/state/ServiceFactory.java     |   6 +-
 .../apache/ambari/server/state/ServiceImpl.java |  51 ++++---
 .../apache/ambari/server/state/StackInfo.java   |   7 +-
 .../server/state/cluster/ClusterImpl.java       |  10 +-
 .../ambari/server/state/host/HostImpl.java      |   6 +-
 .../state/repository/VersionDefinitionXml.java  |   2 +-
 .../svccomphost/ServiceComponentHostImpl.java   |  14 +-
 .../ServiceComponentHostSummary.java            |   8 +-
 .../main/resources/Ambari-DDL-Derby-CREATE.sql  |   2 +-
 .../main/resources/Ambari-DDL-MySQL-CREATE.sql  |   2 +-
 .../main/resources/Ambari-DDL-Oracle-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-Postgres-CREATE.sql    |   2 +-
 .../resources/Ambari-DDL-SQLAnywhere-CREATE.sql |   2 +-
 .../resources/Ambari-DDL-SQLServer-CREATE.sql   |   2 +-
 .../src/main/resources/key_properties.json      |   2 +-
 .../src/main/resources/properties.json          |   2 +-
 .../app/controllers/global/update_controller.js |   2 +-
 .../main/admin/kerberos/step3_controller.js     |   2 +-
 .../controllers/main/service/add_controller.js  |   2 +-
 .../app/controllers/wizard/step8_controller.js  |   4 +-
 .../app/controllers/wizard/step9_controller.js  |   2 +-
 ambari-web/app/mappers/service_mapper.js        |  12 +-
 .../app/mappers/service_metrics_mapper.js       |  34 ++---
 .../app/mixins/common/configs/configs_saver.js  |   2 +-
 .../wizard/wizardProgressPageController.js      |   4 +-
 ambari-web/app/utils/ajax/ajax.js               |   6 +-
 59 files changed, 486 insertions(+), 474 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
index 698f2ab..b570287 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ServiceComponentNotFoundException.java
@@ -23,12 +23,12 @@ public class ServiceComponentNotFoundException
     extends ObjectNotFoundException {
 
   public ServiceComponentNotFoundException (String clusterName,
-      String serviceName, String serviceDisplayName, String serviceGroupName, String serviceComponentName) {
+      String serviceName, String serviceType, String serviceGroupName, String serviceComponentName) {
     super("ServiceComponent not found"
         + ", clusterName=" + clusterName
-        + ", serviceDisplayName=" + serviceDisplayName
         + ", serviceGroupName=" + serviceGroupName
         + ", serviceName=" + serviceName
+        + ", serviceType=" + serviceType
         + ", serviceComponentName=" + serviceComponentName);
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
index 24cd7ae..d374b74 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/ServiceNotFoundException.java
@@ -21,10 +21,10 @@ package org.apache.ambari.server;
 @SuppressWarnings("serial")
 public class ServiceNotFoundException extends ObjectNotFoundException {
 
-  public ServiceNotFoundException(String clusterName, String serviceDisplayName) {
+  public ServiceNotFoundException(String clusterName, String serviceName) {
     super("Service not found"
         + ", clusterName=" + clusterName
-        + ", serviceDisplayName=" + serviceDisplayName);
+        + ", serviceName=" + serviceName);
   }
 
   public ServiceNotFoundException(String clusterName, Long serviceId) {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
index a5b4d08..8d633d5 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatMonitor.java
@@ -162,7 +162,7 @@ public class HeartbeatMonitor implements Runnable {
         // mark all components that are not clients with unknown status
         for (Cluster cluster : clusters.getClustersForHost(hostObj.getHostName())) {
           for (ServiceComponentHost sch : cluster.getServiceComponentHosts(hostObj.getHostName())) {
-            Service s = cluster.getService(sch.getServiceDisplayName());
+            Service s = cluster.getService(sch.getServiceName());
             ServiceComponent sc = s.getServiceComponent(sch.getServiceComponentName());
             if (!sc.isClientComponent() &&
               !sch.getState().equals(State.INIT) &&
@@ -237,16 +237,16 @@ public class HeartbeatMonitor implements Runnable {
   private StatusCommand createStatusCommand(String hostname, Cluster cluster,
       ServiceComponentHost sch, Map<String, DesiredConfig> desiredConfigs) throws AmbariException {
     String serviceName = sch.getServiceName();
-    String serviceDisplayName = sch.getServiceDisplayName();
+    String serviceType = sch.getServiceType();
     String componentName = sch.getServiceComponentName();
 
     StackId stackId = sch.getDesiredStackId();
 
     ServiceInfo serviceInfo = ambariMetaInfo.getService(stackId.getStackName(),
-        stackId.getStackVersion(), serviceDisplayName);
+        stackId.getStackVersion(), serviceType);
     ComponentInfo componentInfo = ambariMetaInfo.getComponent(
             stackId.getStackName(), stackId.getStackVersion(),
-            serviceDisplayName, componentName);
+            serviceType, componentName);
     StackInfo stackInfo = ambariMetaInfo.getStack(stackId.getStackName(),
         stackId.getStackVersion());
 
@@ -307,7 +307,7 @@ public class HeartbeatMonitor implements Runnable {
     StatusCommand statusCmd = new StatusCommand();
     statusCmd.setClusterName(cluster.getClusterName());
     statusCmd.setServiceName(serviceName);
-    statusCmd.setServiceDisplayName(serviceDisplayName);
+    statusCmd.setServiceType(serviceType);
     statusCmd.setComponentName(componentName);
     statusCmd.setConfigurations(configurations);
     statusCmd.setConfigurationAttributes(configurationAttributes);

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
index e99b0e0..3dae84b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/HeartbeatProcessor.java
@@ -306,7 +306,7 @@ public class HeartbeatProcessor extends AbstractService{
 
           ComponentInfo componentInfo =
               ambariMetaInfo.getComponent(stackId.getStackName(),
-                  stackId.getStackVersion(), scHost.getServiceDisplayName(),
+                  stackId.getStackVersion(), scHost.getServiceType(),
                   scHost.getServiceComponentName());
 
           String status = scHost.getState().name();
@@ -509,8 +509,8 @@ public class HeartbeatProcessor extends AbstractService{
                         "RESTART".equals(report.getCustomCommand()))))
                 && null != report.getConfigurationTags()
                 && !report.getConfigurationTags().isEmpty()) {
-              LOG.info("Updating applied config on serviceDisplayName " + scHost.getServiceDisplayName() +
-                  ", serviceName " + scHost.getServiceName() +
+              LOG.info("Updating applied config on serviceName " + scHost.getServiceName() +
+                  ", serviceType " + scHost.getServiceType() +
                   ", component " + scHost.getServiceComponentName() + ", host " + scHost.getHostName());
               scHost.updateActualConfigs(report.getConfigurationTags());
               scHost.setRestartRequired(false);

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
index d778999..a5b3622 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/agent/StatusCommand.java
@@ -39,8 +39,8 @@ public class StatusCommand extends AgentCommand {
   @SerializedName("serviceName")
   private String serviceName;
 
-  @SerializedName("serviceDisplayName")
-  private String serviceDisplayName;
+  @SerializedName("serviceType")
+  private String serviceType;
 
   @SerializedName("componentName")
   private String componentName;
@@ -120,10 +120,10 @@ public class StatusCommand extends AgentCommand {
     this.serviceName = serviceName;
   }
 
-  public String getServiceDisplayName() { return serviceDisplayName; }
+  public String getServiceType() { return serviceType; }
 
-  public void setServiceDisplayName(String serviceDisplayName) {
-    this.serviceDisplayName = serviceDisplayName;
+  public void setServiceType(String serviceType) {
+    this.serviceType = serviceType;
   }
 
   public String getComponentName() {

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
index fd15105..8883ced 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/AmbariMetaInfo.java
@@ -287,34 +287,34 @@ public class AmbariMetaInfo {
   /**
    * Get components by service
    *
-   * @param stackName     stack name
-   * @param version       stack version
-   * @param serviceName   service name
+   * @param stackName         stack name
+   * @param version           stack version
+   * @param stackServiceName  stack service name
    * @return List of ComponentInfo objects
    * @throws AmbariException
    */
-  public List<ComponentInfo> getComponentsByService(String stackName, String version, String serviceName)
+  public List<ComponentInfo> getComponentsByService(String stackName, String version, String stackServiceName)
       throws AmbariException {
 
     ServiceInfo service;
     try {
-      service = getService(stackName, version, serviceName);
+      service = getService(stackName, version, stackServiceName);
     } catch (StackAccessException e) {
       throw new ParentObjectNotFoundException("Parent Service resource doesn't exist. stackName=" +
-          stackName + ", stackVersion=" + version + ", serviceName=" + serviceName);
+          stackName + ", stackVersion=" + version + ", stackServiceName=" + stackServiceName);
     }
     return service.getComponents();
   }
 
-  public ComponentInfo getComponent(String stackName, String version, String serviceDisplayName,
+  public ComponentInfo getComponent(String stackName, String version, String stackServiceName,
                                     String componentName) throws AmbariException {
 
-    ComponentInfo component = getService(stackName, version, serviceDisplayName).getComponentByName(componentName);
+    ComponentInfo component = getService(stackName, version, stackServiceName).getComponentByName(componentName);
 
     if (component == null) {
       throw new StackAccessException("stackName=" + stackName
           + ", stackVersion=" + version
-          + ", serviceDisplayName=" + serviceDisplayName
+          + ", stackServiceName=" + stackServiceName
           + ", componentName=" + componentName);
     }
     return component;
@@ -459,10 +459,10 @@ public class AmbariMetaInfo {
   /*
    * support isValidService(), isValidComponent for a given stack/version
    */
-  public boolean isValidService(String stackName, String version, String serviceName){
+  public boolean isValidService(String stackName, String version, String stackServiceName){
 
     try {
-      getService(stackName, version, serviceName);
+      getService(stackName, version, stackServiceName);
       return true;
     } catch (AmbariException e) {
       return false;
@@ -473,9 +473,9 @@ public class AmbariMetaInfo {
    * support isValidService(), isValidComponent for a given stack/version
    */
   public boolean isValidServiceComponent(String stackName, String version,
-                                         String serviceName, String componentName) {
+                                         String stackServiceName, String componentName) {
     try {
-      getService(stackName, version, serviceName).getComponentByName(componentName);
+      getService(stackName, version, stackServiceName).getComponentByName(componentName);
       return true;
     } catch (AmbariException e) {
       return false;
@@ -549,30 +549,30 @@ public class AmbariMetaInfo {
    */
   public ServiceInfo getService(Service service) throws AmbariException {
     StackId stackId = service.getDesiredStackId();
-    return getService(stackId.getStackName(), stackId.getStackVersion(), service.getName());
+    return getService(stackId.getStackName(), stackId.getStackVersion(), service.getServiceType());
   }
 
-  public ServiceInfo getService(String stackName, String version, String serviceName) throws AmbariException {
-    ServiceInfo service = getStack(stackName, version).getService(serviceName);
+  public ServiceInfo getService(String stackName, String version, String stackServiceName) throws AmbariException {
+    ServiceInfo service = getStack(stackName, version).getService(stackServiceName);
 
     if (service == null) {
       throw new StackAccessException("stackName=" + stackName + ", stackVersion=" +
-                                     version + ", serviceName=" + serviceName);
+                                     version + ", stackServiceName=" + stackServiceName);
     }
 
     return service;
   }
 
-  public boolean isServiceRemovedInStack(String stackName, String version, String serviceName) throws AmbariException{
+  public boolean isServiceRemovedInStack(String stackName, String version, String stackServiceName) throws AmbariException{
     StackInfo stack = getStack(stackName, version);
     List<String> removedServices = stack.getRemovedServices();
-    return removedServices.contains(serviceName);
+    return removedServices.contains(stackServiceName);
   }
 
-  public boolean isServiceWithNoConfigs(String stackName, String version, String serviceName) throws AmbariException{
+  public boolean isServiceWithNoConfigs(String stackName, String version, String stackServiceName) throws AmbariException{
     StackInfo stack = getStack(stackName, version);
     List<String> servicesWithNoConfigs = stack.getServicesWithNoConfigs();
-    return servicesWithNoConfigs.contains(serviceName);
+    return servicesWithNoConfigs.contains(stackServiceName);
   }
 
   public Collection<String> getMonitoringServiceNames(String stackName, String version)
@@ -730,10 +730,10 @@ public class AmbariMetaInfo {
     return result;
   }
 
-  public Set<PropertyInfo> getServiceProperties(String stackName, String version, String serviceName)
+  public Set<PropertyInfo> getServiceProperties(String stackName, String version, String stackServiceName)
       throws AmbariException {
 
-    return new HashSet<>(getService(stackName, version, serviceName).getProperties());
+    return new HashSet<>(getService(stackName, version, stackServiceName).getProperties());
   }
 
   public Set<PropertyInfo> getStackProperties(String stackName, String version)
@@ -742,17 +742,17 @@ public class AmbariMetaInfo {
     return new HashSet<>(getStack(stackName, version).getProperties());
   }
 
-  public Set<PropertyInfo> getPropertiesByName(String stackName, String version, String serviceName, String propertyName)
+  public Set<PropertyInfo> getPropertiesByName(String stackName, String version, String stackServiceName, String propertyName)
       throws AmbariException {
 
-    Set<PropertyInfo> properties = serviceName == null ?
+    Set<PropertyInfo> properties = stackServiceName == null ?
       getStackProperties(stackName, version)
-      : getServiceProperties(stackName, version, serviceName);
+      : getServiceProperties(stackName, version, stackServiceName);
 
     if (properties.size() == 0) {
       throw new StackAccessException("stackName=" + stackName
           + ", stackVersion=" + version
-          + ", serviceName=" + serviceName
+          + ", stackServiceName=" + stackServiceName
           + ", propertyName=" + propertyName);
     }
 
@@ -767,7 +767,7 @@ public class AmbariMetaInfo {
     if (propertyResult.isEmpty()) {
       throw new StackAccessException("stackName=" + stackName
           + ", stackVersion=" + version
-          + ", serviceName=" + serviceName
+          + ", stackServiceName=" + stackServiceName
           + ", propertyName=" + propertyName);
     }
 
@@ -911,12 +911,12 @@ public class AmbariMetaInfo {
    * Return metrics for a stack service.
    */
   public Map<String, Map<String, List<MetricDefinition>>> getServiceMetrics(String stackName,
-            String stackVersion, String serviceName) throws AmbariException {
+            String stackVersion, String stackServiceName) throws AmbariException {
 
-    ServiceInfo svc = getService(stackName, stackVersion, serviceName);
+    ServiceInfo svc = getService(stackName, stackVersion, stackServiceName);
 
     if (null == svc.getMetricsFile() || !svc.getMetricsFile().exists()) {
-      LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, serviceName);
+      LOG.debug("Metrics file for {}/{}/{} not found.", stackName, stackVersion, stackServiceName);
       return null;
     }
 
@@ -1022,11 +1022,11 @@ public class AmbariMetaInfo {
    * @return the list of defined metrics.
    */
   public List<MetricDefinition> getMetrics(String stackName, String stackVersion,
-      String serviceName, String componentName, String metricType)
+      String stackServiceName, String componentName, String metricType)
       throws AmbariException {
 
     Map<String, Map<String, List<MetricDefinition>>> map = getServiceMetrics(
-      stackName, stackVersion, serviceName);
+      stackName, stackVersion, stackServiceName);
 
     if (map != null && map.containsKey(componentName)) {
       if (map.get(componentName).containsKey(metricType)) {
@@ -1044,16 +1044,16 @@ public class AmbariMetaInfo {
    *          the stack name
    * @param stackVersion
    *          the stack version
-   * @param serviceName
-   *          the service name
+   * @param stackServiceName
+   *          the stack service name
    * @return the alert definitions for a stack or an empty list if none (never
    *         {@code null}).
    * @throws AmbariException
    */
   public Set<AlertDefinition> getAlertDefinitions(String stackName, String stackVersion,
-                                                  String serviceName) throws AmbariException {
+                                                  String stackServiceName) throws AmbariException {
 
-    ServiceInfo svc = getService(stackName, stackVersion, serviceName);
+    ServiceInfo svc = getService(stackName, stackVersion, stackServiceName);
     return getAlertDefinitions(svc);
   }
   /**

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
index dfe117e..60230f6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ComponentService.java
@@ -62,23 +62,23 @@ public class ComponentService extends BaseService {
   /**
    * Parent service display name.
    */
-  private String m_serviceDisplayName;
+  private String m_serviceName;
 
   /**
    * Constructor.
    *
    * @param clusterName           cluster name
    * @param serviceGroupName      servicegroup name
-   * @param serviceDisplayName    service display name
+   * @param serviceName           service name
    */
-  public ComponentService(String clusterName, String serviceGroupName, String serviceDisplayName) {
+  public ComponentService(String clusterName, String serviceGroupName, String serviceName) {
     m_clusterName = clusterName;
     m_serviceGroupName = serviceGroupName;
-    m_serviceDisplayName = serviceDisplayName;
+    m_serviceName = serviceName;
   }
 
   /**
-   * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentName}
+   * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentName}
    * Get a specific component.
    *
    * @param headers       http headers
@@ -99,7 +99,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+   * Handles GET: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
    * Get all components for a service.
    *
    * @param headers http headers
@@ -119,7 +119,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
    * Create components by specifying an array of components in the http body.
    * This is used to create multiple components in a single request.
    *
@@ -138,7 +138,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
    * Create a specific component.
    *
    * @param body          http body
@@ -159,7 +159,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
    * Update a specific component.
    *
    * @param body          http body
@@ -179,7 +179,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components
+   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components
    * Update multiple components.
    *
    * @param body          http body
@@ -196,7 +196,7 @@ public class ComponentService extends BaseService {
   }
 
   /**
-   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/components/{componentID}
+   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/components/{componentID}
    * Delete a specific component.
    *
    * @param headers     http headers
@@ -225,7 +225,7 @@ public class ComponentService extends BaseService {
     Map<Resource.Type,String> mapIds = new HashMap<Resource.Type, String>();
     mapIds.put(Resource.Type.Cluster, m_clusterName == null? null : m_clusterName.toString());
     mapIds.put(Resource.Type.ServiceGroup, m_serviceGroupName == null? null : m_serviceGroupName.toString());
-    mapIds.put(Resource.Type.Service, m_serviceDisplayName == null? null : m_serviceDisplayName.toString());
+    mapIds.put(Resource.Type.Service, m_serviceName == null? null : m_serviceName.toString());
     mapIds.put(Resource.Type.Component, componentName);
 
     return createResource(Resource.Type.Component, mapIds);
@@ -235,15 +235,15 @@ public class ComponentService extends BaseService {
                                       String componentName) {
     Map<Resource.Type,String> mapIds = new HashMap<>();
     mapIds.put(Resource.Type.Cluster, m_clusterName);
-    mapIds.put(Resource.Type.Service, m_serviceDisplayName);
+    mapIds.put(Resource.Type.Service, m_serviceName);
     mapIds.put(Resource.Type.Component, componentName);
     String filePrefixName;
 
     if (StringUtils.isEmpty(componentName)) {
-      if (StringUtils.isEmpty(m_serviceDisplayName)) {
+      if (StringUtils.isEmpty(m_serviceName)) {
         filePrefixName = m_clusterName + "(" + Resource.InternalType.Cluster.toString().toUpperCase()+")";
       } else {
-        filePrefixName = m_serviceDisplayName + "(" + Resource.InternalType.Service.toString().toUpperCase()+")";
+        filePrefixName = m_serviceName + "(" + Resource.InternalType.Service.toString().toUpperCase()+")";
       }
     } else {
       filePrefixName = componentName;

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
index 7a5e9ab..12f4bca 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/api/services/ServiceService.java
@@ -78,16 +78,16 @@ public class ServiceService extends BaseService {
   }
 
   /**
-   * Handles URL: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+   * Handles URL: /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
    * Get a specific service.
    *
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    * @return service resource representation
    */
   @GET
-  @Path("{serviceDisplayName}")
+  @Path("{serviceName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Get the details of a service",
       nickname = "ServiceService#getService",
@@ -104,10 +104,10 @@ public class ServiceService extends BaseService {
       @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR)
   })
   public Response getService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
-                             @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+                             @ApiParam @PathParam("serviceName") String serviceName) {
 
     return handleRequest(headers, body, ui, Request.Type.GET,
-        createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+        createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
   }
 
   /**
@@ -147,17 +147,17 @@ public class ServiceService extends BaseService {
   }
 
   /**
-   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
    * Create a specific service.
    *
    * @param body                http body
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    * @return information regarding the created service
    */
   @POST
-  @Path("{serviceDisplayName}")
+  @Path("{serviceName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Creates a service",
       nickname = "ServiceService#createServices"
@@ -176,9 +176,9 @@ public class ServiceService extends BaseService {
       @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
   })
   public Response createService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
-                                @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+                                @ApiParam @PathParam("serviceName") String serviceName) {
     return handleRequest(headers, body, ui, Request.Type.POST,
-        createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+        createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
   }
 
   /**
@@ -215,17 +215,17 @@ public class ServiceService extends BaseService {
   }
 
   /**
-   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
    * Update a specific service.
    *
    * @param body                http body
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName service display name
+   * @param serviceName service name
    * @return information regarding the updated service
    */
   @PUT
-  @Path("{serviceDisplayName}")
+  @Path("{serviceName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Updates a service",
       nickname = "ServiceService#updateService"
@@ -243,8 +243,8 @@ public class ServiceService extends BaseService {
       @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
   })
   public Response updateService(String body, @Context HttpHeaders headers, @Context UriInfo ui,
-                                @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
-    return handleRequest(headers, body, ui, Request.Type.PUT, createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+                                @ApiParam @PathParam("serviceName") String serviceName) {
+    return handleRequest(headers, body, ui, Request.Type.PUT, createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
   }
 
   /**
@@ -279,16 +279,16 @@ public class ServiceService extends BaseService {
   }
 
   /**
-   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}
+   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}
    * Delete a specific service.
    *
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    * @return information regarding the deleted service
    */
   @DELETE
-  @Path("{serviceDisplayName}")
+  @Path("{serviceName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Deletes a service",
       nickname = "ServiceService#deleteService"
@@ -301,47 +301,47 @@ public class ServiceService extends BaseService {
       @ApiResponse(code = HttpStatus.SC_INTERNAL_SERVER_ERROR, message = MSG_SERVER_ERROR),
   })
   public Response deleteService(@Context HttpHeaders headers, @Context UriInfo ui,
-                                @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName) {
-    return handleRequest(headers, null, ui, Request.Type.DELETE, createServiceResource(m_clusterName, m_serviceGroupName, serviceDisplayName));
+                                @ApiParam(required = true) @PathParam("serviceName") String serviceName) {
+    return handleRequest(headers, null, ui, Request.Type.DELETE, createServiceResource(m_clusterName, m_serviceGroupName, serviceName));
   }
 
   /**
    * Get the components sub-resource.
    *
-   * @param serviceDisplayName service display name
+   * @param serviceName service name
    * @return the components service
    */
-  @Path("{serviceDisplayName}/components")
+  @Path("{serviceName}/components")
   // TODO: find a way to handle this with Swagger (refactor or custom annotation?)
-  public ComponentService getComponentHandler(@PathParam("serviceDisplayName") String serviceDisplayName) {
+  public ComponentService getComponentHandler(@PathParam("serviceName") String serviceName) {
 
-    return new ComponentService(m_clusterName, m_serviceGroupName, serviceDisplayName);
+    return new ComponentService(m_clusterName, m_serviceGroupName, serviceName);
   }
 
   /**
    * Gets the alerts sub-resource.
    */
-  @Path("{serviceDisplayName}/alerts")
+  @Path("{serviceName}/alerts")
   // TODO: find a way to handle this with Swagger (refactor or custom annotation?)
   public AlertService getAlertHandler(
-      @PathParam("serviceDisplayName") String serviceDisplayName) {
-    return new AlertService(m_clusterName, serviceDisplayName, null);
+      @PathParam("serviceName") String serviceName) {
+    return new AlertService(m_clusterName, serviceName, null);
   }
 
   /**
-   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+   * Handles: POST /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
    * Create a service artifact instance.
    *
    * @param body                http body
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    * @param artifactName  artifact name
    *
    * @return information regarding the created artifact
    */
   @POST
-  @Path("{serviceDisplayName}/artifacts/{artifactName}")
+  @Path("{serviceName}/artifacts/{artifactName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Creates a service artifact",
       nickname = "ServiceService#createArtifact"
@@ -362,26 +362,26 @@ public class ServiceService extends BaseService {
   public Response createArtifact(String body,
                                  @Context HttpHeaders headers,
                                  @Context UriInfo ui,
-                                 @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName,
+                                 @ApiParam @PathParam("serviceName") String serviceName,
                                  @ApiParam @PathParam("artifactName") String artifactName) {
 
     return handleRequest(headers, body, ui, Request.Type.POST,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
   }
 
   /**
-   * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+   * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
    * Get all service artifacts.
    *
    * @param body                    http body
    * @param headers                 http headers
    * @param ui                      uri info
-   * @param serviceDisplayName      service display name
+   * @param serviceName      service name
    *
    * @return artifact collection resource representation
    */
   @GET
-  @Path("{serviceDisplayName}/artifacts")
+  @Path("{serviceName}/artifacts")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Get all service artifacts",
       nickname = "ServiceService#getArtifacts",
@@ -406,26 +406,26 @@ public class ServiceService extends BaseService {
   public Response getArtifacts(String body,
                               @Context HttpHeaders headers,
                               @Context UriInfo ui,
-                              @PathParam("serviceDisplayName") String serviceDisplayName) {
+                              @PathParam("serviceName") String serviceName) {
 
     return handleRequest(headers, body, ui, Request.Type.GET,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
   }
 
   /**
-   * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+   * Handles: GET /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
    * Gat a service artifact instance.
    *
    * @param body                    http body
    * @param headers                 http headers
    * @param ui                      uri info
-   * @param serviceDisplayName      service display name
+   * @param serviceName      service name
    * @param artifactName  artifact name
    *
    * @return artifact instance resource representation
    */
   @GET
-  @Path("{serviceDisplayName}/artifacts/{artifactName}")
+  @Path("{serviceName}/artifacts/{artifactName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Get the details of a service artifact",
       nickname = "ServiceService#getArtifact",
@@ -450,24 +450,24 @@ public class ServiceService extends BaseService {
   public Response getArtifact(String body,
                                  @Context HttpHeaders headers,
                                  @Context UriInfo ui,
-                                 @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName,
+                                 @ApiParam @PathParam("serviceName") String serviceName,
                                  @ApiParam @PathParam("artifactName") String artifactName) {
     return handleRequest(headers, body, ui, Request.Type.GET,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
   }
 
   /**
-   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
    * Update all artifacts matching the provided predicate.
    *
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    *
    * @return information regarding the updated artifacts
    */
   @PUT
-  @Path("{serviceDisplayName}/artifacts")
+  @Path("{serviceName}/artifacts")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Updates multiple artifacts",
       nickname = "ServiceService#updateArtifacts"
@@ -487,25 +487,25 @@ public class ServiceService extends BaseService {
   public Response updateArtifacts(String body,
                                   @Context HttpHeaders headers,
                                   @Context UriInfo ui,
-                                  @ApiParam @PathParam("serviceDisplayName") String serviceDisplayName) {
+                                  @ApiParam @PathParam("serviceName") String serviceName) {
 
     return handleRequest(headers, body, ui, Request.Type.PUT,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
   }
 
   /**
-   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+   * Handles: PUT /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
    * Update a specific artifact.
    *
    * @param headers                 http headers
    * @param ui                      uri info
-   * @param serviceDisplayName      service display name
+   * @param serviceName      service name
    * @param artifactName            artifact name
    *
    * @return information regarding the updated artifact
    */
   @PUT
-  @Path("{serviceDisplayName}/artifacts/{artifactName}")
+  @Path("{serviceName}/artifacts/{artifactName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Updates a single artifact",
       nickname = "ServiceService#updateArtifact"
@@ -525,25 +525,25 @@ public class ServiceService extends BaseService {
   public Response updateArtifact(String body,
                                  @Context HttpHeaders headers,
                                  @Context UriInfo ui,
-                                 @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName,
+                                 @ApiParam(required = true) @PathParam("serviceName") String serviceName,
                                  @ApiParam(required = true) @PathParam("artifactName") String artifactName) {
 
     return handleRequest(headers, body, ui, Request.Type.PUT,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
   }
 
   /**
-   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts
+   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts
    * Delete all artifacts matching the provided predicate.
    *
    * @param headers             http headers
    * @param ui                  uri info
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    *
    * @return information regarding the deleted artifacts
    */
   @DELETE
-  @Path("{serviceDisplayName}/artifacts")
+  @Path("{serviceName}/artifacts")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Deletes all artifacts of a service that match the provided predicate",
     nickname = "ServiceService#deleteArtifacts"
@@ -558,25 +558,25 @@ public class ServiceService extends BaseService {
   public Response deleteArtifacts(String body,
                                   @Context HttpHeaders headers,
                                   @Context UriInfo ui,
-                                  @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName) {
+                                  @ApiParam(required = true) @PathParam("serviceName") String serviceName) {
 
     return handleRequest(headers, body, ui, Request.Type.DELETE,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, null));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, null));
   }
 
   /**
-   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceDisplayName}/artifacts/{artifactName}
+   * Handles: DELETE /clusters/{clusterName}/servicegroups/{serviceGroupName}/services/{serviceName}/artifacts/{artifactName}
    * Delete a specific artifact.
    *
    * @param headers                 http headers
    * @param ui                      uri info
-   * @param serviceDisplayName      service display name
+   * @param serviceName      service name
    * @param artifactName            artifact name
    *
    * @return information regarding the deleted artifact
    */
   @DELETE
-  @Path("{serviceDisplayName}/artifacts/{artifactName}")
+  @Path("{serviceName}/artifacts/{artifactName}")
   @Produces(MediaType.TEXT_PLAIN)
   @ApiOperation(value = "Deletes a single service artifact",
       nickname = "ServiceService#deleteArtifact"
@@ -591,11 +591,11 @@ public class ServiceService extends BaseService {
   public Response deleteArtifact(String body,
                                  @Context HttpHeaders headers,
                                  @Context UriInfo ui,
-                                 @ApiParam(required = true) @PathParam("serviceDisplayName") String serviceDisplayName,
+                                 @ApiParam(required = true) @PathParam("serviceName") String serviceName,
                                  @ApiParam(required = true) @PathParam("artifactName") String artifactName) {
 
     return handleRequest(headers, body, ui, Request.Type.DELETE,
-        createArtifactResource(m_clusterName, m_serviceGroupName, serviceDisplayName, artifactName));
+        createArtifactResource(m_clusterName, m_serviceGroupName, serviceName, artifactName));
   }
 
   /**
@@ -603,33 +603,33 @@ public class ServiceService extends BaseService {
    *
    * @param request
    *          the request
-   * @param serviceDisplayName
-   *          the service display name
+   * @param serviceName
+   *          the service name
    *
    * @return the alert history service
    */
-  @Path("{serviceDisplayName}/alert_history")
+  @Path("{serviceName}/alert_history")
   // TODO: find a way to handle this with Swagger (refactor or custom annotation?)
   public AlertHistoryService getAlertHistoryService(
       @Context javax.ws.rs.core.Request request,
-      @PathParam("serviceDisplayName") String serviceDisplayName) {
+      @PathParam("serviceName") String serviceName) {
 
-    return new AlertHistoryService(m_clusterName, serviceDisplayName, null);
+    return new AlertHistoryService(m_clusterName, serviceName, null);
   }
 
   /**
    * Create a service resource instance.
    *
    * @param clusterName         cluster name
-   * @param serviceDisplayName  service display name
+   * @param serviceName  service name
    *
    * @return a service resource instance
    */
-  ResourceInstance createServiceResource(String clusterName, String serviceGroupName, String serviceDisplayName) {
+  ResourceInstance createServiceResource(String clusterName, String serviceGroupName, String serviceName) {
     Map<Resource.Type,String> mapIds = new HashMap<>();
     mapIds.put(Resource.Type.Cluster, clusterName);
     mapIds.put(Resource.Type.ServiceGroup, serviceGroupName);
-    mapIds.put(Resource.Type.Service, serviceDisplayName);
+    mapIds.put(Resource.Type.Service, serviceName);
 
     return createResource(Resource.Type.Service, mapIds);
   }
@@ -638,16 +638,16 @@ public class ServiceService extends BaseService {
    * Create an artifact resource instance.
    *
    * @param clusterName           cluster name
-   * @param serviceDisplayName    service display name
+   * @param serviceName    service name
    * @param artifactName          artifact name
    *
    * @return an artifact resource instance
    */
-  ResourceInstance createArtifactResource(String clusterName, String serviceGroupName, String serviceDisplayName, String artifactName) {
+  ResourceInstance createArtifactResource(String clusterName, String serviceGroupName, String serviceName, String artifactName) {
     Map<Resource.Type,String> mapIds = new HashMap<>();
     mapIds.put(Resource.Type.Cluster, clusterName);
     mapIds.put(Resource.Type.ServiceGroup, serviceGroupName);
-    mapIds.put(Resource.Type.Service, serviceDisplayName);
+    mapIds.put(Resource.Type.Service, serviceName);
     mapIds.put(Resource.Type.Artifact, artifactName);
 
     return createResource(Resource.Type.Artifact, mapIds);

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
index e9c9059..349b260 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/checks/SecondaryNamenodeDeletedCheck.java
@@ -99,7 +99,7 @@ public class SecondaryNamenodeDeletedCheck extends AbstractCheckDescriptor {
       List<HostComponentStateEntity> allHostComponents = hostComponentStateDao.findAll();
       for(HostComponentStateEntity hc : allHostComponents) {
         Service s = cluster.getService(hc.getServiceId());
-        if (s.getName().equalsIgnoreCase(HDFS_SERVICE_NAME) && hc.getComponentName().equalsIgnoreCase(SECONDARY_NAMENODE)) {
+        if (s.getServiceType().equalsIgnoreCase(HDFS_SERVICE_NAME) && hc.getComponentName().equalsIgnoreCase(SECONDARY_NAMENODE)) {
           hosts.add(hc.getHostName());
         }
       }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
index e9fa8db..9977d0c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementControllerImpl.java
@@ -606,33 +606,33 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
         throw new AuthorizationException("The authenticated user is not authorized to install service components on to hosts");
       }
 
-      if (StringUtils.isEmpty(request.getServiceDisplayName())) {
-        request.setServiceDisplayName(findService(cluster, request.getComponentName()));
+      if (StringUtils.isEmpty(request.getServiceName())) {
+        request.setServiceName(findService(cluster, request.getComponentName()));
         // TODO : What if request.getServiceGroupName() is null ? Get it from service instead.
       }
 
       if (LOG.isDebugEnabled()) {
         LOG.debug("Received a createHostComponent request, clusterName={}, serviceGroupName={}, serviceName={}, componentName={}, hostname={}, request={}",
-          request.getClusterName(), request.getServiceGroupName(), request.getServiceDisplayName(), request.getComponentName(), request.getHostname(), request);
+          request.getClusterName(), request.getServiceGroupName(), request.getServiceName(), request.getComponentName(), request.getHostname(), request);
       }
 
       if (!hostComponentNames.containsKey(request.getClusterName())) {
         hostComponentNames.put(request.getClusterName(), new HashMap<>());
       }
       if (!hostComponentNames.get(request.getClusterName())
-          .containsKey(request.getServiceDisplayName())) {
+          .containsKey(request.getServiceName())) {
         hostComponentNames.get(request.getClusterName()).put(
-            request.getServiceDisplayName(), new HashMap<String, Set<String>>());
+            request.getServiceName(), new HashMap<String, Set<String>>());
       }
       if (!hostComponentNames.get(request.getClusterName())
-          .get(request.getServiceDisplayName())
+          .get(request.getServiceName())
           .containsKey(request.getComponentName())) {
         hostComponentNames.get(request.getClusterName())
-            .get(request.getServiceDisplayName()).put(request.getComponentName(),
+            .get(request.getServiceName()).put(request.getComponentName(),
                 new HashSet<String>());
       }
       if (hostComponentNames.get(request.getClusterName())
-          .get(request.getServiceDisplayName())
+          .get(request.getServiceName())
           .get(request.getComponentName())
           .contains(request.getHostname())) {
         duplicates.add("[clusterName=" + request.getClusterName() + ", hostName=" + request.getHostname() +
@@ -640,7 +640,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
         continue;
       }
       hostComponentNames.get(request.getClusterName())
-          .get(request.getServiceDisplayName()).get(request.getComponentName())
+          .get(request.getServiceName()).get(request.getComponentName())
           .add(request.getHostname());
 
       if (request.getDesiredState() != null
@@ -656,10 +656,10 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
       Service s;
       try {
-        s = cluster.getService(request.getServiceDisplayName());
+        s = cluster.getService(request.getServiceName());
       } catch (ServiceNotFoundException e) {
         throw new IllegalArgumentException(
-            "The service[" + request.getServiceDisplayName() + "] associated with the component[" +
+            "The service[" + request.getServiceName() + "] associated with the component[" +
             request.getComponentName() + "] doesn't exist for the cluster[" + request.getClusterName() + "]");
       }
       ServiceComponent sc = s.getServiceComponent(
@@ -743,7 +743,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
     for (ServiceComponentHostRequest request : requests) {
       Cluster cluster = clusters.getCluster(request.getClusterName());
-      Service s = cluster.getService(request.getServiceDisplayName());
+      Service s = cluster.getService(request.getServiceName());
       ServiceComponent sc = s.getServiceComponent(
           request.getComponentName());
 
@@ -1236,7 +1236,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
     }
 
     if (request.getComponentName() != null) {
-      if (StringUtils.isBlank(request.getServiceDisplayName())) {
+      if (StringUtils.isBlank(request.getServiceName())) {
 
         // !!! FIXME the assumption that a component is unique across all stacks is a ticking
         // time bomb.  Blueprints are making this assumption.
@@ -1247,13 +1247,13 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
           throw new ServiceComponentHostNotFoundException(
               cluster.getClusterName(), null, request.getComponentName(), request.getHostname());
         }
-        request.setServiceDisplayName(serviceName);
+        request.setServiceName(serviceName);
       }
     }
 
     Set<Service> services = new HashSet<>();
-    if (request.getServiceDisplayName() != null && !request.getServiceDisplayName().isEmpty()) {
-      services.add(cluster.getService(request.getServiceDisplayName()));
+    if (request.getServiceName() != null && !request.getServiceName().isEmpty()) {
+      services.add(cluster.getService(request.getServiceName()));
     } else {
       services.addAll(cluster.getServices().values());
     }
@@ -1363,7 +1363,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
             response.add(r);
           } catch (ServiceComponentHostNotFoundException e) {
-            if (request.getServiceDisplayName() == null || request.getComponentName() == null) {
+            if (request.getServiceName() == null || request.getComponentName() == null) {
               // Ignore the exception if either the service name or component name are not specified.
               // This is an artifact of how we get host_components and can happen in the case where
               // we get all host_components for a host, for example.
@@ -1375,7 +1375,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
               // condition.
               LOG.debug("ServiceComponentHost not found ", e);
               throw new ServiceComponentHostNotFoundException(cluster.getClusterName(),
-                  request.getServiceDisplayName(), request.getComponentName(), request.getHostname());
+                  request.getServiceName(), request.getComponentName(), request.getHostname());
             }
           }
         } else {
@@ -3535,14 +3535,14 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
   }
 
   private void checkIfHostComponentsInDeleteFriendlyState(ServiceComponentHostRequest request, Cluster cluster) throws AmbariException {
-    Service service = cluster.getService(request.getServiceDisplayName());
+    Service service = cluster.getService(request.getServiceName());
     ServiceComponent component = service.getServiceComponent(request.getComponentName());
     ServiceComponentHost componentHost = component.getServiceComponentHost(request.getHostname());
 
     if (!componentHost.canBeRemoved()) {
       throw new AmbariException("Host Component cannot be removed"
               + ", clusterName=" + request.getClusterName()
-              + ", serviceDisplayName=" + request.getServiceDisplayName()
+              + ", serviceName=" + request.getServiceName()
               + ", componentName=" + request.getComponentName()
               + ", hostname=" + request.getHostname()
               + ", request=" + request);
@@ -3560,7 +3560,7 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
   @Override
   public String findService(Cluster cluster, String componentName) throws AmbariException {
-    return cluster.getServiceByComponentName(componentName).getServiceDisplayName();
+    return cluster.getServiceByComponentName(componentName).getName();
   }
 
   /**
@@ -3681,18 +3681,18 @@ public class AmbariManagementControllerImpl implements AmbariManagementControlle
 
       Cluster cluster = clusters.getCluster(request.getClusterName());
 
-      if (StringUtils.isEmpty(request.getServiceDisplayName())) {
-        request.setServiceDisplayName(findService(cluster, request.getComponentName()));
+      if (StringUtils.isEmpty(request.getServiceName())) {
+        request.setServiceName(findService(cluster, request.getComponentName()));
       }
 
       LOG.info("Received a hostComponent DELETE request"
         + ", clusterName=" + request.getClusterName()
-        + ", serviceDisplayName=" + request.getServiceDisplayName()
+        + ", serviceName=" + request.getServiceName()
         + ", componentName=" + request.getComponentName()
         + ", hostname=" + request.getHostname()
         + ", request=" + request);
 
-      Service service = cluster.getService(request.getServiceDisplayName());
+      Service service = cluster.getService(request.getServiceName());
       ServiceComponent component = service.getServiceComponent(request.getComponentName());
       ServiceComponentHost componentHost = component.getServiceComponentHost(request.getHostname());
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
index 7c4c9ab..ea082c6 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostRequest.java
@@ -24,7 +24,7 @@ public class ServiceComponentHostRequest {
 
   private String clusterName; // REF
   private String serviceGroupName;
-  private String serviceDisplayName;
+  private String serviceName;
   private String componentName;
   private String hostname;
   private String publicHostname;
@@ -44,7 +44,7 @@ public class ServiceComponentHostRequest {
     super();
     this.clusterName = clusterName;
     this.serviceGroupName = serviceGroupName;
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceName = serviceName;
     this.componentName = componentName;
     this.hostname = hostname;
     this.desiredState = desiredState;
@@ -63,15 +63,15 @@ public class ServiceComponentHostRequest {
   /**
    * @return the serviceName
    */
-  public String getServiceDisplayName() {
-    return serviceDisplayName;
+  public String getServiceName() {
+    return serviceName;
   }
 
   /**
-   * @param serviceDisplayName the serviceName to set
+   * @param serviceName the serviceName to set
    */
-  public void setServiceDisplayName(String serviceDisplayName) {
-    this.serviceDisplayName = serviceDisplayName;
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
   }
 
   /**
@@ -161,7 +161,7 @@ public class ServiceComponentHostRequest {
     StringBuilder sb = new StringBuilder();
     sb.append("{" + " clusterName=").append(clusterName)
       .append(", serviceGroupName=").append(serviceGroupName)
-      .append(", serviceDisplayName=").append(serviceDisplayName)
+      .append(", serviceName=").append(serviceName)
       .append(", componentName=").append(componentName)
       .append(", hostname=").append(hostname)
       .append(", publicHostname=").append(publicHostname)

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
index ebfbf5c..c420a50 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentHostResponse.java
@@ -32,7 +32,7 @@ public class ServiceComponentHostResponse {
   private String serviceGroupName;
   private Long serviceId;
   private String serviceName;
-  private String serviceDisplayName;
+  private String serviceType;
   private Long hostComponentId;
   private String componentName;
   private String displayName;
@@ -51,7 +51,7 @@ public class ServiceComponentHostResponse {
   private UpgradeState upgradeState = UpgradeState.NONE;
 
   public ServiceComponentHostResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
-                                      Long serviceId, String serviceName, String serviceDisplayName, Long hostComponentId,
+                                      Long serviceId, String serviceName, String serviceType, Long hostComponentId,
                                       String componentName, String displayName, String hostname, String publicHostname,
                                       String liveState, String version, String desiredState, String desiredStackVersion,
                                       String desiredRepositoryVersion, HostComponentAdminState adminState) {
@@ -61,7 +61,7 @@ public class ServiceComponentHostResponse {
     this.serviceId = serviceId;
     this.clusterName = clusterName;
     this.serviceName = serviceName;
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceType = serviceType;
     this.hostComponentId = hostComponentId;
     this.componentName = componentName;
     this.displayName = displayName;
@@ -134,12 +134,12 @@ public class ServiceComponentHostResponse {
   /**
    * @return the serviceName
    */
-  public String getServiceDisplayName() { return serviceDisplayName; }
+  public String getServiceType() { return serviceType; }
 
   /**
-   * @param serviceDisplayName the serviceDisplayName to set
+   * @param serviceType the serviceType to set
    */
-  public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+  public void setServiceType(String serviceType) { this.serviceType = serviceType; }
 
   /**
    * @return the componentName
@@ -328,8 +328,8 @@ public class ServiceComponentHostResponse {
       return false;
     }
 
-    if (serviceDisplayName != null ?
-            !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+    if (serviceType != null ?
+            !serviceType.equals(that.serviceType) : that.serviceType != null) {
       return false;
     }
 
@@ -359,7 +359,7 @@ public class ServiceComponentHostResponse {
     result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
     result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
     result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
-    result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+    result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
     result = 71 * result + (componentName != null ? componentName.hashCode() : 0);
     result = 71 * result + (displayName != null ? displayName.hashCode() : 0);
     result = 71 * result + (hostname != null ? hostname.hashCode() : 0);

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
index 1556b70..f59eb98 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentRequest.java
@@ -23,29 +23,29 @@ public class ServiceComponentRequest {
 
   private String clusterName; // REF
   private String serviceGroupName;
-  private String serviceDisplayName; // GET/CREATE/UPDATE/DELETE
+  private String serviceName; // GET/CREATE/UPDATE/DELETE
   private String componentName; // GET/CREATE/UPDATE/DELETE
   private String desiredState; // CREATE/UPDATE
   private String componentCategory;
   private String recoveryEnabled; // CREATE/UPDATE
 
-  public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceDisplayName,
+  public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceName,
                                  String componentName, String desiredState) {
-    this(clusterName, serviceGroupName, serviceDisplayName, componentName, desiredState, null, null);
+    this(clusterName, serviceGroupName, serviceName, componentName, desiredState, null, null);
   }
 
-  public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceDisplayName, String componentName,
+  public ServiceComponentRequest(String clusterName, String serviceGroupName, String serviceName, String componentName,
                                  String desiredState, String recoveryEnabled) {
-    this(clusterName, serviceGroupName, serviceDisplayName, componentName, desiredState, recoveryEnabled, null);
+    this(clusterName, serviceGroupName, serviceName, componentName, desiredState, recoveryEnabled, null);
   }
 
   public ServiceComponentRequest(String clusterName, String serviceGroupName,
-                                 String serviceDisplayName, String componentName,
+                                 String serviceName, String componentName,
                                  String desiredState, String recoveryEnabled,
                                  String componentCategory) {
     this.clusterName = clusterName;
     this.serviceGroupName = serviceGroupName;
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceName = serviceName;
     this.componentName = componentName;
     this.desiredState = desiredState;
     this.recoveryEnabled = recoveryEnabled;
@@ -65,15 +65,15 @@ public class ServiceComponentRequest {
   /**
    * @return the serviceName
    */
-  public String getServiceDisplayName() {
-    return serviceDisplayName;
+  public String getServiceName() {
+    return serviceName;
   }
 
   /**
-   * @param serviceDisplayName the serviceDisplayName to set
+   * @param serviceName the serviceName to set
    */
-  public void setServiceDisplayName(String serviceDisplayName) {
-    this.serviceDisplayName = serviceDisplayName;
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
   }
 
 
@@ -141,8 +141,8 @@ public class ServiceComponentRequest {
 
   @Override
   public String toString() {
-    return String.format("[clusterName=%s, serviceGroupName=%s, serviceDisplayName=%s, componentName=%s, " +
-                         "desiredState=%s, recoveryEnabled=%s, componentCategory=%s]", clusterName, serviceGroupName,
-                          serviceDisplayName, clusterName, desiredState, recoveryEnabled, componentCategory);
+    return String.format("[clusterName=%s, serviceGroupName=%s, serviceName=%s, componentName=%s, " +
+      "desiredState=%s, recoveryEnabled=%s, componentCategory=%s]", clusterName, serviceGroupName,
+      serviceName, clusterName, desiredState, recoveryEnabled, componentCategory);
   }
 }

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
index b96fb8a..d63b33c 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceComponentResponse.java
@@ -32,7 +32,7 @@ public class ServiceComponentResponse {
   private String serviceGroupName; // REF
   private Long serviceId; // REF
   private String serviceName;
-  private String serviceDisplayName;
+  private String serviceType;
   private String componentName;
   private String displayName;
   private String desiredStackId;
@@ -44,7 +44,7 @@ public class ServiceComponentResponse {
   private RepositoryVersionState repoState;
 
   public ServiceComponentResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
-                                  Long serviceId, String serviceName, String serviceDisplayName, String componentName,
+                                  Long serviceId, String serviceName, String serviceType, String componentName,
                                   StackId desiredStackId, String desiredState, Map<String, Integer> serviceComponentStateCount,
                                   boolean recoveryEnabled, String displayName, String desiredVersion,
                                   RepositoryVersionState repoState) {
@@ -54,7 +54,7 @@ public class ServiceComponentResponse {
     this.serviceGroupName = serviceGroupName;
     this.serviceId = serviceId;
     this.serviceName = serviceName;
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceType = serviceType;
     this.componentName = componentName;
     this.displayName = displayName;
     this.desiredStackId = desiredStackId.getStackId();
@@ -82,12 +82,12 @@ public class ServiceComponentResponse {
   /**
    * @return the serviceName
    */
-  public String getServiceDisplayName() { return serviceDisplayName; }
+  public String getServiceType() { return serviceType; }
 
   /**
-   * @param serviceDisplayName the serviceDisplayName to set
+   * @param serviceType the serviceType to set
    */
-  public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+  public void setServiceType(String serviceType) { this.serviceType = serviceType; }
 
   /**
    * @return the serviceId
@@ -288,8 +288,8 @@ public class ServiceComponentResponse {
       return false;
     }
 
-    if (serviceDisplayName != null ?
-            !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+    if (serviceType != null ?
+            !serviceType.equals(that.serviceType) : that.serviceType != null) {
       return false;
     }
 
@@ -314,7 +314,7 @@ public class ServiceComponentResponse {
     result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
     result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
     result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
-    result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+    result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
     result = 71 * result + (componentName != null ? componentName.hashCode():0);
     result = 71 * result + (displayName != null ? displayName.hashCode():0);
     return result;

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
index 59a700e..70e5240 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceRequest.java
@@ -26,7 +26,7 @@ public class ServiceRequest {
 
   private String clusterName; // REF
   private String serviceName; // GET/CREATE/DELETE
-  private String serviceDisplayName; // GET/CREATE/UPDATE/DELETE
+  private String serviceType; // GET/CREATE/UPDATE/DELETE
   private String serviceGroupName;
   private String desiredState; // CREATE/UPDATE
   private String maintenanceState; // UPDATE
@@ -49,7 +49,7 @@ public class ServiceRequest {
   public ServiceRequest(String clusterName,
                         String serviceGroupName,
                         String serviceName,
-                        String serviceDisplayName,
+                        String serviceType,
                         Long desiredRepositoryVersionId,
                         String desiredState,
                         String credentialStoreEnabled,
@@ -61,7 +61,7 @@ public class ServiceRequest {
 
     this.desiredRepositoryVersionId = desiredRepositoryVersionId;
 
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceType = serviceType;
     this.desiredState = desiredState;
     this.credentialStoreEnabled = credentialStoreEnabled;
     // Credential store supported cannot be changed after
@@ -77,20 +77,20 @@ public class ServiceRequest {
   public String getServiceName() { return serviceName; }
 
   /**
-   * @param serviceName the Service Display Name to set
+   * @param serviceName the service name to set
    */
   public void setServiceName(String serviceName) { this.serviceName = serviceName; }
 
   /**
-   * @return the service display name
+   * @return the service type
    */
-  @ApiModelProperty(name = "service_display_name")
-  public String getServiceDisplayName() { return serviceDisplayName; }
+  @ApiModelProperty(name = "service_type")
+  public String getServiceType() { return serviceType; }
 
   /**
-   * @param serviceDisplayName the Service Display Name to set
+   * @param serviceType the service type to set
    */
-  public void setServiceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+  public void setServiceType(String serviceType) { this.serviceType = serviceType; }
 
   /**
    * @return the service group Name
@@ -181,7 +181,7 @@ public class ServiceRequest {
     StringBuilder sb = new StringBuilder();
     sb.append("clusterName=" + clusterName
       + ", serviceGroupName=" + serviceGroupName
-      + ", serviceDisplayName=" + serviceDisplayName
+      + ", serviceName=" + serviceName
       + ", desiredState=" + desiredState
       + ", maintenanceState=" + maintenanceState
       + ", credentialStoreEnabled=" + credentialStoreEnabled

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
index f528b4e..73a2c93 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java
@@ -31,7 +31,7 @@ public class ServiceResponse {
   private String serviceGroupName;
   private Long serviceId;
   private String serviceName;
-  private String serviceDisplayName;
+  private String serviceType;
   private StackId desiredStackId;
   private String desiredRepositoryVersion;
   private Long desiredRepositoryVersionId;
@@ -42,7 +42,7 @@ public class ServiceResponse {
   private boolean credentialStoreEnabled;
 
   public ServiceResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName,
-                         Long serviceId, String serviceName, String serviceDisplayName, StackId desiredStackId,
+                         Long serviceId, String serviceName, String serviceType, StackId desiredStackId,
                          String desiredRepositoryVersion, RepositoryVersionState repositoryVersionState, String desiredState,
                          boolean credentialStoreSupported, boolean credentialStoreEnabled) {
     this.clusterId = clusterId;
@@ -51,7 +51,7 @@ public class ServiceResponse {
     this.serviceGroupName = serviceGroupName;
     this.serviceId = serviceId;
     this.serviceName = serviceName;
-    this.serviceDisplayName = serviceDisplayName;
+    this.serviceType = serviceType;
     this.desiredStackId = desiredStackId;
     this.repositoryVersionState = repositoryVersionState;
     setDesiredState(desiredState);
@@ -137,14 +137,14 @@ public class ServiceResponse {
   public void setServiceId(Long serviceId) { this.serviceId = serviceId; }
 
   /**
-   * @return the real serviceName
+   * @return the serviceType (i.e. stack service name)
    */
-  public String getServiceDisplayName() { return serviceDisplayName; }
+  public String getServiceType() { return serviceType; }
 
   /**
-   * @param serviceDisplayName the real serviceName to set
+   * @param serviceType the serviceType (i.e. stack service name) to set
    */
-  public void setserviceDisplayName(String serviceDisplayName) { this.serviceDisplayName = serviceDisplayName; }
+  public void setServiceType(String serviceType) { this.serviceType = serviceType; }
 
   /**
    * @return the desiredState
@@ -220,8 +220,8 @@ public class ServiceResponse {
             !serviceName.equals(that.serviceName) : that.serviceName != null) {
       return false;
     }
-    if (serviceDisplayName != null ?
-            !serviceDisplayName.equals(that.serviceDisplayName) : that.serviceDisplayName != null) {
+    if (serviceType != null ?
+            !serviceType.equals(that.serviceType) : that.serviceType != null) {
       return false;
     }
 
@@ -287,7 +287,7 @@ public class ServiceResponse {
     result = 71 * result + (serviceGroupName != null ? serviceGroupName.hashCode() : 0);
     result = 71 * result + (serviceId != null ? serviceId.hashCode() : 0);
     result = 71 * result + (serviceName != null ? serviceName.hashCode() : 0);
-    result = 71 * result + (serviceDisplayName != null ? serviceDisplayName.hashCode() : 0);
+    result = 71 * result + (serviceType != null ? serviceType.hashCode() : 0);
     return result;
   }
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/ba1ec6dd/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
index ef34c6a..652d667 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ClientConfigResourceProvider.java
@@ -200,7 +200,7 @@ public class ClientConfigResourceProvider extends AbstractControllerResourceProv
 
     ServiceComponentHostRequest schRequest =  requests.iterator().next();
     String requestComponentName = schRequest.getComponentName();
-    String requestServiceName = schRequest.getServiceDisplayName();
+    String requestServiceName = schRequest.getServiceName();
     String requestHostName =  schRequest.getHostname();
 
     Map<String,List<ServiceComponentHostResponse>> serviceToComponentMap = new HashMap<>();


Mime
View raw message