This is an automated email from the ASF dual-hosted git repository.
mradhakrishnan pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 6adc889221b5919aa96e415e4c60a803c95aa3f8
Merge: cf74bb1 a019793
Author: mradha25 <mradhakrish...@hortonworks.com>
AuthorDate: Wed Oct 10 13:28:01 2018 -0700
Merge pull request #2401 from apache/AMBARI-24711
Ambari 24711 : backport mpack rest apis to trunk
ambari-server/conf/unix/ambari.properties | 1 +
ambari-server/conf/windows/ambari.properties | 1 +
ambari-server/src/main/assemblies/server.xml | 8 +
.../api/resources/MpackResourceDefinition.java | 112 ++
.../api/resources/ResourceInstanceFactoryImpl.java | 4 +
.../resources/StackVersionResourceDefinition.java | 56 +-
.../ambari/server/api/services/AmbariMetaInfo.java | 107 +-
.../server/api/services/MpackRequestSwagger.java | 30 +
.../ambari/server/api/services/MpacksService.java | 186 ++++
.../ambari/server/configuration/Configuration.java | 17 +
.../controller/AmbariManagementController.java | 58 +
.../controller/AmbariManagementControllerImpl.java | 69 +-
.../ambari/server/controller/ControllerModule.java | 2 +
.../ambari/server/controller/MpackRequest.java | 142 +++
.../ambari/server/controller/MpackResponse.java | 149 +++
.../AbstractControllerResourceProvider.java | 4 +
.../internal/AbstractResourceProvider.java | 4 +-
.../controller/internal/DefaultProviderModule.java | 8 +-
.../controller/internal/MpackResourceProvider.java | 363 +++++++
.../internal/StackVersionResourceProvider.java | 134 ++-
.../ambari/server/controller/spi/Resource.java | 2 +
.../metrics/system/impl/AmbariMetricSinkImpl.java | 2 -
.../apache/ambari/server/mpack/MpackManager.java | 588 ++++++++++
.../ambari/server/mpack/MpackManagerFactory.java | 39 +
.../org/apache/ambari/server/orm/dao/MpackDAO.java | 104 ++
.../server/orm/dao/RepositoryVersionDAO.java | 15 +-
.../org/apache/ambari/server/orm/dao/StackDAO.java | 25 +
.../ambari/server/orm/entities/MpackEntity.java | 162 +++
.../ambari/server/orm/entities/StackEntity.java | 14 +
.../apache/ambari/server/stack/StackDirectory.java | 12 +-
.../apache/ambari/server/stack/StackManager.java | 7 +-
.../org/apache/ambari/server/state/Module.java | 188 ++++
.../ambari/server/state/ModuleComponent.java | 120 +++
.../ambari/server/state/ModuleDependency.java | 88 ++
.../java/org/apache/ambari/server/state/Mpack.java | 276 +++++
.../server/state/stack/StackMetainfoXml.java | 23 +-
.../apache/ambari/server/utils/MpackVersion.java | 82 +-
.../apache/ambari/server/utils/VersionUtils.java | 12 +-
.../src/main/resources/Ambari-DDL-Derby-CREATE.sql | 21 +
.../src/main/resources/Ambari-DDL-MySQL-CREATE.sql | 19 +
.../main/resources/Ambari-DDL-Oracle-CREATE.sql | 20 +
.../main/resources/Ambari-DDL-Postgres-CREATE.sql | 20 +
.../resources/Ambari-DDL-SQLAnywhere-CREATE.sql | 20 +
.../main/resources/Ambari-DDL-SQLServer-CREATE.sql | 20 +
.../src/main/resources/META-INF/persistence.xml | 1 +
.../src/main/resources/mpacks-v2/README.txt | 1 +
.../ambari/server/agent/AgentResourceTest.java | 2 +
.../ambari/server/api/query/QueryImplTest.java | 2 +-
.../api/resources/MpackResourceDefinitionTest.java | 36 +
.../StackVersionResourceDefinitionTest.java | 2 +-
.../server/api/services/AmbariMetaInfoTest.java | 11 +
.../server/api/services/MpacksServiceTest.java | 92 ++
.../ambari/server/bootstrap/BootStrapTest.java | 3 +
.../KerberosAdminPersistedCredentialCheckTest.java | 2 +
.../server/configuration/ConfigurationTest.java | 10 +
.../AmbariManagementControllerImplTest.java | 54 +-
.../ambari/server/controller/AmbariServerTest.java | 2 +
.../server/controller/KerberosHelperTest.java | 2 +
.../ambari/server/controller/MpackRequestTest.java | 44 +
.../server/controller/MpackResponseTest.java | 57 +
.../internal/AbstractResourceProviderTest.java | 2 +-
.../internal/ClusterControllerImplTest.java | 2 +-
.../internal/HostResourceProviderTest.java | 2 +
.../internal/MpackResourceProviderTest.java | 290 +++++
.../StackUpgradeConfigurationMergeTest.java | 3 +
...erAuthenticationSourceResourceProviderTest.java | 2 +
.../UserAuthorizationResourceProviderTest.java | 2 +
.../internal/UserResourceProviderTest.java | 2 +
.../system/impl/TestAmbariMetricsSinkImpl.java | 2 -
.../ambari/server/mpack/MpackManagerMock.java | 590 ++++++++++
.../server/orm/InMemoryDefaultTestModule.java | 10 +-
.../apache/ambari/server/orm/dao/MpackDAOTest.java | 80 ++
.../org/apache/ambari/server/orm/db/DDLTests.java | 2 +-
.../server/orm/entities/MpackEntityTest.java | 68 ++
.../AbstractPrepareKerberosServerActionTest.java | 2 +
.../UpdateKerberosConfigsServerActionTest.java | 2 +
.../upgrades/KerberosKeytabsActionTest.java | 3 +
.../upgrades/PreconfigureKerberosActionTest.java | 2 +
.../ambari/server/state/ConfigHelperTest.java | 3 +
.../org/apache/ambari/server/state/MpackTest.java | 128 +++
.../server/testing/DBInconsistencyTests.java | 3 +
.../server/testutils/PartialNiceMockBinder.java | 3 +
.../ambari/server/update/HostUpdateHelperTest.java | 3 +
.../server/upgrade/UpgradeCatalog251Test.java | 2 +
.../server/upgrade/UpgradeCatalog252Test.java | 2 +
.../server/upgrade/UpgradeCatalog260Test.java | 4 +
.../server/upgrade/UpgradeCatalog270Test.java | 2 +
.../ambari/server/utils/TestVersionUtils.java | 32 +-
ambari-server/src/test/resources/README.txt | 1 +
ambari-server/src/test/resources/abc.tar.gz | 0
.../src/test/resources/mpacks-v2/README.txt | 1 +
.../src/test/resources/mpacks-v2/abc.tar.gz | 0
.../mpacks-v2/upgrade-packs/upgrade-basic.xml | 1140 ++++++++++++++++++++
.../test/resources/upgrade-packs/upgrade-basic.xml | 1140 ++++++++++++++++++++
.../ambari/msi/AbstractResourceProviderTest.java | 7 +-
95 files changed, 7080 insertions(+), 112 deletions(-)
diff --cc
ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
index b892660,212ecb6..fe4af83
---
a/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
+++
b/ambari-server/src/main/java/org/apache/ambari/server/controller/AmbariManagementController.java
@@@ -52,8 -57,10 +56,9 @@@ import org.apache.ambari.server.state.C
import org.apache.ambari.server.state.Clusters;
import org.apache.ambari.server.state.Config;
import org.apache.ambari.server.state.ConfigHelper;
-import org.apache.ambari.server.state.Host;
import org.apache.ambari.server.state.HostState;
import org.apache.ambari.server.state.MaintenanceState;
+ import org.apache.ambari.server.state.Module;
import org.apache.ambari.server.state.Service;
import org.apache.ambari.server.state.ServiceComponent;
import org.apache.ambari.server.state.ServiceComponentFactory;
