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 2016/10/19 16:58:19 UTC
[09/36] ambari git commit: Merge branch 'trunk' into
branch-feature-AMBARI-18456
Merge branch 'trunk' into branch-feature-AMBARI-18456
Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/5467ad07
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/5467ad07
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/5467ad07
Branch: refs/heads/branch-dev-patch-upgrade
Commit: 5467ad0737bdadf23e0cec752acdbdc1b250de3c
Parents: 23fbfe4 a442efb
Author: Jonathan Hurley <jh...@hortonworks.com>
Authored: Tue Oct 4 19:59:16 2016 -0400
Committer: Jonathan Hurley <jh...@hortonworks.com>
Committed: Tue Oct 4 19:59:16 2016 -0400
----------------------------------------------------------------------
.../timeline/AbstractTimelineMetricsSink.java | 75 +++---
.../availability/MetricCollectorHAHelper.java | 19 +-
.../availability/MetricCollectorHATest.java | 34 ++-
.../src/main/python/core/blacklisted_set.py | 14 ++
.../src/main/python/core/config_reader.py | 3 +-
.../src/main/python/core/emitter.py | 74 ++++--
.../server/controller/KerberosHelperImpl.java | 243 ++++++++++++++-----
.../ConfigureAmbariIdentitiesServerAction.java | 190 +++++++++++----
.../kerberos/FinalizeKerberosServerAction.java | 118 ++++++++-
.../kerberos/KerberosOperationHandler.java | 2 +-
.../server/upgrade/UpgradeCatalog250.java | 30 ++-
.../ambari/server/utils/ShellCommandUtil.java | 121 +++++++++
.../resources/stacks/HDP/2.0.6/kerberos.json | 14 +-
.../server/controller/KerberosHelperTest.java | 193 ++++++++++++---
...nfigureAmbariIdentitiesServerActionTest.java | 204 ++++++++++++++++
.../server/upgrade/UpgradeCatalog250Test.java | 61 +++++
ambari-web/app/assets/test/tests.js | 1 +
.../nameNode/step2_controller.js | 32 ++-
.../main/admin/stack_and_upgrade_controller.js | 45 +++-
.../app/mappers/repository_version_mapper.js | 28 ++-
ambari-web/app/messages.js | 1 +
.../models/stack_version/repository_version.js | 6 +
.../admin/highAvailability/nameNode/step3.hbs | 10 +-
.../admin/stack_upgrade/upgrade_version_box.hbs | 2 +-
.../stack_upgrade/upgrade_version_column.hbs | 2 +-
ambari-web/app/utils/ajax/ajax.js | 5 +
.../stack_upgrade/upgrade_version_box_view.js | 6 +
.../upgrade_version_column_view.js | 6 +-
.../admin/stack_and_upgrade_controller_test.js | 74 +++++-
.../mappers/repository_version_mapper_test.js | 46 ++++
.../upgrade_version_box_view_test.js | 23 +-
31 files changed, 1447 insertions(+), 235 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ambari/blob/5467ad07/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
----------------------------------------------------------------------
diff --cc ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
index 6ac607d,b2eb738..fd5afcd
--- a/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
+++ b/ambari-server/src/test/java/org/apache/ambari/server/controller/KerberosHelperTest.java
@@@ -18,39 -18,10 +18,42 @@@
package org.apache.ambari.server.controller;
-import com.google.inject.AbstractModule;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import junit.framework.Assert;
+import static org.easymock.EasyMock.anyLong;
+import static org.easymock.EasyMock.anyObject;
++import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.capture;
+import static org.easymock.EasyMock.eq;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.expectLastCall;
+import static org.easymock.EasyMock.getCurrentArguments;
+import static org.easymock.EasyMock.isNull;
+import static org.easymock.EasyMock.newCapture;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.reset;
+import static org.easymock.EasyMock.verify;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
++import java.io.File;
++import java.lang.reflect.Method;
+import java.net.InetAddress;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.TimeUnit;
+
+import javax.persistence.EntityManager;
+
import org.apache.ambari.server.AmbariException;
import org.apache.ambari.server.Role;
import org.apache.ambari.server.actionmanager.ActionManager;
@@@ -121,14 -96,45 +127,16 @@@ import org.easymock.CaptureType
import org.easymock.EasyMockSupport;
import org.easymock.IAnswer;
import org.junit.After;
++import org.junit.Assert;
import org.junit.Before;
+ import org.junit.Rule;
import org.junit.Test;
+ import org.junit.rules.TemporaryFolder;
-import javax.persistence.EntityManager;
-import java.io.File;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
+import com.google.inject.AbstractModule;
+import com.google.inject.Guice;
+import com.google.inject.Injector;
- import junit.framework.Assert;
-import static org.easymock.EasyMock.anyLong;
-import static org.easymock.EasyMock.anyObject;
-import static org.easymock.EasyMock.anyString;
-import static org.easymock.EasyMock.capture;
-import static org.easymock.EasyMock.eq;
-import static org.easymock.EasyMock.expect;
-import static org.easymock.EasyMock.expectLastCall;
-import static org.easymock.EasyMock.getCurrentArguments;
-import static org.easymock.EasyMock.isNull;
-import static org.easymock.EasyMock.newCapture;
-import static org.easymock.EasyMock.replay;
-import static org.easymock.EasyMock.reset;
-import static org.easymock.EasyMock.verify;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
@SuppressWarnings("unchecked")
public class KerberosHelperTest extends EasyMockSupport {