You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by nc...@apache.org on 2015/12/11 14:29:56 UTC
ambari git commit: AMBARI-14259. Save on Repositories dialog box not
working (ncole)
Repository: ambari
Updated Branches:
refs/heads/trunk a1baa5c09 -> 310c31535
AMBARI-14259. Save on Repositories dialog box not working (ncole)
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/310c3153
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/310c3153
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/310c3153
Branch: refs/heads/trunk
Commit: 310c31535954174b824fe6db7dacd423419384ed
Parents: a1baa5c
Author: Nate Cole <nc...@hortonworks.com>
Authored: Thu Dec 10 15:58:08 2015 -0500
Committer: Nate Cole <nc...@hortonworks.com>
Committed: Fri Dec 11 08:29:45 2015 -0500
----------------------------------------------------------------------
.../RepositoryVersionResourceProvider.java | 18 ++----------------
.../RepositoryVersionResourceProviderTest.java | 14 +++++++-------
2 files changed, 9 insertions(+), 23 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/310c3153/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
index beaa4fb..568406b 100644
--- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
+++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProvider.java
@@ -27,8 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import com.google.inject.Provider;
-import com.google.inject.persist.Transactional;
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.ObjectNotFoundException;
import org.apache.ambari.server.api.resources.OperatingSystemResourceDefinition;
@@ -71,6 +69,8 @@ import org.apache.commons.lang.StringUtils;
import com.google.common.collect.Lists;
import com.google.gson.Gson;
import com.google.inject.Inject;
+import com.google.inject.Provider;
+import com.google.inject.persist.Transactional;
/**
* Resource provider for repository versions resources.
@@ -264,20 +264,6 @@ public class RepositoryVersionResourceProvider extends AbstractAuthorizedResourc
throw new ObjectNotFoundException("There is no repository version with id " + id);
}
- // Prevent changing repo version if there's already a cluster version that has performed some meaningful action on it.
- StackEntity stackEntity = entity.getStack();
- String stackName = stackEntity.getStackName();
- String stackVersion = stackEntity.getStackVersion();
-
- final List<ClusterVersionEntity> clusterVersionEntities = clusterVersionDAO.findByStackAndVersion(
- stackName, stackVersion, entity.getVersion());
-
- if (!clusterVersionEntities.isEmpty()) {
- final ClusterVersionEntity firstClusterVersion = clusterVersionEntities.get(0);
- throw new AmbariException("Upgrade pack can't be changed for repository version which has a state of " +
- firstClusterVersion.getState().name() + " on cluster " + firstClusterVersion.getClusterEntity().getClusterName());
- }
-
List<OperatingSystemEntity> operatingSystemEntities = null;
if (StringUtils.isNotBlank(ObjectUtils.toString(propertyMap.get(SUBRESOURCE_OPERATING_SYSTEMS_PROPERTY_ID)))) {
http://git-wip-us.apache.org/repos/asf/ambari/blob/310c3153/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
----------------------------------------------------------------------
diff --git a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
index 7915950..22cb3c3 100644
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/internal/RepositoryVersionResourceProviderTest.java
@@ -27,8 +27,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
-
import org.apache.ambari.server.api.services.AmbariMetaInfo;
import org.apache.ambari.server.controller.ResourceProviderFactory;
import org.apache.ambari.server.controller.predicate.AndPredicate;
@@ -44,13 +42,13 @@ import org.apache.ambari.server.orm.dao.RepositoryVersionDAO;
import org.apache.ambari.server.orm.dao.StackDAO;
import org.apache.ambari.server.orm.entities.ClusterEntity;
import org.apache.ambari.server.orm.entities.ClusterVersionEntity;
+import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
+import org.apache.ambari.server.orm.entities.RepositoryEntity;
import org.apache.ambari.server.orm.entities.RepositoryVersionEntity;
import org.apache.ambari.server.orm.entities.StackEntity;
import org.apache.ambari.server.security.TestAuthenticationFactory;
import org.apache.ambari.server.security.authorization.AuthorizationException;
import org.apache.ambari.server.state.Clusters;
-import org.apache.ambari.server.orm.entities.RepositoryEntity;
-import org.apache.ambari.server.orm.entities.OperatingSystemEntity;
import org.apache.ambari.server.state.OperatingSystemInfo;
import org.apache.ambari.server.state.RepositoryInfo;
import org.apache.ambari.server.state.RepositoryVersionState;
@@ -64,14 +62,16 @@ import org.junit.Test;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
import com.google.common.collect.Sets;
import com.google.gson.Gson;
import com.google.inject.Guice;
import com.google.inject.Injector;
import com.google.inject.persist.PersistService;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
+
+import junit.framework.Assert;
/**
* RepositoryVersionResourceProvider tests.
@@ -500,8 +500,8 @@ public class RepositoryVersionResourceProviderTest {
try {
provider.updateResources(updateRequest, new AndPredicate(predicateStackName, predicateStackVersion));
- Assert.fail("Update of upgrade pack should not be allowed when repo version is installed on any cluster");
} catch (Exception ex) {
+ Assert.fail("Update of repository should be allowed when repo version is installed on any cluster");
}
}