AMBARI-789. Prototype for management spi interface. (Contributed by hitesh)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/branches/AMBARI-666@1393239 13f79535-47bb-0310-9956-ffa450edef68

AMBARI-666-CHANGES.txt

@@ -12,6 +12,8 @@ AMBARI-666 branch (unreleased changes)
 
   NEW FEATURES
 
+  AMBARI-789. Prototype for management spi interface. (hitesh)
+
   AMBARI-787. Registration throws HostNotFoundException for new hosts. (jitendra)
 
   AMBARI-788. Fix server and agent startup for end to end testing. (mahadev)

ambari-project/pom.xml

@@ -84,6 +84,11 @@
   </profiles>
   <dependencyManagement>
     <dependencies>
+      <dependency>
+        <groupId>org.apache.ambari</groupId>
+        <artifactId>ambari-api</artifactId>
+        <version>1.0.3-SNAPSHOT</version>
+      </dependency>
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>

ambari-server/pom.xml

@@ -56,6 +56,10 @@
   <profiles>
   </profiles>
   <dependencies>
+    <dependency>
+      <groupId>org.apache.ambari</groupId>
+      <artifactId>ambari-api</artifactId>
+    </dependency>
     <dependency>
       <groupId>commons-io</groupId>
       <artifactId>commons-io</artifactId>

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

@@ -0,0 +1,83 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.Set;
+
+import org.apache.ambari.api.controller.spi.Predicate;
+
+/**
+ * Management controller interface.
+ */
+public interface AmbariManagementController {
+
+
+  // ----- Create -----------------------------------------------------------
+
+  public ClusterResponse createCluster(ClusterRequest request);
+
+  public ServiceResponse createServices(ServiceRequest request);
+
+  public ServiceComponentResponse createComponents(ServiceComponentRequest request);
+
+  public HostResponse createHosts(HostRequest request);
+
+  public ServiceComponentHostResponse createHostComponents(ServiceComponentHostRequest request);
+
+
+  // ----- Read -------------------------------------------------------------
+
+  public ClusterResponse getCluster(ClusterRequest request);
+  public Set<ClusterResponse> getAllClusters();
+
+  public ServiceResponse getServices(ServiceRequest request, Predicate predicate);
+
+  public ServiceComponentResponse getComponents(ServiceComponentRequest request, Predicate predicate);
+
+  public HostResponse getHosts(HostRequest request, Predicate predicate);
+
+  public ServiceComponentHostResponse getHostComponents(ServiceComponentHostRequest request, Predicate predicate);
+
+
+  // ----- Update -----------------------------------------------------------
+
+  public ClusterResponse updateCluster(ClusterRequest request);
+
+  public ServiceResponse updateServices(ServiceRequest request, Predicate predicate);
+
+  public ServiceComponentResponse updateComponents(ServiceComponentRequest request, Predicate predicate);
+
+  public HostResponse updateHosts(HostRequest request, Predicate predicate);
+
+  public ServiceComponentHostResponse updateHostComponents(ServiceComponentHostRequest request, Predicate predicate);
+
+
+  // ----- Delete -----------------------------------------------------------
+
+  public void deleteCluster(ClusterRequest request);
+
+  public void deleteServices(ServiceRequest request);
+
+  public void deleteComponents(ServiceComponentRequest request);
+
+  public void deleteHosts(HostRequest request);
+
+
+  public void deleteHostComponents(ServiceComponentHostRequest request);
+}

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

@@ -15,16 +15,17 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.ambari.server.controller;
 
 /**
- * This class encapsulates a cluster level request.
+ * Used for create Cluster
  */
