This is an automated email from the ASF dual-hosted git repository. mradhakrishnan pushed a commit to branch AMBARI-24711 in repository https://gitbox.apache.org/repos/asf/ambari.git
commit 3959182fddd84e55ee5cb48249c583f77d21fe06 Author: Madhuvanthi Radhakrishnan <[email protected]> AuthorDate: Sun Oct 22 14:34:34 2017 -0700 AMBARI-22283 : Add stack name and version to mpack API (mradhakrishnan) --- .../server/controller/internal/MpackResourceProvider.java | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java index 694bf3c..8e1dbf5 100644 --- a/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java +++ b/ambari-server/src/main/java/org/apache/ambari/server/controller/internal/MpackResourceProvider.java @@ -142,12 +142,15 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider { MpackResponse response = getManagementController().registerMpack(mpackRequest); if (response != null) { notifyCreate(Resource.Type.Mpack, request); + String[] stackNameVersion = response.getStackId().split("-"); Resource resource = new ResourceImpl(Resource.Type.Mpack); resource.setProperty(MPACK_ID, response.getMpackId()); resource.setProperty(REGISTRY_ID, response.getRegistryId()); resource.setProperty(MPACK_NAME, response.getMpackName()); resource.setProperty(MPACK_VERSION, response.getMpackVersion()); resource.setProperty(MPACK_URI, response.getMpackUri()); + resource.setProperty(STACK_NAME_PROPERTY_ID, stackNameVersion[0]); + resource.setProperty(STACK_VERSION_PROPERTY_ID, stackNameVersion[1]); associatedResources.add(resource); return getRequestStatus(null, associatedResources); @@ -233,6 +236,9 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider { resource.setProperty(MPACK_VERSION, entity.getMpackVersion()); resource.setProperty(MPACK_URI, entity.getMpackUri()); resource.setProperty(REGISTRY_ID, entity.getRegistryId()); + StackEntity stackEntity = stackDAO.findByMpack(entity.getMpackId()); + resource.setProperty(STACK_NAME_PROPERTY_ID, stackEntity.getStackName()); + resource.setProperty(STACK_VERSION_PROPERTY_ID, stackEntity.getStackVersion()); results.add(resource); } } else { @@ -271,9 +277,11 @@ public class MpackResourceProvider extends AbstractControllerResourceProvider { resource.setProperty(MPACK_VERSION, entity.getMpackVersion()); resource.setProperty(MPACK_URI, entity.getMpackUri()); resource.setProperty(REGISTRY_ID, entity.getRegistryId()); - - ArrayList<Packlet> packletArrayList = getManagementController().getPacklets(entity.getMpackId()); - resource.setProperty(PACKLETS, packletArrayList); + StackEntity stackEntity = stackDAO.findByMpack(entity.getMpackId()); + resource.setProperty(STACK_NAME_PROPERTY_ID, stackEntity.getStackName()); + resource.setProperty(STACK_VERSION_PROPERTY_ID, stackEntity.getStackVersion()); + List<Packlet> packlets = getManagementController().getPacklets(entity.getMpackId()); + resource.setProperty(PACKLETS, packlets); results.add(resource); } }
