Revert "AMBARI-14168. Tolerate null hostname for a AMBARI_SERVER_ACTION with no hostname for task.(xiwang)"

This reverts commit 66e1a3a5b34a888e76a101a87b5deda71d0aaeac.

ambari-web/app/messages.js

@@ -331,8 +331,6 @@ Em.I18n.translations = {
   'hostPopup.noServicesToShow':'No services to show',
   'hostPopup.noHostsToShow':'No hosts to show',
   'hostPopup.noTasksToShow':'No tasks to show',
-  'hostPopup.Tasks.role.ambariServerAction':'AMBARI_SERVER_ACTION',
-  'hostPopup.Hosts.ambariServerHost':'Ambari Server Host',
   'hostPopup.status.category.all':'All ({0})',
   'hostPopup.status.category.pending':'Pending ({0})',
   'hostPopup.status.category.inProgress':'In Progress ({0})',

ambari-web/app/utils/host_progress_popup.js

@@ -631,24 +631,6 @@ App.HostPopup = Em.Object.create({
     return hostsMap;
   },
 
-  /**
-  * Get hostname to display: return "n/a" for safety measure if hostname is null
-  * return "Ambari Server Host" if task role is AMBARI_SERVER_ACTION
-  * @param {Array} tasks
-  * @param {String} hostname
-  * @return {String} hostname to display
-  */
-  getDisplayHostname: function (hostname, tasks) {
-    if ((!hostname || hostname == "null") && tasks.someProperty('Tasks.role', Em.I18n.t('hostPopup.Tasks.role.ambariServerAction'))) {
-      // change hostname to "ambari server host"
-      return Em.I18n.t('hostPopup.Hosts.ambariServerHost');
-    } else if ((!hostname || hostname == "null")){
-      // just for safety measure
-      return Em.I18n.t('common.na');
-    }
-    return hostname;
-   },
-
   /**
    *
    * @param {object} hostsMap
@@ -668,12 +650,8 @@ App.HostPopup = Em.Object.create({
       var hostInfo = Em.Object.create({
         name: hostName,
         publicName: _host.publicName,
-        publicNameDisplay: function () {
-          return self.getDisplayHostname(this.get('publicName'), tasks);
-        }.property('publicName'),
         displayName: function () {
-          var name = self.getDisplayHostname(this.get('name'), tasks);
-          return name.length < 43 ? name : (name.substr(0, 40) + '...');
+          return this.get('name').length < 43 ? this.get('name') : (this.get('name').substr(0, 40) + '...');
         }.property('name'),
         progress: 0,
         status: App.format.taskStatus("PENDING"),

ambari-web/app/views/common/host_progress_popup_body_view.js

@@ -643,7 +643,7 @@ App.HostProgressPopupBodyView = App.TableView.extend({
       tasksInfo.pushObject(this.get("controller").createTask(_task));
     }, this);
     if (tasksInfo.length) {
-      this.get("controller").set("popupHeaderName", event.context.get('publicNameDisplay'));
+      this.get("controller").set("popupHeaderName", event.context.publicName);
       this.get("controller").set("currentHostName", event.context.publicName);
     }
     this.switchLevel("TASKS_LIST");

ambari-web/test/utils/host_progress_popup_test.js

@@ -101,63 +101,53 @@ describe('App.HostPopup', function () {
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 2,
-            role: "NAMENODE"
+            id: 2
           }
         },
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 3,
-            role: "NAMENODE"
+            id: 3
           }
         },
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 1,
-            role: "NAMENODE"
+            id: 1
           }
         }
       ],
       m: 'All COMPLETED',
       r: 'SUCCESS',
       p: 100,
-      ids: [1,2,3],
-      name: "host1",
-      displayHostNameResult: "host1"
+      ids: [1,2,3]
     },
     {
       t: [
         {
           Tasks: {
             status: 'FAILED',
-            id: 2,
-            role: "NAMENODE"
+            id: 2
           }
         },
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 1,
-            role: "NAMENODE"
+            id: 1
           }
         }
         ,
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 3,
-            role: "NAMENODE"
+            id: 3
           }
         }
       ],
       m: 'One FAILED',
       r: 'FAILED',
       p: 100,
-      ids: [1,2,3],
-      name: "",
-      displayHostNameResult: "n/a"
+      ids: [1,2,3]
     },
     {
       t: [
@@ -177,57 +167,47 @@ describe('App.HostPopup', function () {
       m: 'One ABORTED',
       r: 'ABORTED',
       p: 100,
-      ids: [1,2],
-      name: null,
-      displayHostNameResult: "n/a"
+      ids: [1,2]
     },
     {
       t: [
         {
           Tasks: {
             status: 'TIMEDOUT',
-            id: 3,
-            role: "NAMENODE"
+            id: 3
           }
         },
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 1,
-            role: "AMBARI_SERVER_ACTION"
+            id: 1
           }
         }
       ],
       m: 'One TIMEDOUT',
       r: 'TIMEDOUT',
       p: 100,
-      ids: [1,3],
-      name: "host2",
-      displayHostNameResult: "host2"
+      ids: [1,3]
     },
     {
       t: [
         {
           Tasks: {
             status: 'IN_PROGRESS',
-            id: 1,
-            role: "NAMENODE"
+            id: 1
           }
         },
         {
           Tasks: {
             status: 'COMPLETED',
-            id: 2,
-            role: "AMBARI_SERVER_ACTION"
+            id: 2
           }
         }
       ],
       m: 'One IN_PROGRESS',
       r: 'IN_PROGRESS',
       p: 68,
-      ids: [1,2],
-      name: null,
-      displayHostNameResult: "Ambari Server Host"
+      ids: [1,2]
     },
     {
       t: [
@@ -247,9 +227,7 @@ describe('App.HostPopup', function () {
       m: 'Something else',
       r: 'PENDING',
       p: 55,
-      ids: [2,3],
-      name: undefined,
-      displayHostNameResult: "n/a"
+      ids: [2,3]
     }
   ];
 
@@ -383,14 +361,6 @@ describe('App.HostPopup', function () {
     });
   });
 
-  describe('#getDisplayHostname', function() {
-    test_tasks.forEach(function(test_task) {
-      it(test_task.m, function() {
-        expect(App.HostPopup.getDisplayHostname(test_task.name, test_task.t)).to.equal(test_task.displayHostNameResult);
-      });
-    });
-  });
-
   describe('#isAbortableByStatus', function () {
     statusCases.forEach(function (item) {
       it('should return ' + item.result + ' for ' + item.status, function () {