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

Merge remote-tracking branch 'apache/4.20'

Browse Source
This commit is contained in:
Wei Zhou 2025-09-02 08:24:37 +02:00
commit abe41add86
No known key found for this signature in database
GPG Key ID: 1503DFE7C8226103
2 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
test/integration/smoke/test_vpc_redundant.py
View File

@ -612,10 +612,13 @@ class TestVPCRedundancy(cloudstackTestCase):
time.sleep(total_sleep) time.sleep(total_sleep)
# Router will be in FAULT state, i.e. keepalived is stopped # Router will be in UNKNOWN state, i.e. keepalived is stopped
self.check_routers_state(status_to_check="FAULT", expected_count=2) self.check_routers_state(status_to_check="UNKNOWN", expected_count=2)
self.start_vm() self.start_vm()
# Routers will be in PRIMARY/BACKUP state
self.check_routers_state(status_to_check="PRIMARY") self.check_routers_state(status_to_check="PRIMARY")
self.check_routers_state(status_to_check="BACKUP")
@attr(tags=["advanced", "intervlan"], required_hardware="true") @attr(tags=["advanced", "intervlan"], required_hardware="true")
def test_05_rvpc_multi_tiers(self): def test_05_rvpc_multi_tiers(self):

21
ui/src/config/section/offering.js
View File

@ -128,7 +128,7 @@ export default {
show: (record) => { return record.state !== 'Active' }, show: (record) => { return record.state !== 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) } groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) }
}, { }, {
api: 'deleteServiceOffering', api: 'updateServiceOffering',
icon: 'pause-circle-outlined', icon: 'pause-circle-outlined',
label: 'label.action.disable.service.offering', label: 'label.action.disable.service.offering',
message: 'message.action.disable.service.offering', message: 'message.action.disable.service.offering',
@ -136,6 +136,11 @@ export default {
dataView: true, dataView: true,
groupAction: true, groupAction: true,
popup: true, popup: true,
mapping: {
state: {
value: (record) => { return 'Inactive' }
}
},
show: (record) => { return record.state === 'Active' }, show: (record) => { return record.state === 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x } }) } groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
}] }]
@ -204,7 +209,7 @@ export default {
show: (record) => { return record.state !== 'Active' }, show: (record) => { return record.state !== 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) } groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) }
}, { }, {
api: 'deleteServiceOffering', api: 'updateServiceOffering',
icon: 'pause-circle-outlined', icon: 'pause-circle-outlined',
label: 'label.action.disable.system.service.offering', label: 'label.action.disable.system.service.offering',
message: 'message.action.disable.system.service.offering', message: 'message.action.disable.system.service.offering',
@ -213,6 +218,11 @@ export default {
params: { issystem: 'true' }, params: { issystem: 'true' },
groupAction: true, groupAction: true,
popup: true, popup: true,
mapping: {
state: {
value: (record) => { return 'Inactive' }
}
},
show: (record) => { return record.state === 'Active' }, show: (record) => { return record.state === 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x } }) } groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
}] }]
@ -307,7 +317,7 @@ export default {
show: (record) => { return record.state !== 'Active' }, show: (record) => { return record.state !== 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) } groupMap: (selection) => { return selection.map(x => { return { id: x, state: 'Active' } }) }
}, { }, {
api: 'deleteDiskOffering', api: 'updateDiskOffering',
icon: 'pause-circle-outlined', icon: 'pause-circle-outlined',
label: 'label.action.disable.disk.offering', label: 'label.action.disable.disk.offering',
message: 'message.action.disable.disk.offering', message: 'message.action.disable.disk.offering',
@ -315,6 +325,11 @@ export default {
dataView: true, dataView: true,
groupAction: true, groupAction: true,
popup: true, popup: true,
mapping: {
state: {
value: (record) => { return 'Inactive' }
}
},
show: (record) => { return record.state === 'Active' }, show: (record) => { return record.state === 'Active' },
groupMap: (selection) => { return selection.map(x => { return { id: x } }) } groupMap: (selection) => { return selection.map(x => { return { id: x } }) }
}] }]