svn commit: r1487190 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/service/item.js ambari-web/app/utils/ajax.js

[yu...@apache.org]

Author: yusaku
Date: Wed May 29 01:52:26 2013
New Revision: 1487190

URL: http://svn.apache.org/r1487190
Log:
AMBARI-2202. Running the smoke test for a specific service should set the appropriate request context showing the service name. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
    incubator/ambari/trunk/ambari-web/app/utils/ajax.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1487190&r1=1487189&r2=1487190&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Wed May 29 01:52:26 2013
@@ -895,6 +895,9 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2202. Running the smoke test for a specific service should set the
+ appropriate request context showing the service name. (yusaku)
+
  AMBARI-2209. Add monitoring capabilities for Hadoop 2.0. (smohanty)
 
  AMBARI-2201. Hbase master and regionserver should use same keytab. (jaimin)

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js?rev=1487190&r1=1487189&r2=1487190&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/item.js Wed May 29 01:52:26 2013
@@ -172,6 +172,7 @@ App.MainServiceItemController = Em.Contr
       'success':'runSmokeTestSuccessCallBack',
       'data': {
         'serviceName': this.get('content.serviceName'),
+        'displayName': this.get('content.displayName'),
         'actionName': this.get('content.serviceName') === 'ZOOKEEPER' ? 'ZOOKEEPER_QUORUM_SERVICE_CHECK' : this.get('content.serviceName') + '_SERVICE_CHECK'
       }
     });

Modified: incubator/ambari/trunk/ambari-web/app/utils/ajax.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/ajax.js?rev=1487190&r1=1487189&r2=1487190&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/ajax.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/ajax.js Wed May 29 01:52:26 2013
@@ -67,12 +67,12 @@ var urls = {
   'service.item.smoke': {
     'real': '/clusters/{clusterName}/services/{serviceName}/actions/{actionName}',
     'mock': '/data/wizard/deploy/poll_1.json',
-    'format': function () {
+    'format': function (data) {
       return {
         'type': 'POST',
         data: JSON.stringify({
           RequestInfo: {
-            "context": "Smoke Test"
+            "context": data.displayName + " Smoke Test"
           }
         })
       };