ambari-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From yus...@apache.org
Subject [1/2] AMBARI-4789. FE changes to match API rename for Maintenance Mode. (atkach via yusaku)
Date Mon, 24 Feb 2014 19:23:55 GMT
Repository: ambari
Updated Branches:
  refs/heads/trunk e1f4f2e8b -> 40fca9c83


http://git-wip-us.apache.org/repos/asf/ambari/blob/40fca9c8/ambari-web/test/views/main/host/details/host_component_view_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/details/host_component_view_test.js b/ambari-web/test/views/main/host/details/host_component_view_test.js
index 394133e..3d7fcb9 100644
--- a/ambari-web/test/views/main/host/details/host_component_view_test.js
+++ b/ambari-web/test/views/main/host/details/host_component_view_test.js
@@ -36,8 +36,8 @@ describe('App.HostComponentView', function() {
 
     var tests = Em.A([
       {
-        content: Em.Object.create({componentTextStatus: 'status', passiveState: 'PASSIVE'}),
-        m: 'PASSIVE state',
+        content: Em.Object.create({componentTextStatus: 'status', passiveState: 'ON'}),
+        m: 'ON state',
         e: Em.I18n.t('hosts.component.passive.short.mode')
       },
       {
@@ -46,8 +46,8 @@ describe('App.HostComponentView', function() {
         e: Em.I18n.t('hosts.component.passive.short.mode')
       },
       {
-        content: Em.Object.create({componentTextStatus: 'status', passiveState: 'ACTIVE'}),
-        m: 'ACTIVE state',
+        content: Em.Object.create({componentTextStatus: 'status', passiveState: 'OFF'}),
+        m: 'OFF state',
         e: 'status'
       }
     ]);
@@ -65,21 +65,21 @@ describe('App.HostComponentView', function() {
 
     var tests = Em.A([
       {
-        content: {service: {passiveState: 'PASSIVE'}},
-        parentView: {content: {passiveState: 'PASSIVE'}},
-        m: 'service in PASSIVE, host in PASSIVE',
+        content: {service: {passiveState: 'ON'}},
+        parentView: {content: {passiveState: 'ON'}},
+        m: 'service in ON, host in ON',
         e: Em.I18n.t('hosts.component.passive.implied.host.mode.tooltip')
       },
       {
-        content: {service: {passiveState: 'PASSIVE', serviceName:'SERVICE_NAME'}},
-        parentView: {content: {passiveState: 'ACTIVE'}},
-        m: 'service in PASSIVE, host in ACTIVE',
+        content: {service: {passiveState: 'ON', serviceName:'SERVICE_NAME'}},
+        parentView: {content: {passiveState: 'OFF'}},
+        m: 'service in ON, host in OFF',
         e: Em.I18n.t('hosts.component.passive.implied.service.mode.tooltip').format('SERVICE_NAME')
       },
       {
-        content: {service: {passiveState: 'ACTIVE'}},
-        parentView: {content: {passiveState: 'ACTIVE'}},
-        m: 'service in ACTIVE, host in ACTIVE',
+        content: {service: {passiveState: 'OFF'}},
+        parentView: {content: {passiveState: 'OFF'}},
+        m: 'service in OFF, host in OFF',
         e: ''
       }
     ]);
@@ -226,8 +226,8 @@ describe('App.HostComponentView', function() {
   describe('#isActive', function() {
 
     var tests = Em.A([
-      {passiveState: 'ACTIVE', e: true},
-      {passiveState: 'PASSIVE', e: false},
+      {passiveState: 'OFF', e: true},
+      {passiveState: 'ON', e: false},
       {passiveState: 'IMPLIED', e: false}
     ]);
 
@@ -244,27 +244,27 @@ describe('App.HostComponentView', function() {
 
     var tests = Em.A([
       {
-        content: {service: {passiveState: 'PASSIVE'}},
-        parentView: {content: {passiveState: 'PASSIVE'}},
-        m: 'service in PASSIVE, host in PASSIVE',
+        content: {service: {passiveState: 'ON'}},
+        parentView: {content: {passiveState: 'ON'}},
+        m: 'service in ON, host in ON',
         e: true
       },
       {
-        content: {service: {passiveState: 'PASSIVE', serviceName:'SERVICE_NAME'}},
-        parentView: {content: {passiveState: 'ACTIVE'}},
-        m: 'service in PASSIVE, host in ACTIVE',
+        content: {service: {passiveState: 'ON', serviceName:'SERVICE_NAME'}},
+        parentView: {content: {passiveState: 'OFF'}},
+        m: 'service in ON, host in OFF',
         e: true
       },
       {
-        content: {service: {passiveState: 'ACTIVE', serviceName:'SERVICE_NAME'}},
-        parentView: {content: {passiveState: 'PASSIVE'}},
-        m: 'service in ACTIVE, host in PASSIVE',
+        content: {service: {passiveState: 'OFF', serviceName:'SERVICE_NAME'}},
+        parentView: {content: {passiveState: 'ON'}},
+        m: 'service in OFF, host in ON',
         e: true
       },
       {
-        content: {service: {passiveState: 'ACTIVE'}},
-        parentView: {content: {passiveState: 'ACTIVE'}},
-        m: 'service in ACTIVE, host in ACTIVE',
+        content: {service: {passiveState: 'OFF'}},
+        parentView: {content: {passiveState: 'OFF'}},
+        m: 'service in OFF, host in OFF',
         e: false
       }
     ]);
@@ -386,15 +386,15 @@ describe('App.HostComponentView', function() {
 
     var tests = Em.A([
       {
-        content: Em.Object.create({workStatus: App.HostComponentStatus.install_failed,passiveState:
'ACTIVE'}),
+        content: Em.Object.create({workStatus: App.HostComponentStatus.install_failed,passiveState:
'OFF'}),
         e: 'health-status-color-red icon-cog'
       },
       {
-        content: Em.Object.create({workStatus: App.HostComponentStatus.installing, passiveState:
'ACTIVE'}),
+        content: Em.Object.create({workStatus: App.HostComponentStatus.installing, passiveState:
'OFF'}),
         e: 'health-status-color-blue icon-cog'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'PASSIVE'}),
+        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'ON'}),
         e: 'icon-medkit'
       },
       {
@@ -402,7 +402,7 @@ describe('App.HostComponentView', function() {
         e: 'icon-medkit'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'ACTIVE'}),
+        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'OFF'}),
         e: 'health-status-started'
       }
     ]);

http://git-wip-us.apache.org/repos/asf/ambari/blob/40fca9c8/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
----------------------------------------------------------------------
diff --git a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
index edbe8ca..17adb70 100644
--- a/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
+++ b/ambari-web/test/views/main/host/details/host_component_views/decommissionable_test.js
@@ -99,17 +99,17 @@ describe('App.Decommissionable', function() {
 
     var tests = Em.A([
       {
-        content: Em.Object.create({workStatus: App.HostComponentStatus.install_failed,passiveState:
'ACTIVE'}),
+        content: Em.Object.create({workStatus: App.HostComponentStatus.install_failed,passiveState:
'OFF'}),
         isComponentRecommissionAvailable: false,
         e: 'health-status-color-red icon-cog'
       },
       {
-        content: Em.Object.create({workStatus: App.HostComponentStatus.installing, passiveState:
'ACTIVE'}),
+        content: Em.Object.create({workStatus: App.HostComponentStatus.installing, passiveState:
'OFF'}),
         isComponentRecommissionAvailable: false,
         e: 'health-status-color-blue icon-cog'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'PASSIVE'}),
+        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'ON'}),
         isComponentRecommissionAvailable: false,
         e: 'icon-medkit'
       },
@@ -119,22 +119,22 @@ describe('App.Decommissionable', function() {
         e: 'icon-medkit'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'ACTIVE'}),
+        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'OFF'}),
         isComponentRecommissionAvailable: false,
         e: 'health-status-started'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'ACTIVE'}),
+        content: Em.Object.create({workStatus: 'STARTED', passiveState: 'OFF'}),
         isComponentRecommissionAvailable: true,
         e: 'health-status-DEAD-ORANGE'
       },
       {
-        content: Em.Object.create({workStatus: 'STARTING', passiveState: 'ACTIVE'}),
+        content: Em.Object.create({workStatus: 'STARTING', passiveState: 'OFF'}),
         isComponentRecommissionAvailable: true,
         e: 'health-status-DEAD-ORANGE'
       },
       {
-        content: Em.Object.create({workStatus: 'INSTALLED', passiveState: 'ACTIVE'}),
+        content: Em.Object.create({workStatus: 'INSTALLED', passiveState: 'OFF'}),
         isComponentRecommissionAvailable: true,
         e: 'health-status-DEAD-ORANGE'
       }


Mime
View raw message