Преглед изворни кода

AMBARI-11156. Ranger Yarn Plugin Status - to be shown in Summary for Ranger (alexantonenko)

Alex Antonenko пре 10 година
родитељ
комит
68d02943a9

+ 7 - 1
ambari-web/app/controllers/main/service/info/summary.js

@@ -73,6 +73,11 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix
       serviceName: 'STORM',
       type: 'ranger-storm-plugin-properties',
       propertyName: 'ranger-storm-plugin-enabled'
+    },
+    {
+      serviceName: 'YARN',
+      type: 'ranger-yarn-plugin-properties',
+      propertyName: 'ranger-yarn-plugin-enabled'
     }
   ],
 
@@ -95,7 +100,8 @@ App.MainServiceInfoSummaryController = Em.Controller.extend(App.WidgetSectionMix
           var displayName = (stackService) ? stackService.get('displayName') : item.serviceName;
           return $.extend(item, {
             pluginTitle: Em.I18n.t('services.service.summary.ranger.plugin.title').format(displayName),
-            isDisplayed: App.Service.find().someProperty('serviceName', item.serviceName),
+            isDisplayed: App.Service.find().someProperty('serviceName', item.serviceName) &&
+              stackService.get('configTypes').hasOwnProperty(item.type),
             status: Em.I18n.t('services.service.summary.ranger.plugin.loadingStatus')
           });
         }),

+ 27 - 7
ambari-web/test/controllers/main/service/info/summary_test.js

@@ -62,29 +62,49 @@ describe('App.MainServiceInfoSummaryController', function () {
           serviceName: 'HDFS'
         }),
         Em.Object.create({
-          serviceName: 'HIVE'
+          serviceName: 'YARN'
         })
       ]);
       sinon.stub(App.StackService, 'find').returns([
         Em.Object.create({
           serviceName: 'HDFS',
-          displayNName: 'HDFS'
+          displayName: 'HDFS',
+          configTypes: {
+            'ranger-hdfs-plugin-properties': {}
+          }
         }),
         Em.Object.create({
           serviceName: 'HIVE',
-          displayNName: 'Hive'
+          displayName: 'Hive',
+          configTypes: {
+            'ranger-hive-plugin-properties': {}
+          }
         }),
         Em.Object.create({
           serviceName: 'HBASE',
-          displayNName: 'HBase'
+          displayName: 'HBase',
+          configTypes: {
+            'ranger-hbase-plugin-properties': {}
+          }
         }),
         Em.Object.create({
           serviceName: 'KNOX',
-          displayNName: 'Knox'
+          displayName: 'Knox',
+          configTypes: {
+            'ranger-knox-plugin-properties': {}
+          }
         }),
         Em.Object.create({
           serviceName: 'STORM',
-          displayNName: 'Storm'
+          displayName: 'Storm',
+          configTypes: {
+            'ranger-storm-plugin-properties': {}
+          }
+        }),
+        Em.Object.create({
+          serviceName: 'YARN',
+          displayName: 'YARN',
+          configTypes: {}
         })
       ]);
     });
@@ -99,7 +119,7 @@ describe('App.MainServiceInfoSummaryController', function () {
         controller.set('isRangerPluginsArraySet', item.isRangerPluginsArraySet);
         App.set('router.clusterController.isLoaded', item.isLoaded);
         expect(controller.get('isRangerPluginsArraySet')).to.equal(item.expectedIsRangerPluginsArraySet);
-        expect(controller.get('rangerPlugins').filterProperty('isDisplayed').mapProperty('serviceName').sort()).to.eql(['HDFS', 'HIVE']);
+        expect(controller.get('rangerPlugins').filterProperty('isDisplayed').mapProperty('serviceName').sort()).to.eql(['HDFS']);
       });
     });