ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jonathanhur...@apache.org
Subject [48/50] [abbrv] git commit: AMBARI-7588. Slider View: Properties required by Slider View when RM HA is enabled. (onechiporenko)
Date Wed, 01 Oct 2014 15:27:46 GMT
AMBARI-7588. Slider View: Properties required by Slider View when RM HA is enabled. (onechiporenko)


Project: http://git-wip-us.apache.org/repos/asf/ambari/repo
Commit: http://git-wip-us.apache.org/repos/asf/ambari/commit/c8d3a0aa
Tree: http://git-wip-us.apache.org/repos/asf/ambari/tree/c8d3a0aa
Diff: http://git-wip-us.apache.org/repos/asf/ambari/diff/c8d3a0aa

Branch: refs/heads/branch-alerts-dev
Commit: c8d3a0aa05731f7f77f3b1b0cd2ea28ca332a6a3
Parents: f3c4e43
Author: Oleg Nechiporenko <onechiporenko@apache.org>
Authored: Wed Oct 1 17:50:30 2014 +0300
Committer: Oleg Nechiporenko <onechiporenko@apache.org>
Committed: Wed Oct 1 17:50:30 2014 +0300

----------------------------------------------------------------------
 .../src/main/resources/ui/app/routes/main.js    |  5 +-
 .../ui/test/integration/pages/index_test.js     | 61 ++++++++++++++++++++
 .../views/slider/src/main/resources/view.xml    | 15 +++++
 3 files changed, 80 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ambari/blob/c8d3a0aa/contrib/views/slider/src/main/resources/ui/app/routes/main.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/app/routes/main.js b/contrib/views/slider/src/main/resources/ui/app/routes/main.js
index 4233758..bef5faa 100644
--- a/contrib/views/slider/src/main/resources/ui/app/routes/main.js
+++ b/contrib/views/slider/src/main/resources/ui/app/routes/main.js
@@ -64,7 +64,10 @@ App.SliderAppsRoute = Ember.Route.extend({
       Em.Object.create({id: 10, required: false, requireDependsOn: 9, viewConfigName: 'yarn.rm.kerberos.principal',
displayName: 'yarnResourceManagerPrincipal'}),
       Em.Object.create({id: 11, required: false, requireDependsOn: 9, viewConfigName: 'dfs.namenode.kerberos.principal',
displayName: 'dfsNamenodeKerberosPrincipal'}),
       Em.Object.create({id: 12, required: false, requireDependsOn: 9, viewConfigName: 'view.kerberos.principal',
displayName: 'viewKerberosPrincipal'}),
-      Em.Object.create({id: 13, required: false, requireDependsOn: 9, viewConfigName: 'view.kerberos.principal.keytab',
displayName: 'ViewKerberosPrincipalKeytab'})
+      Em.Object.create({id: 13, required: false, requireDependsOn: 9, viewConfigName: 'view.kerberos.principal.keytab',
displayName: 'ViewKerberosPrincipalKeytab'}),
+      Em.Object.create({id: 14, required: false, viewConfigName: 'yarm.rm.ha.hosts', displayName:
'yarnResourceManagerHighAvailabilityHosts'}),
+      Em.Object.create({id: 15, required: false, viewConfigName: 'yarn.rm.store.class', displayName:
'yarnResourceManagerStoreClass'}),
+      Em.Object.create({id: 16, required: false, viewConfigName: 'yarn.rm.ha.automatic-failover.zk-base-path',
displayName: 'yarnResourceManagerHighAvailabilityAutoFailoverZooKeeperBasePath'})
     ]));
   },
 

http://git-wip-us.apache.org/repos/asf/ambari/blob/c8d3a0aa/contrib/views/slider/src/main/resources/ui/test/integration/pages/index_test.js
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/ui/test/integration/pages/index_test.js
b/contrib/views/slider/src/main/resources/ui/test/integration/pages/index_test.js
new file mode 100644
index 0000000..3e0d93c
--- /dev/null
+++ b/contrib/views/slider/src/main/resources/ui/test/integration/pages/index_test.js
@@ -0,0 +1,61 @@
+/**
+ * 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.
+ */
+
+QUnit.module('integration/pages - index', {
+
+  setup: function () {
+    Ember.run(App, App.advanceReadiness);
+  },
+
+  teardown: function () {
+    App.reset();
+  }
+
+});
+
+test('route', function () {
+
+  visit('/');
+  andThen(function () {
+    equal(currentRouteName(), 'slider_apps.index', 'route is valid');
+    equal(currentPath(), 'slider_apps.index', 'path is valid');
+    equal(currentURL(), '/', 'url is valid');
+  });
+
+});
+
+test('sliderConfigs', function () {
+
+  visit('/');
+  // configs count may be changed by adding new slider-configs
+  equal(App.SliderApp.store.all('sliderConfig').content.length, 16, 'slider configs should
be set');
+
+});
+
+test('Create-App button', function () {
+
+  visit('/');
+  click('.create-app a');
+
+  andThen(function () {
+    equal(currentRouteName(), 'createAppWizard.index', 'route is valid');
+    equal(currentPath(), 'slider_apps.createAppWizard.index', 'path is valid');
+    equal(currentURL(), '/createAppWizard', 'url is valid');
+  });
+
+});
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/ambari/blob/c8d3a0aa/contrib/views/slider/src/main/resources/view.xml
----------------------------------------------------------------------
diff --git a/contrib/views/slider/src/main/resources/view.xml b/contrib/views/slider/src/main/resources/view.xml
index b2f8129..2c6ca0f 100644
--- a/contrib/views/slider/src/main/resources/view.xml
+++ b/contrib/views/slider/src/main/resources/view.xml
@@ -83,6 +83,21 @@ limitations under the License. Kerberos, LDAP, Custom. Binary/Htt
     <description>Path to the Kerberos principal keytab used for view's user. For example:
/etc/security/keytabs/ambari.headless.keytab</description>
     <required>optional</required>
   </parameter>
+  <parameter>
+    <name>yarm.rm.ha.hosts</name>
+    <description>Hostnames where YARN ResourceManagers are available when High Availability
is enabled. Value should be a comma separated list of host names</description>
+    <required>optional</required>
+  </parameter>
+  <parameter>
+    <name>yarn.rm.store.class</name>
+    <description>Name of class used by YARN ResourceManager to persist its state. For
example some of the classes are 'org.apache.hadoop.yarn.server.resourcemanager.recovery.ZKRMStateStore',
or 'org.apache.hadoop.yarn.server.resourcemanager.recovery.FileSystemRMStateStore'</description>
+    <required>optional</required>
+  </parameter>
+  <parameter>
+    <name>yarn.rm.ha.automatic-failover.zk-base-path</name>
+    <description>The base path in ZooKeeper used for storing leader information. This
is used when ZooKeeper based leader election is performed. For example: '/yarn-leader-election'</description>
+    <required>optional</required>
+  </parameter>
   <resource>
     <name>status</name>
     <service-class>org.apache.ambari.view.slider.rest.ViewStatusResource</service-class>


Mime
View raw message