apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 10:32:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '4.20' into 4.22

Browse Source
This commit is contained in:
Suresh Kumar Anaparti 2025-11-06 14:37:38 +05:30
commit 5504b053e4
No known key found for this signature in database
GPG Key ID: D7CEAE3A9E71D0AA
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/UpdateStoragePoolCmd.java
View File

@ -153,6 +153,8 @@ public class UpdateStoragePoolCmd extends BaseCmd {
if (ObjectUtils.anyNotNull(name, capacityIops, capacityBytes, url, isTagARule, tags) || if (ObjectUtils.anyNotNull(name, capacityIops, capacityBytes, url, isTagARule, tags) ||
MapUtils.isNotEmpty(details)) { MapUtils.isNotEmpty(details)) {
result = _storageService.updateStoragePool(this); result = _storageService.updateStoragePool(this);
} else {
result = _storageService.getStoragePool(getId());
} }
if (enabled != null) { if (enabled != null) {

5
test/integration/smoke/test_direct_download.py
View File

@ -251,7 +251,10 @@ class TestDirectDownloadTemplates(cloudstackTestCase):
self.apiclient, self.apiclient,
id=poolId id=poolId
) )
return local_pool[0].tags if local_pool[0].tags:
return local_pool[0].tags
else:
return ""
def updateStoragePoolTags(self, poolId, tags): def updateStoragePoolTags(self, poolId, tags):
StoragePool.update( StoragePool.update(

13
ui/src/views/compute/DeployVM.vue
View File

@ -1232,6 +1232,7 @@ export default {
return _.map(this.affinityGroups, 'id') return _.map(this.affinityGroups, 'id')
}, },
params () { params () {
const listAll = isAdmin()
return { return {
serviceOfferings: { serviceOfferings: {
list: 'listServiceOfferings', list: 'listServiceOfferings',
@ -1279,7 +1280,7 @@ export default {
domainid: this.owner.domainid, domainid: this.owner.domainid,
projectid: this.owner.projectid, projectid: this.owner.projectid,
keyword: undefined, keyword: undefined,
listall: false listall: listAll
} }
}, },
sshKeyPairs: { sshKeyPairs: {
@ -1287,8 +1288,11 @@ export default {
options: { options: {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
account: this.owner.account,
domainid: this.owner.domainid,
projectid: this.owner.projectid,
keyword: undefined, keyword: undefined,
listall: false listall: listAll
} }
}, },
userDatas: { userDatas: {
@ -1296,8 +1300,11 @@ export default {
options: { options: {
page: 1, page: 1,
pageSize: 10, pageSize: 10,
account: this.owner.account,
domainid: this.owner.domainid,
projectid: this.owner.projectid,
keyword: undefined, keyword: undefined,
listall: false listall: listAll
} }
}, },
networks: { networks: {