apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

infra: Fix enable/disable conditions for HA, OOBM across zone, cluster, host (#421)

Browse Source 
Fixes #394

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
davidjumani 2020-06-17 09:28:27 +00:00 committed by Rohit Yadav
parent 35c7bcee1a
commit eaebedf264
3 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ui/src/config/section/infra/clusters.js
View File

@ -86,7 +86,7 @@ export default {
message: 'label.outofbandmanagement.enable',
dataView: true,
show: (record) => {
return !record.resourcedetails || !record.resourcedetails.outOfBandManagementEnabled ||
return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'false'
},
args: ['clusterid'],
@ -103,8 +103,8 @@ export default {
message: 'label.outofbandmanagement.disable',
dataView: true,
show: (record) => {
return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'true'
return !(record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'false')
},
args: ['clusterid'],
mapping: {
@ -120,7 +120,7 @@ export default {
message: 'label.ha.enable',
dataView: true,
show: (record) => {
return !record.resourcedetails || !record.resourcedetails.resourceHAEnabled ||
return record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'false'
},
args: ['clusterid'],
@ -137,8 +137,8 @@ export default {
message: 'label.ha.disable',
dataView: true,
show: (record) => {
return record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'true'
return !(record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'false')
},
args: ['clusterid'],
mapping: {

9
ui/src/config/section/infra/hosts.js
View File

@ -133,8 +133,8 @@ export default {
message: 'label.outofbandmanagement.enable',
dataView: true,
show: (record) => {
return !record.outofbandmanagement || !record.outofbandmanagement.enabled ||
record.outofbandmanagement.enabled === false
return !(record.outofbandmanagement && record.outofbandmanagement.enabled &&
record.outofbandmanagement.enabled === true)
},
args: ['hostid'],
mapping: {
@ -168,7 +168,7 @@ export default {
dataView: true,
show: (record) => {
return record.outofbandmanagement && record.outofbandmanagement.enabled &&
record.outofbandmanagement.enabled === true
record.outofbandmanagement.enabled === true
},
args: ['hostid', 'action'],
mapping: {
@ -217,7 +217,8 @@ export default {
message: 'label.ha.enable',
dataView: true,
show: (record) => {
return !record.hostha || !record.hostha.haenable || record.hostha.haenable === false
return !(record.hostha && record.hostha.haenable &&
record.hostha.haenable === true)
},
args: ['hostid'],
mapping: {

12
ui/src/config/section/infra/zones.js
View File

@ -109,7 +109,7 @@ export default {
message: 'label.outofbandmanagement.enable',
dataView: true,
show: (record) => {
return !record.resourcedetails || !record.resourcedetails.outOfBandManagementEnabled ||
return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'false'
},
args: ['zoneid'],
@ -126,8 +126,8 @@ export default {
message: 'label.outofbandmanagement.disable',
dataView: true,
show: (record) => {
return record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'true'
return !(record.resourcedetails && record.resourcedetails.outOfBandManagementEnabled &&
record.resourcedetails.outOfBandManagementEnabled === 'false')
},
args: ['zoneid'],
mapping: {
@ -143,7 +143,7 @@ export default {
message: 'label.ha.enable',
dataView: true,
show: (record) => {
return !record.resourcedetails || !record.resourcedetails.resourceHAEnabled ||
return record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'false'
},
args: ['zoneid'],
@ -160,8 +160,8 @@ export default {
message: 'label.ha.disable',
dataView: true,
show: (record) => {
return record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'true'
return !(record.resourcedetails && record.resourcedetails.resourceHAEnabled &&
record.resourcedetails.resourceHAEnabled === 'false')
},
args: ['zoneid'],
mapping: {