AMBARI-5155 - Redundant Hive server component name in API

contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/msi/ClusterDefinition.java

@@ -83,7 +83,6 @@ public class ClusterDefinition {
 
     Set<String> hiveComponents = new HashSet<String>();
     hiveComponents.add("HIVE_SERVER");
-    hiveComponents.add("HIVE_SERVER2");
     hiveComponents.add("HIVE_METASTORE");
     hiveComponents.add("HIVE_CLIENT");
     componentNameMap.put("HIVE_SERVER_HOST", hiveComponents);
@@ -125,7 +124,6 @@ public class ClusterDefinition {
     componentServiceMap.put("DATANODE",           "HDFS");
     componentServiceMap.put("SECONDARY_NAMENODE", "HDFS");
     componentServiceMap.put("HIVE_SERVER",        "HIVE");
-    componentServiceMap.put("HIVE_SERVER2",       "HIVE");
     componentServiceMap.put("HIVE_METASTORE",     "HIVE");
     componentServiceMap.put("HIVE_CLIENT",        "HIVE");
     componentServiceMap.put("OOZIE_SERVER",       "OOZIE");
@@ -183,7 +181,7 @@ public class ClusterDefinition {
     initComponentServiceMap();
   }
 
-  private Integer getMajorStackVersion() {
+  public Integer getMajorStackVersion() {
     if(StringUtils.isNotEmpty(versionId)) {
       String majorVersion = StringUtils.substring(versionId, 4, 5);
       if(StringUtils.isNotEmpty(majorVersion)) {

contrib/ambari-scom/ambari-scom-server/src/main/java/org/apache/ambari/scom/SQLProviderModule.java

@@ -60,13 +60,15 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
 
   private static Map<String, String> serviceNames = new HashMap<String, String>();
 
-  static {
+  private void initServiceNames() {
+    Integer majorStackVersion = clusterDefinition.getMajorStackVersion();
+    if(majorStackVersion != null) {
+        serviceNames.put("HIVE_SERVER", majorStackVersion == 1 ? "hiveserver" : "hiveserver2");
+    }
     serviceNames.put("NAMENODE", "namenode");
     serviceNames.put("SECONDARY_NAMENODE", "secondarynamenode");
     serviceNames.put("JOBTRACKER", "jobtracker");
     serviceNames.put("HISTORYSERVER", "historyserver");
-    serviceNames.put("HIVE_SERVER", "hiveserver");
-    serviceNames.put("HIVE_SERVER2", "hiveserver2");
     serviceNames.put("HIVE_METASTORE", "metastore");
     serviceNames.put("HIVE_CLIENT", "hwi");
     serviceNames.put("OOZIE_SERVER", "oozieservice");
@@ -89,6 +91,7 @@ public class SQLProviderModule extends DefaultProviderModule implements HostInfo
 
   public SQLProviderModule() {
     clusterDefinition = new ClusterDefinition(this, ClusterDefinitionProvider.instance(), this);
+    initServiceNames();
   }
 
 

contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/ComponentProviderTest.java

@@ -41,7 +41,7 @@ public class ComponentProviderTest {
     ClusterDefinition clusterDefinition = new ClusterDefinition(new TestStateProvider(), new TestClusterDefinitionProvider(), new TestHostInfoProvider());
     ComponentProvider provider = new ComponentProvider(clusterDefinition);
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
-    Assert.assertEquals(16, resources.size());
+    Assert.assertEquals(15, resources.size());
   }
 
   @Test

contrib/ambari-scom/ambari-scom-server/src/test/java/org/apache/ambari/msi/HostComponentProviderTest.java

@@ -41,7 +41,7 @@ public class HostComponentProviderTest {
     ClusterDefinition clusterDefinition = new ClusterDefinition(new TestStateProvider(), new TestClusterDefinitionProvider(), new TestHostInfoProvider());
     HostComponentProvider provider = new HostComponentProvider(clusterDefinition);
     Set<Resource> resources = provider.getResources(PropertyHelper.getReadRequest(), null);
-    Assert.assertEquals(26, resources.size());
+    Assert.assertEquals(25, resources.size());
   }
 
   @Test