You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by we...@apache.org on 2024/08/26 15:34:56 UTC
(cloudstack) branch main updated (bc286656796 -> f5efe56fb53)
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from bc286656796 Add support for network data in Config Drive (#9329)
add 1a403f1a9d2 open up extra-config to all users (#9422)
add 0597def630e test: fix component tests test_acl_isolatednetwork and test_acl_isolatednetwork_delete (#9571)
add de3537c98a3 Added domain path to all entities (#9540)
add 22097027410 Fix usage volume size after resizing (#9459)
add 9148701285f [UI] Add project toggle for buckets (#9589)
new f5efe56fb53 Merge remote-tracking branch 'apache/4.19'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../apache/cloudstack/affinity/AffinityGroupResponse.java | 9 +++++++++
.../apache/cloudstack/api/command/user/vm/UpdateVMCmd.java | 2 +-
.../cloudstack/api/command/user/vpn/AddVpnUserCmd.java | 1 +
.../cloudstack/api/response/AcquireIPAddressResponse.java | 9 +++++++++
.../api/response/ApplicationLoadBalancerResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScalePolicyResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScaleVmGroupResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScaleVmProfileResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/BucketResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/ConditionResponse.java | 9 +++++++++
.../cloudstack/api/response/ControlledEntityResponse.java | 2 ++
.../api/response/ControlledViewEntityResponse.java | 2 ++
.../apache/cloudstack/api/response/DomainRouterResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/EventResponse.java | 9 +++++++++
.../cloudstack/api/response/GlobalLoadBalancerResponse.java | 9 +++++++++
.../cloudstack/api/response/GuestVlanRangeResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/GuestVlanResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/IPAddressResponse.java | 8 ++++++++
.../cloudstack/api/response/InstanceGroupResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/LoadBalancerResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/NetworkResponse.java | 1 +
.../apache/cloudstack/api/response/OvsProviderResponse.java | 8 ++++++++
.../cloudstack/api/response/PrivateGatewayResponse.java | 8 ++++++++
.../cloudstack/api/response/ProjectAccountResponse.java | 9 +++++++++
.../cloudstack/api/response/ProjectInvitationResponse.java | 9 +++++++++
.../cloudstack/api/response/RemoteAccessVpnResponse.java | 8 ++++++++
.../cloudstack/api/response/ResourceCountResponse.java | 9 +++++++++
.../cloudstack/api/response/ResourceLimitResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/ResourceTagResponse.java | 9 +++++++++
.../cloudstack/api/response/SecurityGroupResponse.java | 9 +++++++++
.../api/response/Site2SiteCustomerGatewayResponse.java | 9 +++++++++
.../api/response/Site2SiteVpnConnectionResponse.java | 9 +++++++++
.../cloudstack/api/response/Site2SiteVpnGatewayResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/SnapshotResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/StaticRouteResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/TemplateResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/UsageRecordResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/UserDataResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/UserVmResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/VMSnapshotResponse.java | 9 +++++++++
.../api/response/VirtualRouterProviderResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/VlanIpRangeResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/VolumeResponse.java | 9 +++++++++
.../java/org/apache/cloudstack/api/response/VpcResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/VpnUsersResponse.java | 9 +++++++++
.../kubernetes/cluster/KubernetesClusterManagerImpl.java | 1 +
.../cloudstack/api/response/KubernetesClusterResponse.java | 8 ++++++++
.../contrail/api/response/ServiceInstanceResponse.java | 8 ++++++++
server/src/main/java/com/cloud/api/ApiResponseHelper.java | 9 +++++++++
.../com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java | 1 +
.../cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 3 +++
.../main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../main/java/com/cloud/storage/VolumeApiServiceImpl.java | 10 +++++-----
test/integration/component/test_acl_isolatednetwork.py | 12 ++++++------
.../integration/component/test_acl_isolatednetwork_delete.py | 6 +++---
ui/src/views/AutogenView.vue | 2 +-
59 files changed, 402 insertions(+), 16 deletions(-)
(cloudstack) 01/01: Merge remote-tracking branch 'apache/4.19'
Posted by we...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit f5efe56fb5310e4b08d3c6946ce19934062466dc
Merge: bc286656796 9148701285f
Author: Wei Zhou <we...@apache.org>
AuthorDate: Mon Aug 26 17:34:15 2024 +0200
Merge remote-tracking branch 'apache/4.19'
.../apache/cloudstack/affinity/AffinityGroupResponse.java | 9 +++++++++
.../apache/cloudstack/api/command/user/vm/UpdateVMCmd.java | 2 +-
.../cloudstack/api/command/user/vpn/AddVpnUserCmd.java | 1 +
.../cloudstack/api/response/AcquireIPAddressResponse.java | 9 +++++++++
.../api/response/ApplicationLoadBalancerResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScalePolicyResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScaleVmGroupResponse.java | 9 +++++++++
.../cloudstack/api/response/AutoScaleVmProfileResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/BucketResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/ConditionResponse.java | 9 +++++++++
.../cloudstack/api/response/ControlledEntityResponse.java | 2 ++
.../api/response/ControlledViewEntityResponse.java | 2 ++
.../apache/cloudstack/api/response/DomainRouterResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/EventResponse.java | 9 +++++++++
.../cloudstack/api/response/GlobalLoadBalancerResponse.java | 9 +++++++++
.../cloudstack/api/response/GuestVlanRangeResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/GuestVlanResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/IPAddressResponse.java | 8 ++++++++
.../cloudstack/api/response/InstanceGroupResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/LoadBalancerResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/NetworkResponse.java | 1 +
.../apache/cloudstack/api/response/OvsProviderResponse.java | 8 ++++++++
.../cloudstack/api/response/PrivateGatewayResponse.java | 8 ++++++++
.../cloudstack/api/response/ProjectAccountResponse.java | 9 +++++++++
.../cloudstack/api/response/ProjectInvitationResponse.java | 9 +++++++++
.../cloudstack/api/response/RemoteAccessVpnResponse.java | 8 ++++++++
.../cloudstack/api/response/ResourceCountResponse.java | 9 +++++++++
.../cloudstack/api/response/ResourceLimitResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/ResourceTagResponse.java | 9 +++++++++
.../cloudstack/api/response/SecurityGroupResponse.java | 9 +++++++++
.../api/response/Site2SiteCustomerGatewayResponse.java | 9 +++++++++
.../api/response/Site2SiteVpnConnectionResponse.java | 9 +++++++++
.../cloudstack/api/response/Site2SiteVpnGatewayResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/SnapshotResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/StaticRouteResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/TemplateResponse.java | 9 +++++++++
.../apache/cloudstack/api/response/UsageRecordResponse.java | 8 ++++++++
.../org/apache/cloudstack/api/response/UserDataResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/UserVmResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/VMSnapshotResponse.java | 9 +++++++++
.../api/response/VirtualRouterProviderResponse.java | 8 ++++++++
.../apache/cloudstack/api/response/VlanIpRangeResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/VolumeResponse.java | 9 +++++++++
.../java/org/apache/cloudstack/api/response/VpcResponse.java | 9 +++++++++
.../org/apache/cloudstack/api/response/VpnUsersResponse.java | 9 +++++++++
.../kubernetes/cluster/KubernetesClusterManagerImpl.java | 1 +
.../cloudstack/api/response/KubernetesClusterResponse.java | 8 ++++++++
.../contrail/api/response/ServiceInstanceResponse.java | 8 ++++++++
server/src/main/java/com/cloud/api/ApiResponseHelper.java | 9 +++++++++
.../com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/ProjectAccountJoinDaoImpl.java | 1 +
.../cloud/api/query/dao/ProjectInvitationJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/dao/ResourceTagJoinDaoImpl.java | 1 +
.../java/com/cloud/api/query/dao/TemplateJoinDaoImpl.java | 3 +++
.../main/java/com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 1 +
.../main/java/com/cloud/storage/VolumeApiServiceImpl.java | 10 +++++-----
test/integration/component/test_acl_isolatednetwork.py | 12 ++++++------
.../integration/component/test_acl_isolatednetwork_delete.py | 6 +++---
ui/src/views/AutogenView.vue | 2 +-
59 files changed, 402 insertions(+), 16 deletions(-)
diff --cc server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
index 73a7f7ab546,e6092223f01..e653836b729
--- a/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
+++ b/server/src/main/java/com/cloud/storage/VolumeApiServiceImpl.java
@@@ -1391,10 -1431,9 +1391,10 @@@ public class VolumeApiServiceImpl exten
private VolumeVO orchestrateResizeVolume(long volumeId, long currentSize, long newSize, Long newMinIops, Long newMaxIops, Integer newHypervisorSnapshotReserve, Long newDiskOfferingId,
boolean shrinkOk) {
- final VolumeVO volume = _volsDao.findById(volumeId);
+ VolumeVO volume = _volsDao.findById(volumeId);
UserVmVO userVm = _userVmDao.findById(volume.getInstanceId());
StoragePoolVO storagePool = _storagePoolDao.findById(volume.getPoolId());
+ Long currentDiskOfferingId = volume.getDiskOfferingId();
boolean isManaged = storagePool.isManaged();
if (!storageMgr.storagePoolHasEnoughSpaceForResize(storagePool, currentSize, newSize)) {
diff --cc ui/src/views/AutogenView.vue
index b0ffdb242ce,2b0eccf08d4..13bb35cbf1e
--- a/ui/src/views/AutogenView.vue
+++ b/ui/src/views/AutogenView.vue
@@@ -799,9 -799,9 +799,9 @@@ export default
}
this.projectView = Boolean(store.getters.project && store.getters.project.id)
- this.hasProjectId = ['vm', 'vmgroup', 'ssh', 'affinitygroup', 'userdata', 'volume', 'snapshot', 'vmsnapshot', 'guestnetwork',
+ this.hasProjectId = ['vm', 'vmgroup', 'ssh', 'affinitygroup', 'userdata', 'volume', 'snapshot', 'buckets', 'vmsnapshot', 'guestnetwork',
'vpc', 'securitygroups', 'publicip', 'vpncustomergateway', 'template', 'iso', 'event', 'kubernetes',
- 'autoscalevmgroup', 'vnfapp'].includes(this.$route.name)
+ 'autoscalevmgroup', 'vnfapp', 'webhook'].includes(this.$route.name)
if ((this.$route && this.$route.params && this.$route.params.id) || this.$route.query.dataView) {
this.dataView = true