-public class ClusterRequest extends Request {
-  private String clusterName;
+public class ClusterRequest {
 
-  public ClusterRequest(long requestId, Request.Method m, String c) {
-    super(requestId, m);
-    this.clusterName = c;
-  }
+  Long clusterId; // for GET
+  
+  String clusterName; // for GET/CREATE/UPDATE
+  
+  String stackVersion; // for CREATE/UPDATE
 }

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

@@ -0,0 +1,35 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.Map;
+
+/**
+ * Used for create Cluster
+ */
+public class ClusterResponse {
+
+  Long clusterId; // for GET
+  
+  String clusterName; // for GET/CREATE/UPDATE
+  
+  Map<String, ServiceResponse> services; // for GET
+  
+  Map<String, HostResponse> hosts; // for GET
+}

ambari-server/src/main/java/org/apache/ambari/server/controller/JobRequest.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationRequest.java

@@ -21,21 +21,23 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * JobRequest encapsulates the requests for an action on the cluster.
- * An action on the cluster are operations that don't change the state of
- * any service.
+ * This class encapsulates a configuration update request.
+ * The configuration properties are grouped at service level. It is assumed that
+ * different components of a service don't overload same property name.
  */
-public class JobRequest extends Request {
+public class ConfigurationRequest {
 
-  final private String job;
-  final private String serviceName; //can be null if action is at host level
-  final private List<String> hosts;
-
-  public JobRequest(long requestId, Request.Method m, String job, String serviceName,
-      List<String> hosts, Map<String, String> params) {
-    super(requestId, m, params);
-    this.job = job;
-    this.serviceName = serviceName;
-    this.hosts = hosts;
+  String clusterName;
+  
+  List<PerConfigurationRequest> configs;
+  
+  public static class PerConfigurationRequest {
+    
+    String type;
+    
+    String versionTag;
+    
+    Map<String, String> configs;
   }
+
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceConfigurationRequest.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ConfigurationResponse.java

@@ -17,6 +17,7 @@
  */
 package org.apache.ambari.server.controller;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -24,26 +25,19 @@ import java.util.Map;
  * The configuration properties are grouped at service level. It is assumed that
  * different components of a service don't overload same property name.
  */
-public class ServiceConfigurationRequest extends Request {
-  final private String clusterName;
-  final private String serviceName;
+public class ConfigurationResponse {
 
-  //The complete set of desired configurations can be derived as
-  //properties corresponding to baseConfigVersion overridden with
-  //desiredProperties.
-  final private String baseConfigVersion;
-  private Map<String, String> desiredProperties = null;
-  private Map<String, String> hostComponentMap = null;
-
-  public ServiceConfigurationRequest(long requestId, Request.Method m,
-      String clusterName, String serviceName, String baseConfigVersion,
-      Map<String, String> desiredProperties,
-      Map<String, String> hostComponentMap) {
-    super(requestId, m);
-    this.clusterName = clusterName;
-    this.serviceName = serviceName;
-    this.baseConfigVersion = baseConfigVersion;
-    this.desiredProperties = desiredProperties;
-    this.hostComponentMap = hostComponentMap;
+  String clusterName;
+  
+  List<PerConfigurationResponse> configs;
+  
+  public static class PerConfigurationResponse {
+    
+    String type;
+    
+    String versionTag;
+    
+    Map<String, String> configs;
   }
+
 }

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

@@ -15,21 +15,21 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.ambari.server.controller;
 
 import java.util.List;
 import java.util.Map;
 
-/**
- * This class encapsulates any request at a host level but not referring to any
- * service or component.
- */
-public class HostRequest extends Request {
-  private List<String> hosts;
+public class HostRequest {
 
-  public HostRequest(long requestId, Request.Method m, List<String> hostList,
-      Map<String, String> params) {
-    super(requestId, m, params);
-    hosts = hostList;
+  List<PerHostRequest> hosts;
+  
+  public static class PerHostRequest {
+    String hostname;
+    
+    List<String> clusterNames; // CREATE/UPDATE 
+    
+    Map<String, String> hostAttributes; // CREATE/UPDATE  
   }
 }

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

@@ -0,0 +1,37 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.List;
+import java.util.Map;
+
+public class HostResponse {
+
+  List<PerHostResponse> hosts;
+  
+  public static class PerHostResponse {
+    String hostname;
+    
+    List<String> clusterNames;
+    
+    Map<String, String> hostAttributes; 
+    
+    List<ServiceComponentHostResponse> hostComponents;
+  }
+}

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

@@ -0,0 +1,45 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.List;
+import java.util.Map;
+
+public class ServiceComponentHostRequest {
+
+  String clusterName; // REF
+  
+  List<PerServiceComponentHostRequest> hostComponents;
+  
+  public static class PerServiceComponentHostRequest {
+    
+    String serviceName; 
+    
+    String componentName;
+    
+    String hostname;
+    
+    // Config type -> version mapping
+    Map<String, String> configVersions; // CREATE/UPDATE
+    
+    String desiredState; // CREATE/UPDATE
+
+  }
+
+}

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

@@ -0,0 +1,47 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.List;
+import java.util.Map;
+
+public class ServiceComponentHostResponse {
+
+  String clusterName; // REF
+  
+  List<PerServiceComponentHostResponse> hostComponents;
+  
+  public static class PerServiceComponentHostResponse {
+    
+    String serviceName; 
+    
+    String componentName;
+    
+    String hostname;
+    
+    // Config type -> version mapping
+    Map<String, String> configVersions;
+
+    String liveState;
+
+    String stackVersion;
+
+  }
+
+}

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

@@ -0,0 +1,43 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.List;
+import java.util.Map;
+
+public class ServiceComponentRequest {
+
+  String clusterName; // REF
+  
+  List<PerServiceComponentRequest> components;
+
+  public static class PerServiceComponentRequest {
+
+    String serviceName; // GET/CREATE/UPDATE/DELETE
+    
+    String componentName; // GET/CREATE/UPDATE/DELETE
+        
+    // Config type -> version mapping
+    Map<String, String> configVersions; // CREATE/UPDATE
+    
+    String desiredState; // CREATE/UPDATE
+    
+  }
+
+}

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

@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ambari.server.controller;
+
+import java.util.List;
+import java.util.Map;
+
+public class ServiceComponentResponse {
+
+  Long clusterId; // REF
+
+  String clusterName; // REF
+  
+  List<PerServiceComponentResponse> components;
+
+  public static class PerServiceComponentResponse {
+
+    String serviceName; // GET/CREATE/UPDATE/DELETE
+    
+    String componentName; // GET/CREATE/UPDATE/DELETE
+        
+    // Config type -> version mapping
+    Map<String, String> configVersions; // CREATE/UPDATE
+    
+    // hostname -> ServiceComponentHost mapping
+    Map<String, ServiceComponentHostResponse> serviceComponentHosts;
+    
+  }
+
+}

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

@@ -17,38 +17,24 @@
  */
 package org.apache.ambari.server.controller;
 
-import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-/**
- * This class encapsulates any request relating to a state change or action in
- * a service or its components.
- */
-public class ServiceRequest extends Request {
-  private String clusterName;
-  private String service;
-  private String configVersion;
-  private String hostComponentMapVersion;
+public class ServiceRequest {
 
-  public class ComponentRequest {
-    private String componentName;
-    private Map<String, String> params = new HashMap<String, String>();
-  }
+  String clusterName; // REF
 
-  public void addComponentRequest(ComponentRequest c) {
-    components.add(c);
-  }
+  List<PerServiceRequest> services;
 
-  public ServiceRequest(long requestId, Request.Method m, String clusterName,
-      String service, String configVersion, String hostComponentMapVersion) {
-    super(requestId, m);
-    this.clusterName = clusterName;
-    this.service = service;
-    this.configVersion = configVersion;
-    this.hostComponentMapVersion = hostComponentMapVersion;
-  }
+  public static class PerServiceRequest {
 
-  private List<ComponentRequest> components = new ArrayList<ComponentRequest>();
+    String serviceName; // GET/CREATE/UPDATE/DELETE
+    
+    // Config type -> version mapping
+    Map<String, String> configVersions; // CREATE/UPDATE
+    
+    String desiredState; // CREATE/UPDATE
+    
+  }
+  
 }

ambari-server/src/main/java/org/apache/ambari/server/controller/Request.java → ambari-server/src/main/java/org/apache/ambari/server/controller/ServiceResponse.java

@@ -15,32 +15,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 package org.apache.ambari.server.controller;
 
+import java.util.List;
 import java.util.Map;
 
-public class Request {
-
-  public enum Method {
-    GET,
-    PUT,
-    POST,
-    DELETE
-  }
-
-  private long requestId;
-  private Map<String, String> params;
-  private Method method;
-
+public class ServiceResponse {
 
-  public Request(long requestId, Method m) {
-    this(requestId, m, null);
-  }
+  Long clusterId; // REF
 
+  String clusterName; // REF
 
-  public Request(long requestId, Method m, Map<String, String> p) {
-    this.requestId = requestId;
-    this.method = m;
-    this.params = p;
+  List<PerServiceResponse> services;
+  
+  public static class PerServiceResponse {
+    
+    String serviceName;
+    
+    String currentStackVersion;
+    
+    Map<String, ServiceComponentResponse> components;
+    
   }
 }