You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by mp...@apache.org on 2017/01/03 18:49:17 UTC
[1/2] ambari git commit: Revert "AMBARI-19183. Ambari allows creation
of invalid config type. (mpapirkovskyy)"
Repository: ambari
Updated Branches:
refs/heads/trunk dde269491 -> 060e8424a
Revert "AMBARI-19183. Ambari allows creation of invalid config type. (mpapirkovskyy)"
This reverts commit 20a50767cfb7c3923ce945bddbafe0573c692f05.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/060e8424
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/060e8424
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/060e8424
Branch: refs/heads/trunk
Commit: 060e8424aa585580618dfb42b56bf830f7ed5479
Parents: b9a2b62
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Tue Jan 3 20:48:14 2017 +0200
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Tue Jan 3 20:48:57 2017 +0200
----------------------------------------------------------------------
.../server/controller/internal/ConfigGroupResourceProvider.java | 4 ++--
.../controller/internal/ConfigGroupResourceProviderTest.java | 2 --
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/060e8424/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
index 17924cd..2373068 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProvider.java
@@ -579,8 +579,6 @@ public class ConfigGroupResourceProvider extends
getManagementController().getAuthName(), request.getGroupName(), request.getTag(),
cluster.getClusterName());
- verifyConfigs(request.getConfigs(), cluster.getClusterName());
-
ConfigGroup configGroup = configGroupFactory.createNew(cluster,
request.getGroupName(),
request.getTag(), request.getDescription(),
@@ -588,6 +586,8 @@ public class ConfigGroupResourceProvider extends
configGroup.setServiceName(serviceName);
+ verifyConfigs(configGroup.getConfigurations(), cluster.getClusterName());
+
cluster.addConfigGroup(configGroup);
if (serviceName != null) {
cluster.createServiceConfigVersion(serviceName, getManagementController().getAuthName(),
http://git-wip-us.apache.org/repos/asf/ambari/blob/060e8424/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
index 9471a81..1d7a50b 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
@@ -160,8 +160,6 @@ public class ConfigGroupResourceProviderTest {
expect(clusters.getCluster("Cluster100")).andReturn(cluster).anyTimes();
expect(clusters.getHost("h1")).andReturn(h1);
expect(clusters.getHost("h2")).andReturn(h2);
- expect(cluster.getClusterName()).andReturn("Cluster100").anyTimes();
- expect(cluster.isConfigTypeExists(anyString())).andReturn(true).anyTimes();
expect(managementController.getConfigGroupFactory()).andReturn(configGroupFactory);
expect(managementController.getAuthName()).andReturn("admin").anyTimes();
expect(hostDAO.findByName("h1")).andReturn(hostEntity1).atLeastOnce();
[2/2] ambari git commit: Revert "AMBARI-19183. Ambari allows creation
of invalid config type. Test import fix. (mpapirkovskyy)"
Posted by mp...@apache.org.
Revert "AMBARI-19183. Ambari allows creation of invalid config type. Test import fix. (mpapirkovskyy)"
This reverts commit 702b92ae8f02745e12c09783eec37e22afe2ac0d.
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/b9a2b62e
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/b9a2b62e
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/b9a2b62e
Branch: refs/heads/trunk
Commit: b9a2b62eca78830b2e6f94660ab647168f6986de
Parents: dde2694
Author: Myroslav Papirkovskyi <mp...@hortonworks.com>
Authored: Tue Jan 3 20:47:56 2017 +0200
Committer: Myroslav Papirkovskyi <mp...@hortonworks.com>
Committed: Tue Jan 3 20:48:57 2017 +0200
----------------------------------------------------------------------
.../server/controller/internal/ConfigGroupResourceProviderTest.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/b9a2b62e/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
index 4f783da..9471a81 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/ConfigGroupResourceProviderTest.java
@@ -29,7 +29,6 @@ import static org.easymock.EasyMock.expect;
import static org.easymock.EasyMock.newCapture;
import static org.easymock.EasyMock.replay;
import static org.easymock.EasyMock.verify;
-import static org.easymock.EasyMock.anyString;
import java.util.ArrayList;
import java.util.Collections;