AMBARI-12950: [PluggableStackDefinition] FE: Copy pluggable stack resources (jluniya)

ambari-admin/copy-pluggable-stack-resources.sh

@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# 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.
+#
+
+if [[ $# -eq 0 ]] ; then
+  echo 'Usage: copy-pluggable-stack-resources.sh <stack.distribution>'
+  exit 1
+fi
+
+resources_dir="../ambari-common/src/main/python/pluggable_stack_definition/resources/$1"
+if [ ! -d $resources_dir ];
+then
+  echo "No resources to copy for [ $1 ]"
+  exit 0
+fi
+
+echo "Copying pluggable stack resources for [ $1 ]"
+if [ -f "$resources_dir/custom-admin-ui.css" ]
+then
+  echo cp $resources_dir/custom-admin-ui.css src/main/resources/ui/admin-web/app/styles/custom-admin-ui.css
+  cp $resources_dir/custom-admin-ui.css src/main/resources/ui/admin-web/app/styles/custom-admin-ui.css
+fi

ambari-admin/pom.xml

@@ -262,5 +262,35 @@
         <args.shell></args.shell>
       </properties>
     </profile>
+      <profile>
+        <id>pluggable-stack-definition</id>
+        <activation>
+          <activeByDefault>false</activeByDefault>
+        </activation>
+        <build>
+          <plugins>
+            <plugin>
+              <groupId>org.codehaus.mojo</groupId>
+              <artifactId>exec-maven-plugin</artifactId>
+              <version>1.2.1</version>
+              <executions>
+                <execution>
+                  <id>copy-pluggable-stack-resources</id>
+                  <phase>initialize</phase>
+                  <goals>
+                    <goal>exec</goal>
+                  </goals>
+                  <configuration>
+                    <!-- Copy stack specific UI resources -->
+                    <executable>${executable.shell}</executable>
+                    <workingDirectory>${basedir}</workingDirectory>
+                    <commandlineArgs>${args.shell} ${basedir}${dirsep}copy-pluggable-stack-resources.${fileextension.shell} ${stack.distribution}</commandlineArgs>
+                  </configuration>
+                </execution>
+              </executions>
+            </plugin>
+          </plugins>
+        </build>
+      </profile>
   </profiles>
 </project>

ambari-common/src/main/python/pluggable_stack_definition/GenerateStackDefinition.py

@@ -30,12 +30,6 @@ from os.path import join
 import random
 import string
 
-UI_MAPPING_TEMPLATE = """var App = require('app');
-module.exports = {0};
-"""
-UI_MAPPING_MAP = {"2.2":"HDP2.2",
-                  "2.3":"HDP2.3"}
-
 def generate_random_string(size=7, chars=string.ascii_uppercase + string.digits):
   return ''.join(random.choice(chars) for _ in range(size))
 
@@ -597,24 +591,6 @@ class GeneratorHelper(object):
           else:
             out_file.write(line)
 
-  def generate_ui_mapping(self):
-    stack_name = self.config_data.stackName
-    records = []
-    for _from, _to in self.stack_version_changes.iteritems():
-      base_stack_folder = UI_MAPPING_MAP[_from] if _from in UI_MAPPING_MAP else "HDP2"
-      record = {"stackName": stack_name,
-                "stackVersionNumber": _to,
-                "sign": "=",
-                "baseStackFolder": base_stack_folder}
-      records.append(record)
-    if "uiMapping" in self.config_data:
-      for mapping in self.config_data.uiMapping:
-        mapping["stackName"] = stack_name
-        records.append(mapping)
-    js_file_content = UI_MAPPING_TEMPLATE.format(json.dumps(records, indent=2))
-    open(os.path.join(self.output_folder, "custom_stack_map.js"),"w").write(js_file_content)
-    pass
-
   def copy_custom_actions(self):
     original_folder = os.path.join(self.resources_folder, 'custom_actions')
     target_folder = os.path.join(self.output_folder, 'custom_actions')
@@ -659,7 +635,6 @@ def main(argv):
   gen_helper.copy_resource_management()
   gen_helper.copy_common_services()
   gen_helper.copy_ambari_properties()
-  gen_helper.generate_ui_mapping()
   gen_helper.copy_custom_actions()
 
 

ambari-common/src/main/python/pluggable_stack_definition/configs/ODP.json

@@ -0,0 +1,131 @@
+{
+  "stackName": "ODP",
+  "baseStackName": "HDP",
+  "performCommonReplacements": true,
+  "textReplacements": [
+    ["hdp-select", "distro-select"]
+   ],
+  "preservedText": ["ext-2.2", "HDP-oozie", "hdp.version", "HDP_VERSION"],
+  "uiMapping": [
+    {
+      "stackVersionNumber": "0.9",
+      "sign": "<",
+      "baseStackFolder": "HDP2"
+    }
+  ],
+  "ambariProperties": {
+    "jdk.download.supported" : "false",
+    "jce.download.supported" : "false",
+    "jdk1.7.url" : "http://DOWNLOAD_NOT_SUPPORTED",
+    "jdk1.8.url" : "http://DOWNLOAD_NOT_SUPPORTED",
+    "jdk1.7.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED",
+    "jdk1.8.jcpol-url" : "http://DOWNLOAD_NOT_SUPPORTED",
+    "rolling.upgrade.min.stack" : "ODP-0.8"
+  },
+  "versions": [
+    {
+      "version": "0.6",
+      "baseVersion": "2.0.6",
+      "family": "redhat6,suse11",
+      "active": "false",
+      "services": [
+        {
+          "name": "KERBEROS"
+        },
+        {
+          "name": "AMBARI_METRICS"
+        },
+        {
+          "name": "HDFS"
+        },
+        {
+          "name": "ZOOKEEPER"
+        },
+        {
+          "name": "YARN"
+        },
+        {
+          "name": "MAPREDUCE2"
+        }
+      ]
+    },
+    {
+      "version": "0.7",
+      "baseVersion": "2.1",
+      "active": "false",
+      "family": "redhat6,suse11",
+      "services": [
+        {
+          "name": "KERBEROS"
+        },
+        {
+          "name": "AMBARI_METRICS"
+        },
+        {
+          "name": "HDFS"
+        },
+        {
+          "name": "ZOOKEEPER"
+        },
+        {
+          "name": "YARN"
+        },
+        {
+          "name": "MAPREDUCE2"
+        }
+      ]
+    },
+    {
+      "version": "0.8",
+      "baseVersion": "2.2",
+      "active": "false",
+      "family": "redhat6,suse11",
+      "services": [
+        {
+          "name": "KERBEROS"
+        },
+        {
+          "name": "AMBARI_METRICS"
+        },
+        {
+          "name": "HDFS"
+        },
+        {
+          "name": "ZOOKEEPER"
+        },
+        {
+          "name": "YARN"
+        },
+        {
+          "name": "MAPREDUCE2"
+        }
+      ]
+    },
+    {
+      "version": "0.9",
+      "baseVersion": "2.3",
+      "active": "true",
+      "family": "redhat6,redhat7,suse11",
+      "services": [
+        {
+          "name": "KERBEROS"
+        },
+        {
+          "name": "AMBARI_METRICS"
+        },
+        {
+          "name": "HDFS"
+        },
+        {
+          "name": "ZOOKEEPER"
+        },
+        {
+          "name": "YARN"
+        },
+        {
+          "name": "MAPREDUCE2"
+        }
+      ]
+    }
+  ]
+}

ambari-common/src/main/python/pluggable_stack_definition/resources/ODP/custom_stack_map.js

@@ -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.
+ */
+
+var App = require('app');
+
+/*
+sign will be compared like: <clusterSelectedStackVersion> sign <stackVersionNumber> if true use this baseStackFolder
+Example:
+ {
+ "stackName": "PHD",
+ "stackVersionNumber": "3.0",
+ "sign": "<",
+ "baseStackFolder": "HDP2"
+ }
+ This rule will work for any PHD version number that is lower than 3.0 (2.9,2.8, e.t.c)
+*/
+
+module.exports = [
+  {
+    "stackName": "ODP",
+    "stackVersionNumber": "0.9",
+    "sign": "=",
+    "baseStackFolder": "HDP2.3"
+  },
+  {
+    "stackName": "ODP",
+    "stackVersionNumber": "0.9",
+    "sign": "<",
+    "baseStackFolder": "HDP2"
+  }
+];

ambari-common/src/main/python/pluggable_stack_definition/resources/PHD/custom_stack_map.js

@@ -0,0 +1,52 @@
+/**
+ * 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.
+ */
+
+var App = require('app');
+
+/*
+sign will be compared like: <clusterSelectedStackVersion> sign <stackVersionNumber> if true use this baseStackFolder
+Example:
+ {
+ "stackName": "PHD",
+ "stackVersionNumber": "3.0",
+ "sign": "<",
+ "baseStackFolder": "HDP2"
+ }
+ This rule will work for any PHD version number that is lower than 3.0 (2.9,2.8, e.t.c)
+*/
+
+module.exports = [
+  {
+    "stackName": "PHD",
+    "stackVersionNumber": "3.1",
+    "sign": "=",
+    "baseStackFolder": "HDP2.3"
+  },
+  {
+    "stackName": "PHD",
+    "stackVersionNumber": "3.0",
+    "sign": "=",
+    "baseStackFolder": "HDP2.2"
+  },
+  {
+    "stackName": "PHD",
+    "stackVersionNumber": "3.0",
+    "sign": "<",
+    "baseStackFolder": "HDP2"
+  }
+];

ambari-common/src/main/python/pluggable_stack_definition/resources/SAPHD/custom_stack_map.js

@@ -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.
+ */
+
+var App = require('app');
+
+/*
+sign will be compared like: <clusterSelectedStackVersion> sign <stackVersionNumber> if true use this baseStackFolder
+Example:
+ {
+ "stackName": "PHD",
+ "stackVersionNumber": "3.0",
+ "sign": "<",
+ "baseStackFolder": "HDP2"
+ }
+ This rule will work for any PHD version number that is lower than 3.0 (2.9,2.8, e.t.c)
+*/
+
+module.exports = [
+  {
+    "stackName": "SAPHD",
+    "stackVersionNumber": "1.0",
+    "sign": "=",
+    "baseStackFolder": "HDP2.3"
+  },
+  {
+    "stackName": "SAPHD",
+    "stackVersionNumber": "1.0",
+    "sign": "<",
+    "baseStackFolder": "HDP2"
+  }
+];

ambari-server/pom.xml

@@ -41,7 +41,6 @@
     <ambari-admin-dir>${basedir}/../ambari-admin</ambari-admin-dir>
     <contrib-views-dir>${basedir}/../contrib/views</contrib-views-dir>
     <resourceManagementSrcLocation>${project.basedir}/../ambari-common/src/main/python/resource_management</resourceManagementSrcLocation>
-    <customStackMap>${basedir}/../ambari-web/app/data/custom_stack_map.js</customStackMap>
     <customActionsRoot>src/main/resources/custom_actions</customActionsRoot>
     <ambariProperties>conf/unix/ambari.properties</ambariProperties>
     <commonServicesSrcLocation>target/classes/common-services</commonServicesSrcLocation>
@@ -296,14 +295,6 @@
               <dependency>
               </dependency>
             </mapping>
-            <mapping>
-              <directory>/usr/lib/ambari-server/app/data</directory>
-              <sources>
-                <source>
-                  <location>${customStackMap}</location>
-                </source>
-              </sources>
-            </mapping>
             <mapping>
               <directory>/usr/lib/ambari-server/web</directory>
               <sources>
@@ -1114,14 +1105,6 @@
                 <filemode>755</filemode>
               </mapper>
             </data>
-            <data>
-              <src>${customStackMap}</src>
-              <type>file</type>
-              <mapper>
-                <type>perm</type>
-                <prefix>/usr/lib/ambari-server/app/data</prefix>
-              </mapper>
-            </data>
             <data>
               <src>src/main/python/os_check_type.py</src>
               <type>file</type>
@@ -1561,7 +1544,6 @@
       </activation>
       <properties>
         <customActionsRoot>target/pluggable-stack-definition/custom_actions</customActionsRoot>
-        <customStackMap>target/pluggable-stack-definition/custom_stack_map.js</customStackMap>
         <ambariProperties>target/pluggable-stack-definition/conf/unix/ambari.properties</ambariProperties>
         <resourceManagementSrcLocation>target/pluggable-stack-definition/python/resource_management</resourceManagementSrcLocation>
         <commonServicesSrcLocation>target/pluggable-stack-definition/common-services</commonServicesSrcLocation>

ambari-web/copy-pluggable-stack-resources.sh

@@ -0,0 +1,48 @@
+#!/bin/sh
+#
+# 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.
+#
+
+if [[ $# -eq 0 ]] ; then
+  echo 'Usage: copy-pluggable-stack-resources.sh <stack.distribution>'
+  exit 1
+fi
+
+resources_dir="../ambari-common/src/main/python/pluggable_stack_definition/resources/$1"
+if [ ! -d $resources_dir ];
+then
+  echo "No resources to copy for [ $1 ]"
+  exit 0
+fi
+
+echo "Copying pluggable stack resources for [ $1 ]"
+if [ -f "$resources_dir/custom_stack_map.js" ];
+then
+  echo cp $resources_dir/custom_stack_map.js app/data/custom_stack_map.js
+  cp $resources_dir/custom_stack_map.js app/data/custom_stack_map.js
+fi
+if [ -f "$resources_dir/custom-ui.less" ]
+then
+  echo cp $resources_dir/custom-ui.less app/styles/custom-ui.less
+  cp $resources_dir/custom-ui.less app/styles/custom-ui.less
+fi
+if [ -f "$resources_dir/messages.js" ]
+then
+  echo cp $resources_dir/messages.js app/messages.js
+  cp $resources_dir/messages.js app/messages.js
+fi

ambari-web/pom.xml

@@ -308,5 +308,35 @@
         <args.shell></args.shell>
       </properties>
     </profile>
+    <profile>
+      <id>pluggable-stack-definition</id>
+      <activation>
+        <activeByDefault>false</activeByDefault>
+      </activation>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>exec-maven-plugin</artifactId>
+            <version>1.2.1</version>
+            <executions>
+              <execution>
+                <id>copy-pluggable-stack-resources</id>
+                <phase>initialize</phase>
+                <goals>
+                  <goal>exec</goal>
+                </goals>
+                <configuration>
+                  <!-- Copy stack specific UI resources -->
+                  <executable>${executable.shell}</executable>
+                  <workingDirectory>${basedir}</workingDirectory>
+                  <commandlineArgs>${args.shell} ${basedir}${dirsep}copy-pluggable-stack-resources.${fileextension.shell} ${stack.distribution}</commandlineArgs>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
   </profiles>
 </project>