[AMBARI-22878] Update Service Group API to take list of mpack name associated with the service group

ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceGroupRequest.java

@@ -17,16 +17,20 @@
  */
 package org.apache.ambari.server.controller;
 
+import java.util.HashSet;
 import java.util.Objects;
+import java.util.Set;
 
 public class ServiceGroupRequest {
 
   private String clusterName; // REF
   private String serviceGroupName; // GET/CREATE/UPDATE/DELETE
+  private Set<String> mpackNames; // Associated mpack names
 
   public ServiceGroupRequest(String clusterName, String serviceGroupName) {
     this.clusterName = clusterName;
     this.serviceGroupName = serviceGroupName;
+    mpackNames = new HashSet<>();
   }
 
   /**
@@ -57,9 +61,30 @@ public void setServiceGroupName(String serviceGroupName) {
     this.serviceGroupName = serviceGroupName;
   }
 
+  /**
+   * @return a list of associated mpack names
+   */
+  public Set<String> getMpackNames() {
+    return mpackNames;
+  }
+
+  /**
+   * @param mpackNames a list of associated mpack names
+   */
+  public void setMpackNames(Set<String> mpackNames) {
+    this.mpackNames.addAll(mpackNames);
+  }
+
   @Override
   public String toString() {
-    return String.format("clusterName=%s, serviceGroupName=%s", clusterName, serviceGroupName);
+    StringBuilder sb = new StringBuilder();
+    sb.append("clusterName="+clusterName+",serviceGroupName="+serviceGroupName);
+    if (!mpackNames.isEmpty()) {
+      sb.append(",mpackNames=");
+      mpackNames.stream().map(mpackName -> sb.append(mpackName + ","));
+      sb.deleteCharAt(sb.length()-1);
+    }
+    return sb.toString();
   }
 
   @Override
@@ -73,6 +98,8 @@ public boolean equals(Object obj) {
 
     ServiceGroupRequest other = (ServiceGroupRequest) obj;
 
+    // ignore mpackNames, even if they are different, we still consider sgrequests are the same
+
     return Objects.equals(clusterName, other.clusterName) &&
       Objects.equals(serviceGroupName, other.serviceGroupName);
   }

ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceGroupResponse.java

@@ -18,6 +18,9 @@
 
 package org.apache.ambari.server.controller;
 
+import java.util.HashSet;
+import java.util.Set;
+
 import io.swagger.annotations.ApiModelProperty;
 
 public class ServiceGroupResponse {
@@ -26,12 +29,15 @@ public class ServiceGroupResponse {
   private Long serviceGroupId;
   private String clusterName;
   private String serviceGroupName;
+  private Set<String> mpackNames;
 
   public ServiceGroupResponse(Long clusterId, String clusterName, Long serviceGroupId, String serviceGroupName) {
     this.clusterId = clusterId;
     this.serviceGroupId = serviceGroupId;
     this.clusterName = clusterName;
     this.serviceGroupName = serviceGroupName;
+    this.mpackNames = new HashSet<>();
+
   }
 
   /**
@@ -90,6 +96,20 @@ public void setServiceGroupName(String serviceGroupName) {
     this.serviceGroupName = serviceGroupName;
   }
 
+  /**
+   * @return the list of mpack names
+   */
+  public Set<String> getServiceGroupMpackNames() {
+    return mpackNames;
+  }
+
+  /**
+   * @param mpackNames the list of mpack names
+   */
+  public void setServiceGroupMpackNames(Set<String> mpackNames) {
+    this.mpackNames = mpackNames;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;
@@ -109,6 +129,7 @@ public boolean equals(Object o) {
       !serviceGroupName.equals(that.serviceGroupName) : that.serviceGroupName != null) {
       return false;
     }
+    // ignore mpackNames
 
     return true;
   }

ambari-server/src/main/java/org/apache/ambari/server/controller/internal/ServiceGroupResourceProvider.java

@@ -24,6 +24,7 @@
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.apache.ambari.server.AmbariException;
 import org.apache.ambari.server.ClusterNotFoundException;
@@ -78,6 +79,7 @@ public class ServiceGroupResourceProvider extends AbstractControllerResourceProv
   public static final String SERVICE_GROUP_CLUSTER_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "cluster_name";
   public static final String SERVICE_GROUP_SERVICE_GROUP_ID_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_group_id";
   public static final String SERVICE_GROUP_SERVICE_GROUP_NAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "service_group_name";
+  public static final String SERVICE_GROUP_SERVICE_GROUP_MPACKNAME_PROPERTY_ID = RESPONSE_KEY + PropertyHelper.EXTERNAL_PATH_SEP + "mpacks";
 
 
   private static Set<String> pkPropertyIds =
@@ -269,6 +271,11 @@ private ServiceGroupRequest getRequest(Map<String, Object> properties) {
     String clusterName = (String) properties.get(SERVICE_GROUP_CLUSTER_NAME_PROPERTY_ID);
     String serviceGroupName = (String) properties.get(SERVICE_GROUP_SERVICE_GROUP_NAME_PROPERTY_ID);
     ServiceGroupRequest svcRequest = new ServiceGroupRequest(clusterName, serviceGroupName);
+    Set<Object> mpackNames = (Set<Object>) properties.get(SERVICE_GROUP_SERVICE_GROUP_MPACKNAME_PROPERTY_ID);
+    if (mpackNames != null) {
+      Set<String> mpackNamesSet = mpackNames.stream().flatMap(mpack -> ((Map<String, String>)mpack).values().stream()).collect(Collectors.toSet());
+      svcRequest.setMpackNames(mpackNamesSet);
+    }
     return svcRequest;
   }
 
@@ -292,6 +299,7 @@ public synchronized Set<ServiceGroupResponse> createServiceGroups(Set<ServiceGro
 
       // Already checked that service group does not exist
       ServiceGroup sg = cluster.addServiceGroup(request.getServiceGroupName());
+      sg.setServiceGroupMpackNames(request.getMpackNames());
       createdSvcGrps.add(sg.convertToResponse());
     }
     return createdSvcGrps;
@@ -422,6 +430,11 @@ private void validateCreateRequests(Set<ServiceGroupRequest> requests, Clusters
       }
       serviceGroupNames.get(clusterName).add(serviceGroupName);
 
+      if (request.getMpackNames().size() != 1) {
+        String errmsg = "Invalid arguments, only one mpack is allowed in the service group " + serviceGroupName;
+        throw new IllegalArgumentException(errmsg);
+      }
+
       Cluster cluster;
       try {
         cluster = clusters.getCluster(clusterName);

ambari-server/src/main/java/org/apache/ambari/server/orm/entities/ServiceGroupEntity.java

@@ -18,9 +18,12 @@
 
 package org.apache.ambari.server.orm.entities;
 
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 
 import javax.persistence.Column;
+import javax.persistence.ElementCollection;
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -80,6 +83,10 @@ public class ServiceGroupEntity {
   @OneToMany(mappedBy="serviceGroupDependency")
   private List<ServiceGroupDependencyEntity> dependencies;
 
+  @ElementCollection
+  @Column(name = "name")
+  private Set<String> mpackNames = new HashSet<>();
+
   public Long getClusterId() {
     return clusterId;
   }
@@ -121,6 +128,14 @@ public void setServiceGroupDependencies(List<ServiceGroupDependencyEntity> servi
     this.serviceGroupDependencies = serviceGroupDependencies;
   }
 
+  public Set<String> getMpackNames() {
+    return mpackNames;
+  }
+
+  public void setMpackNames(Set<String> mpackNames) {
+    this.mpackNames = mpackNames;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceGroup.java

@@ -46,6 +46,14 @@ public interface ServiceGroup {
 
   Set<ServiceGroupDependencyResponse> getServiceGroupDependencyResponses();
 
+  Set<String> getServiceGroupMpackNames();
+
+  void addServiceGroupMpackName(String mpackName);
+
+  void addServiceGroupMpackNames(Set<String> mpackNames);
+
+  void setServiceGroupMpackNames(Set<String> mpackNames);
+
   void debugDump(StringBuilder sb);
 
   void refresh();

ambari-server/src/main/java/org/apache/ambari/server/state/ServiceGroupImpl.java

@@ -135,6 +135,34 @@ public long getClusterId() {
     return cluster.getClusterId();
   }
 
+  @Override
+  public Set<String> getServiceGroupMpackNames() {
+    ServiceGroupEntity entity = getServiceGroupEntity();
+    return entity.getMpackNames();
+  }
+
+  @Override
+  public void addServiceGroupMpackName(String mpackName){
+    ServiceGroupEntity entity = getServiceGroupEntity();
+    if (entity.getMpackNames().add(mpackName)) {
+      serviceGroupDAO.merge(entity);
+    }
+  }
+
+  @Override
+  public void addServiceGroupMpackNames(Set<String> mpackNames) {
+    ServiceGroupEntity entity = getServiceGroupEntity();
+    entity.getMpackNames().addAll(mpackNames);
+    serviceGroupDAO.merge(entity);
+  }
+
+  @Override
+  public void setServiceGroupMpackNames(Set<String> mpackNames) {
+    ServiceGroupEntity entity = getServiceGroupEntity();
+    entity.setMpackNames(mpackNames);
+    serviceGroupDAO.merge(entity);
+  }
+
   @Override
   public Set<ServiceGroupKey> getServiceGroupDependencies() {
     return serviceGroupDependencies;
@@ -149,6 +177,7 @@ public void setServiceGroupDependencies(Set<ServiceGroupKey> serviceGroupDepende
   public ServiceGroupResponse convertToResponse() {
     ServiceGroupResponse r = new ServiceGroupResponse(cluster.getClusterId(),
       cluster.getClusterName(), getServiceGroupId(), getServiceGroupName());
+    r.setServiceGroupMpackNames(getServiceGroupMpackNames());
     return r;
   }
 
@@ -217,7 +246,14 @@ public Cluster getCluster() {
   @Override
   public void debugDump(StringBuilder sb) {
     sb.append("ServiceGroup={ serviceGroupName=" + getServiceGroupName() + ", clusterName="
-      + cluster.getClusterName() + ", clusterId=" + cluster.getClusterId() + "}");
+      + cluster.getClusterName() + ", clusterId=" + cluster.getClusterId() );
+    Set<String> mpackNames = getServiceGroupMpackNames();
+    if (!mpackNames.isEmpty()) {
+      sb.append(", mpackNames=");
+      mpackNames.stream().map(mpackName ->sb.append(mpackName + ","));
+      sb.deleteCharAt(sb.length()-1);
+    }
+    sb.append("}");
   }
 
   /**