You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by jl...@apache.org on 2016/06/27 23:36:52 UTC
[26/34] ambari git commit: AMBARI-17355 & AMBARI-17354: POC: FE & BE
changes for first class support for Yarn hosted services
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/main/resources/componentsMap.dat
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/componentsMap.dat b/ambari-server/src/main/resources/componentsMap.dat
new file mode 100644
index 0000000..01bf634
--- /dev/null
+++ b/ambari-server/src/main/resources/componentsMap.dat
@@ -0,0 +1,12 @@
+ZOOKEEPER_SERVER=ZK
+HBASE_MASTER=HBASEMASTER
+HBASE_REGIONSERVER=REGIONSERVER
+LOGSEARCH_SOLR=SOLR
+LOGSEARCH_SERVER=UI
+KAFKA_BROKER=KAFKABROKER
+STORM_UI_SERVER=STORMUI
+NIMBUS=NIMBUS
+SUPERVISOR=SUPERVISOR
+NIFI_MASTER=NIFI
+TRANSACTIONMONITORUI=TRANSACTIONMONITORUI
+COMETD=COMETD
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/main/resources/key_properties.json
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/key_properties.json b/ambari-server/src/main/resources/key_properties.json
index 8069349..b11870b 100644
--- a/ambari-server/src/main/resources/key_properties.json
+++ b/ambari-server/src/main/resources/key_properties.json
@@ -2,6 +2,10 @@
"Cluster": {
"Cluster": "Clusters/cluster_name"
},
+ "ServiceGroup": {
+ "Cluster": "ServiceGroupInfo/cluster_name",
+ "ServiceGroup": "ServiceGroupInfo/service_group_name"
+ },
"Service": {
"Cluster": "ServiceInfo/cluster_name",
"Service": "ServiceInfo/service_name"
@@ -19,6 +23,7 @@
"HostComponent": {
"Cluster": "HostRoles/cluster_name",
"Host": "HostRoles/host_name",
+ "Service": "HostRoles/service_name",
"HostComponent": "HostRoles/component_name",
"Component": "HostRoles/component_name"
},
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/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 eac0dbd..3a8e914 100644
--- a/ambari-server/src/main/resources/properties.json
+++ b/ambari-server/src/main/resources/properties.json
@@ -12,9 +12,27 @@
"Clusters/health_report",
"_"
],
+ "ServiceGroup":[
+ "ServiceGroupInfo/cluster_name",
+ "ServiceGroupInfo/service_group_name",
+ "ServiceGroupInfo/service_group_display_name",
+ "ServiceGroupInfo/service_group_type",
+ "ServiceGroupInfo/assembly_file",
+ "ServiceGroupInfo/desired_state",
+ "ServiceGroupInfo/current_state",
+ "ServiceGroupInfo/application_id",
+ "ServiceGroupInfo/lifetime",
+ "ServiceGroupInfo/quicklinks",
+ "ServiceGroupInfo/containers",
+ "ServiceGroupInfo/number_of_containers",
+ "ServiceGroupInfo/expected_number_of_containers",
+ "_"
+ ],
"Service":[
- "ServiceInfo/service_name",
"ServiceInfo/cluster_name",
+ "ServiceInfo/service_name",
+ "ServiceInfo/stack_service_name",
+ "ServiceInfo/service_group_name",
"ServiceInfo/state",
"ServiceInfo/maintenance_state",
"Services/description",
@@ -60,6 +78,7 @@
"ServiceComponents/display_name",
"ServiceComponents/description",
"ServiceComponentInfo/category",
+ "ServiceComponentInfo/desired_count",
"ServiceComponentInfo/total_count",
"ServiceComponentInfo/started_count",
"ServiceComponentInfo/installed_count",
@@ -71,6 +90,8 @@
"HostRoles/role_id",
"HostRoles/cluster_name",
"HostRoles/host_name",
+ "HostRoles/bare_host_name",
+ "HostRoles/comntainer_name",
"HostRoles/component_name",
"HostRoles/display_name",
"HostRoles/state",
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/main/resources/stacks/HDP/2.4/services/CFMON/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/CFMON/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/CFMON/metainfo.xml
new file mode 100644
index 0000000..1dc81ef
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/CFMON/metainfo.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<metainfo>
+<schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>CFMON</name>
+ <displayName>CF Monitor</displayName>
+ <comment>A New Credit Fraud Monitoring Service</comment>
+ <version>1.0.0</version>
+ <components>
+ <component>
+ <name>TRANSACTIONMONITORUI</name>
+ <displayName>Transation Monitoring UI</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ </component>
+ <component>
+ <name>COMETD</name>
+ <displayName>CometD Server</displayName>
+ <category>MASTER</category>
+ <cardinality>1</cardinality>
+ </component>
+ </components>
+ </service>
+ </services>
+</metainfo>
+
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/main/resources/stacks/HDP/2.4/services/NIFI/metainfo.xml
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/resources/stacks/HDP/2.4/services/NIFI/metainfo.xml b/ambari-server/src/main/resources/stacks/HDP/2.4/services/NIFI/metainfo.xml
new file mode 100755
index 0000000..35dafe3
--- /dev/null
+++ b/ambari-server/src/main/resources/stacks/HDP/2.4/services/NIFI/metainfo.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<metainfo>
+ <schemaVersion>2.0</schemaVersion>
+ <services>
+ <service>
+ <name>NIFI</name>
+ <displayName>NiFi</displayName>
+ <comment>Apache NiFi is an easy to use, powerful, and reliable system to process and distribute data.</comment>
+ <version>0.6.0.2.4</version>
+ <components>
+ <component>
+ <name>NIFI_MASTER</name>
+ <displayName>NiFi</displayName>
+ <category>MASTER</category>
+ <cardinality>1+</cardinality>
+ <timelineAppid>NIFI</timelineAppid>
+ </component>
+ </components>
+ </service>
+ </services>
+</metainfo>
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
index bdbb9ab..f9908a0 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/HeartbeatProcessorTest.java
@@ -149,7 +149,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testHeartbeatWithConfigs() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -219,7 +219,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testRestartRequiredAfterInstallClient() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(HDFS_CLIENT).persist();
hdfs.getServiceComponent(HDFS_CLIENT).addServiceComponentHost(DummyHostname1).persist();
@@ -285,7 +285,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testHeartbeatCustomCommandWithConfigs() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -370,7 +370,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testHeartbeatCustomStartStop() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -455,7 +455,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testStatusHeartbeat() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -587,7 +587,7 @@ public class HeartbeatProcessorTest {
public void testCommandReportOnHeartbeatUpdatedState()
throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -707,7 +707,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testUpgradeSpecificHandling() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -802,7 +802,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testCommandStatusProcesses() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -884,7 +884,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testComponentUpgradeCompleteReport() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -969,7 +969,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testComponentUpgradeFailReport() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -1090,7 +1090,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testComponentUpgradeInProgressReport() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -1295,7 +1295,7 @@ public class HeartbeatProcessorTest {
@SuppressWarnings("unchecked")
public void testComponentInProgressStatusSafeAfterStatusReport() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
index 17c5513..8259fd8 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatHandler.java
@@ -221,7 +221,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testStatusHeartbeatWithAnnotation() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.addServiceComponent(NAMENODE).persist();
@@ -273,7 +273,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testLiveStatusUpdateAfterStopFailed() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).
@@ -385,7 +385,7 @@ public class TestHeartbeatHandler {
HeartBeatHandler handler = new HeartBeatHandler(fsm, new ActionQueue(), am,
injector);
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).setRecoveryEnabled(true);
@@ -449,7 +449,7 @@ public class TestHeartbeatHandler {
HeartBeatHandler handler = new HeartBeatHandler(fsm, new ActionQueue(), am,
injector);
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
/**
@@ -784,7 +784,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testTaskInProgressHandling() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -842,7 +842,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testOPFailedEventForAbortedTask() throws AmbariException, InvalidStateTransitionException {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -917,7 +917,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testStatusHeartbeatWithVersion() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -995,7 +995,7 @@ public class TestHeartbeatHandler {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
Host hostObject = clusters.getHost(DummyHostname1);
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -1077,7 +1077,7 @@ public class TestHeartbeatHandler {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
Host hostObject = clusters.getHost(DummyHostname1);
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -1411,7 +1411,7 @@ public class TestHeartbeatHandler {
@SuppressWarnings("unchecked")
public void testCommandStatusProcesses_empty() throws Exception {
Cluster cluster = heartbeatTestHelper.getDummyCluster();
- Service hdfs = cluster.addService(HDFS);
+ Service hdfs = cluster.addService(HDFS, HDFS, "CORE");
hdfs.persist();
hdfs.addServiceComponent(DATANODE).persist();
hdfs.getServiceComponent(DATANODE).addServiceComponentHost(DummyHostname1).persist();
@@ -1548,7 +1548,7 @@ public class TestHeartbeatHandler {
hlp.put("custom_command", "REMOVE_KEYTAB");
executionCommand.setHostLevelParams(hlp);
- Map<String, String> commandparams = new HashMap<String, String>();
+ Map<String, String> commandparams = new HashMap<>();
commandparams.put(KerberosServerAction.AUTHENTICATED_USER_NAME, "admin");
commandparams.put(KerberosServerAction.DATA_DIRECTORY, createTestKeytabData().getAbsolutePath());
executionCommand.setCommandParams(commandparams);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
index a5396d8..29d6564 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/agent/TestHeartbeatMonitor.java
@@ -133,7 +133,7 @@ public class TestHeartbeatMonitor {
clusters.mapHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName);
+ Service hdfs = cluster.addService(serviceName, serviceName, "CORE");
hdfs.persist();
hdfs.addServiceComponent(Role.DATANODE.name()).persist();
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1).persist();
@@ -222,7 +222,7 @@ public class TestHeartbeatMonitor {
clusters.mapHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName);
+ Service hdfs = cluster.addService(serviceName, serviceName, "CORE");
hdfs.persist();
hdfs.addServiceComponent(Role.DATANODE.name()).persist();
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost
@@ -328,7 +328,7 @@ public class TestHeartbeatMonitor {
clusters.mapHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName);
+ Service hdfs = cluster.addService(serviceName, serviceName, "CORE");
hdfs.persist();
hdfs.addServiceComponent(Role.DATANODE.name()).persist();
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1).persist();
@@ -446,7 +446,7 @@ public class TestHeartbeatMonitor {
clusters.mapHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName);
+ Service hdfs = cluster.addService(serviceName, serviceName, "CORE");
hdfs.persist();
hdfs.addServiceComponent(Role.DATANODE.name()).persist();
hdfs.getServiceComponent(Role.DATANODE.name()).addServiceComponentHost(hostname1).persist();
@@ -568,7 +568,7 @@ public class TestHeartbeatMonitor {
clusters.mapHostsToCluster(hostNames, clusterName);
- Service hdfs = cluster.addService(serviceName);
+ Service hdfs = cluster.addService(serviceName, serviceName, "CORE");
hdfs.persist();
hdfs.addServiceComponent(Role.DATANODE.name()).persist();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
index ee85e8d..cf74b73 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActionServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -76,6 +77,7 @@ public class ActionServiceTest extends BaseServiceTest {
private String m_actionName;
private TestActionDefinitionService(String actionName) {
+ super(ApiVersion.v1);
m_actionName = actionName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
index c459f7c..b35c395 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ActiveWidgetLayoutServiceTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import javax.ws.rs.core.HttpHeaders;
@@ -47,7 +48,7 @@ public class ActiveWidgetLayoutServiceTest {
private class TestActiveWidgetLayoutService extends ActiveWidgetLayoutService {
public TestActiveWidgetLayoutService(String username) {
- super(username);
+ super(ApiVersion.v1, username);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
index e5bb7ca..8747eab 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/AmbariMetaInfoTest.java
@@ -1859,7 +1859,7 @@ public class AmbariMetaInfoTest {
cluster.setDesiredStackVersion(
new StackId(STACK_NAME_HDP, "2.0.6"));
- cluster.addService("HDFS");
+ cluster.addService("HDFS", "HDFS", "CORE");
metaInfo.reconcileAlertDefinitions(clusters);
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
index 2b368cb..e73cc2e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/BlueprintServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -77,7 +78,8 @@ public class BlueprintServiceTest extends BaseServiceTest {
private String m_blueprintId;
private TestBlueprintService(String blueprintId) {
- m_blueprintId = blueprintId;
+ super(ApiVersion.v1);
+ m_blueprintId = blueprintId;
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
index bc96ac9..93ca7e1 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterKerberosDescriptorServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
@@ -64,7 +65,7 @@ public class ClusterKerberosDescriptorServiceTest extends BaseServiceTest {
private String type;
private TestService(String type) {
- super("C1");
+ super(ApiVersion.v1, "C1");
this.type = type;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
index d321b15..eaa2642 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterPrivilegeServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -68,7 +69,7 @@ public class ClusterPrivilegeServiceTest extends BaseServiceTest {
private class TestClusterPrivilegeService extends ClusterPrivilegeService {
private TestClusterPrivilegeService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.v1, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
index c36f5fe..d0d3470 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.cluster.ClustersImpl;
@@ -128,7 +129,7 @@ public class ClusterServiceTest extends BaseServiceTest {
private String m_clusterId;
private TestClusterService(Clusters clusters, String clusterId) {
- super(clusters);
+ super(ApiVersion.v1, clusters);
m_clusterId = clusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
index 19d8d41..e32e63d 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ClusterStackVersionServiceTest.java
@@ -22,6 +22,7 @@ import junit.framework.TestCase;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -71,7 +72,7 @@ public class ClusterStackVersionServiceTest extends BaseServiceTest {
private class TestClusterStackVersionService extends ClusterStackVersionService {
public TestClusterStackVersionService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.v1, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
index dc57a5b..645e681 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ComponentServiceTest.java
@@ -23,6 +23,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -92,7 +93,7 @@ public class ComponentServiceTest extends BaseServiceTest {
private String m_componentId;
private TestComponentService(String clusterId, String serviceId, String componentId) {
- super(clusterId, serviceId);
+ super(ApiVersion.v1, clusterId, serviceId);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_componentId = componentId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
index 22694f6..44eac80 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigGroupServiceTest.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -84,7 +85,7 @@ public class ConfigGroupServiceTest extends BaseServiceTest {
private String m_groupId;
public TestConfigGroupService(String m_clusterName, String groupId) {
- super(m_clusterName);
+ super(ApiVersion.v1, m_clusterName);
this.m_clusterName = m_clusterName;
this.m_groupId = groupId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
index 7ad3e3a..92326be 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ConfigurationServiceTest.java
@@ -24,6 +24,7 @@ import javax.ws.rs.core.*;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import java.lang.reflect.Method;
import java.util.ArrayList;
@@ -55,7 +56,7 @@ public class ConfigurationServiceTest extends BaseServiceTest {
private String m_clusterId;
private TestConfigurationService(String clusterId) {
- super(clusterId);
+ super(ApiVersion.v1, clusterId);
m_clusterId = clusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
index 3d218fb..63e9522 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/CredentialServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -71,7 +72,7 @@ public class CredentialServiceTest extends BaseServiceTest {
private String alias;
private TestCredentialService(String alias) {
- super("C1");
+ super(ApiVersion.v1, "C1");
this.alias = alias;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
index 332e55c..b2e2415 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/FeedServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -79,6 +80,7 @@ public class FeedServiceTest extends BaseServiceTest {
private String m_feedId;
private TestFeedService(String feedId) {
+ super(ApiVersion.v1);
m_feedId = feedId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
index 7d2188f..6fabd05 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupPrivilegeServiceTest.java
@@ -22,6 +22,7 @@ import junit.framework.Assert;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -83,7 +84,7 @@ public class GroupPrivilegeServiceTest extends BaseServiceTest {
private class TestGroupPrivilegeService extends GroupPrivilegeService {
public TestGroupPrivilegeService() {
- super("group");
+ super(ApiVersion.v1, "group");
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
index fdf740e..3f1d2de 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/GroupServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import javax.ws.rs.core.HttpHeaders;
@@ -78,6 +79,10 @@ public class GroupServiceTest extends BaseServiceTest {
}
private class TestGroupService extends GroupService {
+ public TestGroupService() {
+ super(ApiVersion.v1);
+ }
+
@Override
protected ResourceInstance createResource(Type type, Map<Type, String> mapIds) {
return getTestResource();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
index 86a2d38..d442f68 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostComponentServiceTest.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -91,7 +92,7 @@ public class HostComponentServiceTest extends BaseServiceTest {
private String m_hostComponentId;
private TestHostComponentService(String clusterId, String hostId, String hostComponentId) {
- super(clusterId, hostId);
+ super(ApiVersion.v1, clusterId, hostId);
m_clusterId = clusterId;
m_hostId = hostId;
m_hostComponentId = hostComponentId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
index 012272c..8006702 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostKerberosIdentityServiceTest.java
@@ -23,6 +23,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -61,7 +62,7 @@ public class HostKerberosIdentityServiceTest extends BaseServiceTest {
private String identityId;
private TestHostKerberosIdentityService(String clusterId, String hostId, String identityId) {
- super(clusterId, hostId);
+ super(ApiVersion.v1, clusterId, hostId);
this.clusterId = clusterId;
this.hostId = hostId;
this.identityId = identityId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
index b66ad9d..c6e131f 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostServiceTest.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -90,7 +91,7 @@ public class HostServiceTest extends BaseServiceTest {
private String m_hostId;
private TestHostService(String clusterId, String hostId) {
- super(clusterId);
+ super(ApiVersion.v1, clusterId);
m_clusterId = clusterId;
m_hostId = hostId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
index 2ee1374..e507c54 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/HostStackVersionServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import javax.ws.rs.core.HttpHeaders;
@@ -60,7 +61,7 @@ public class HostStackVersionServiceTest extends BaseServiceTest {
private class TestHostStackVersionService extends HostStackVersionService {
public TestHostStackVersionService(String hostName, String clusterName) {
- super(hostName, clusterName);
+ super(ApiVersion.v1, hostName, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
index cb4e5f8..e975a5b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/InstanceServiceTest.java
@@ -22,6 +22,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -78,7 +79,7 @@ public class InstanceServiceTest extends BaseServiceTest {
private String m_instanceId;
private TestInstanceService(String feedName, String instanceId) {
- super(feedName);
+ super(ApiVersion.v1, feedName);
m_feedName = feedName;
m_instanceId = instanceId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
index 6e0fa96..97f264a 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/JobServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for JobService.
@@ -62,7 +63,7 @@ public class JobServiceTest extends BaseServiceTest {
private String clusterName;
public TestJobService(String clusterName, String workflowId) {
- super(clusterName, workflowId);
+ super(ApiVersion.v1, clusterName, workflowId);
this.clusterName = clusterName;
this.workflowId = workflowId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
index af458b2..960bb66 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/LdapSyncEventServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import javax.ws.rs.core.HttpHeaders;
@@ -69,7 +70,7 @@ public class LdapSyncEventServiceTest extends BaseServiceTest {
private class TestLdapSyncEventService extends LdapSyncEventService {
private TestLdapSyncEventService() {
- super();
+ super(ApiVersion.v1);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
index b3bf3fb..1e8e125 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/MemberServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import javax.ws.rs.core.HttpHeaders;
@@ -84,7 +85,7 @@ public class MemberServiceTest extends BaseServiceTest {
private class TestMemberService extends MemberService {
public TestMemberService(String groupName) {
- super(groupName);
+ super(ApiVersion.v1, groupName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
index 620643f..00b74f5 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PermissionServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -78,6 +79,7 @@ public class PermissionServiceTest extends BaseServiceTest {
private String id;
private TestPermissionService(String id) {
+ super(ApiVersion.v1);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
index f851133..a7beb28 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PreUpgradeCheckServiceTest.java
@@ -29,6 +29,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
/**
@@ -56,7 +57,7 @@ public class PreUpgradeCheckServiceTest extends BaseServiceTest {
private class TestPreUpgradeCheckService extends PreUpgradeCheckService {
public TestPreUpgradeCheckService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.v1, clusterName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
index d9f3e28..17268c7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/PrivilegeServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -91,6 +92,7 @@ public class PrivilegeServiceTest extends BaseServiceTest {
private String id;
private TestPrivilegeService(String id) {
+ super(ApiVersion.v1);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
index a1a0908..68eb8dd 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RecommendationServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for RecommendationService.
@@ -41,7 +42,7 @@ public class RecommendationServiceTest extends BaseServiceTest {
List<ServiceTestInvocation> listInvocations = new ArrayList<ServiceTestInvocation>();
//getRecommendation
- RecommendationService service = new TestRecommendationService("stackName", "stackVersion");
+ StacksService service = new TestRecommendationService("stackName", "stackVersion");
Method m = service.getClass().getMethod("getRecommendation", String.class, HttpHeaders.class, UriInfo.class, String.class, String.class);
Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo(), "stackName", "stackVersion"};
listInvocations.add(new ServiceTestInvocation(Request.Type.POST, service, m, args, "body"));
@@ -49,12 +50,12 @@ public class RecommendationServiceTest extends BaseServiceTest {
return listInvocations;
}
- private class TestRecommendationService extends RecommendationService {
+ private class TestRecommendationService extends StacksService {
private String stackName;
private String stackVersion;
private TestRecommendationService(String stackName, String stackVersion) {
- super();
+ super(ApiVersion.v1);
this.stackName = stackName;
this.stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
index 013fed1..444d06e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RepositoryServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource.Type;
import javax.ws.rs.core.HttpHeaders;
@@ -81,7 +82,7 @@ public class RepositoryServiceTest extends BaseServiceTest {
private class TestRepositoryService extends RepositoryService {
public TestRepositoryService() {
- super(new HashMap<Type, String>());
+ super(ApiVersion.v1, new HashMap<Type, String>());
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
index ed7b7c9..8b6ae39 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RoleAuthorizationServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -59,6 +60,7 @@ public class RoleAuthorizationServiceTest extends BaseServiceTest {
private String id;
private TestRoleAuthorizationService(String id) {
+ super(ApiVersion.v1);
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
index 310d69f..93ddb2e 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/RootServiceServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for RootServiceService.
@@ -93,6 +94,7 @@ public class RootServiceServiceTest extends BaseServiceTest {
private String m_hostName;
private TestRootServiceService(String serviceName, String componentName, String hostName) {
+ super(ApiVersion.v1);
m_serviceName = serviceName;
m_componentName = componentName;
m_hostName = hostName;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
index 5c3e3a7..119eb20 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ServiceServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -133,13 +134,13 @@ public class ServiceServiceTest extends BaseServiceTest {
private String m_artifact_id;
private TestServiceService(String clusterId, String serviceId) {
- super(clusterId);
+ super(ApiVersion.v1, clusterId);
m_clusterId = clusterId;
m_serviceId = serviceId;
}
private TestServiceService(String clusterId, String serviceId, String artifactId) {
- super(clusterId);
+ super(ApiVersion.v1, clusterId);
m_clusterId = clusterId;
m_serviceId = serviceId;
m_artifact_id = artifactId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
index 598e420..e660fa7 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/SettingServiceTest.java
@@ -20,6 +20,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -74,6 +75,7 @@ public class SettingServiceTest extends BaseServiceTest {
private String settingName;
private TestSettingService(String settingName) {
+ super(ApiVersion.v1);
this.settingName = settingName;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
index dd43ee3..8e66173 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/StacksServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.easymock.EasyMock;
import org.junit.Test;
@@ -152,6 +153,7 @@ public class StacksServiceTest extends BaseServiceTest {
private String m_stackVersion;
private TestStacksService(String stackName, String stackVersion) {
+ super(ApiVersion.v1);
m_stackId = stackName;
m_stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
index 3394e8e..f2aa75b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TargetClusterServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -79,6 +80,7 @@ public class TargetClusterServiceTest extends BaseServiceTest {
private String m_targetClusterId;
private TestTargetClusterService(String targetClusterId) {
+ super(ApiVersion.v1);
m_targetClusterId = targetClusterId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
index 91a893a..b228173 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/TaskAttemptServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for TaskAttemptService.
@@ -65,7 +66,7 @@ public class TaskAttemptServiceTest extends BaseServiceTest {
public TestTaskAttemptService(String clusterName, String workflowId,
String jobId) {
- super(clusterName, workflowId, jobId);
+ super(ApiVersion.v1, clusterName, workflowId, jobId);
this.clusterName = clusterName;
this.workflowId = workflowId;
this.jobId = jobId;
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
index 68fe87f..e006fbb 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UpgradeItemServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.junit.Assert;
import javax.ws.rs.core.HttpHeaders;
@@ -49,7 +50,7 @@ public class UpgradeItemServiceTest extends BaseServiceTest {
private Long m_upgradeItemId;
private TestUpgradeItemService(String clusterName, String upgradeId, String upgradeGroupId, Long upgradeItemId) {
- super(clusterName, upgradeId, upgradeGroupId);
+ super(ApiVersion.v1, clusterName, upgradeId, upgradeGroupId);
m_upgradeItemId = upgradeItemId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
index c3270bb..93f7731 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserAuthorizationServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.junit.Test;
@@ -59,7 +60,7 @@ public class UserAuthorizationServiceTest extends BaseServiceTest {
@Test
public void testCreateAuthorizationResourceWithUppercaseUsername() {
// GIVEN
- UserAuthorizationService userAuthorizationService= new UserAuthorizationService("Jdoe");
+ UserAuthorizationService userAuthorizationService= new UserAuthorizationService(ApiVersion.v1, "Jdoe");
// WHEN
ResourceInstance result = userAuthorizationService.createAuthorizationResource("id");
// THEN
@@ -71,7 +72,7 @@ public class UserAuthorizationServiceTest extends BaseServiceTest {
private String id;
private TestUserAuthorizationService(String id) {
- super("jdoe");
+ super(ApiVersion.v1, "jdoe");
this.id = id;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
index db2d38a..0dfa7df 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserPrivilegeServiceTest.java
@@ -33,6 +33,7 @@ import junit.framework.Assert;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.controller.spi.Resource.Type;
import org.easymock.EasyMock;
@@ -88,7 +89,7 @@ public class UserPrivilegeServiceTest extends BaseServiceTest {
@Test
public void testCreatePrivilegeResourcesWithUppercaseUsername() {
// GIVEN
- UserPrivilegeService userPrivilegeService = new UserPrivilegeService("User");
+ UserPrivilegeService userPrivilegeService = new UserPrivilegeService(ApiVersion.v1, "User");
// WHEN
ResourceInstance result = userPrivilegeService.createPrivilegeResource("test");
// THEN
@@ -98,7 +99,7 @@ public class UserPrivilegeServiceTest extends BaseServiceTest {
private class TestUserPrivilegeService extends UserPrivilegeService {
public TestUserPrivilegeService() {
- super("user");
+ super(ApiVersion.v1, "user");
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserServiceTest.java
index 0ed0a66..495e244 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/UserServiceTest.java
@@ -23,6 +23,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.UserEntity;
import org.junit.Test;
@@ -45,6 +46,10 @@ public class UserServiceTest {
}
class TestUserService extends UserService {
+ public TestUserService() {
+ super(ApiVersion.v1);
+ }
+
@Override
protected Response handleRequest(HttpHeaders headers, String body, UriInfo uriInfo,
Request.Type requestType, final ResourceInstance resource) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
index aec68e6..04295df 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ValidationServiceTest.java
@@ -30,6 +30,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for ValidationService.
@@ -41,7 +42,7 @@ public class ValidationServiceTest extends BaseServiceTest {
List<ServiceTestInvocation> listInvocations = new ArrayList<ServiceTestInvocation>();
//getValidation
- ValidationService service = new TestValidationService("stackName", "stackVersion");
+ StacksService service = new TestValidationService("stackName", "stackVersion");
Method m = service.getClass().getMethod("getValidation", String.class, HttpHeaders.class, UriInfo.class, String.class, String.class);
Object[] args = new Object[] {"body", getHttpHeaders(), getUriInfo(), "stackName", "stackVersion"};
listInvocations.add(new ServiceTestInvocation(Request.Type.POST, service, m, args, "body"));
@@ -49,12 +50,12 @@ public class ValidationServiceTest extends BaseServiceTest {
return listInvocations;
}
- private class TestValidationService extends ValidationService {
+ private class TestValidationService extends StacksService {
private String stackName;
private String stackVersion;
private TestValidationService(String stackName, String stackVersion) {
- super();
+ super(ApiVersion.v1);
this.stackName = stackName;
this.stackVersion = stackVersion;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
index 1eb7ac2..8e3eb9c 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewDataMigrationServiceTest.java
@@ -18,6 +18,7 @@
package org.apache.ambari.server.api.services;
import junit.framework.Assert;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.orm.entities.ViewEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.view.ViewDataMigrationContextImpl;
@@ -152,7 +153,7 @@ public class ViewDataMigrationServiceTest {
private ViewDataMigrationContextImpl migrationContext;
public TestViewDataMigrationService(String viewName, String viewVersion, String instanceName) {
- super(viewName, viewVersion, instanceName);
+ super(ApiVersion.v1, viewName, viewVersion, instanceName);
}
@Override
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
index 155f91e..4ecaaa3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewExternalSubResourceServiceTest.java
@@ -17,6 +17,7 @@
*/
package org.apache.ambari.server.api.services;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
import org.apache.ambari.server.orm.entities.ViewInstanceEntityTest;
@@ -32,7 +33,7 @@ public class ViewExternalSubResourceServiceTest {
Resource.Type type = new Resource.Type("resource");
ViewInstanceEntity definition = ViewInstanceEntityTest.getViewInstanceEntity();
- ViewExternalSubResourceService service = new ViewExternalSubResourceService(type, definition);
+ ViewExternalSubResourceService service = new ViewExternalSubResourceService(ApiVersion.v1, type, definition);
Object fooService = new Object();
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
index f841be9..701ee13 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewPermissionServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.UriInfo;
@@ -72,7 +73,7 @@ public class ViewPermissionServiceTest extends BaseServiceTest {
private TestViewPermissionService(String viewName, String version, String permissionId) {
- super(viewName, version);
+ super(ApiVersion.v1, viewName, version);
this.permissionId = permissionId;
}
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
index 158ccf8..eb96ec4 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/ViewSubResourceServiceTest.java
@@ -21,6 +21,7 @@ package org.apache.ambari.server.api.services;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
import org.apache.ambari.server.api.util.TreeNode;
import org.apache.ambari.server.controller.spi.Resource;
import org.apache.ambari.server.orm.entities.ViewInstanceEntity;
@@ -131,7 +132,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
Resource.Type type = new Resource.Type("subResource");
// get resource
- ViewSubResourceService service = new ViewSubResourceService(type, viewInstanceEntity);
+ ViewSubResourceService service = new ViewSubResourceService(ApiVersion.v1, type, viewInstanceEntity);
ResultSerializer serializer = service.getResultSerializer(MediaType.TEXT_PLAIN_TYPE);
@@ -189,7 +190,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
Resource.Type type = new Resource.Type("subResource");
// get resource
- ViewSubResourceService service = new ViewSubResourceService(type, viewInstanceEntity);
+ ViewSubResourceService service = new ViewSubResourceService(ApiVersion.v1, type, viewInstanceEntity);
ResultSerializer serializer = service.getResultSerializer(MediaType.APPLICATION_JSON_TYPE);
@@ -218,7 +219,7 @@ public class ViewSubResourceServiceTest extends BaseServiceTest {
* Construct a view sub-resource service.
*/
public TestViewSubResourceService(Resource.Type type, ViewInstanceEntity viewInstanceDefinition) {
- super(type, viewInstanceDefinition);
+ super(ApiVersion.v1, type, viewInstanceDefinition);
}
public Response getSubResource1(@Context HttpHeaders headers, @Context UriInfo ui,
http://git-wip-us.apache.org/repos/asf/ambari/blob/b88db3cc/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java b/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
index 9969e59..305ab8b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/api/services/WorkflowServiceTest.java
@@ -28,6 +28,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.ambari.server.api.resources.ResourceInstance;
import org.apache.ambari.server.api.services.parsers.RequestBodyParser;
import org.apache.ambari.server.api.services.serializers.ResultSerializer;
+import org.apache.ambari.server.api.util.ApiVersion;
/**
* Unit tests for WorkflowService.
@@ -61,7 +62,7 @@ public class WorkflowServiceTest extends BaseServiceTest {
private String clusterName;
public TestWorkflowService(String clusterName) {
- super(clusterName);
+ super(ApiVersion.v1, clusterName);
this.clusterName = clusterName;
}