You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2024/03/08 07:21:09 UTC
(cloudstack) branch 4.19 updated (b82ea3de2d2 -> d99b1b9c2d0)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from b82ea3de2d2 Update pre-populated quota tariffs' unit types (#8591)
add 0b080cfd820 [UI] Allow detach ISO from instance toolbar when ISO is attached (#8716)
add 986d754768d SG: fix SQL exception when add security group rule with allowed account/group (#8616)
add 223a9b8031c Quota tariff events (#8030)
new d99b1b9c2d0 Merge branch '4.18' into 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:
api/src/main/java/com/cloud/event/EventTypes.java | 11 +++++++++++
.../apache/cloudstack/api/ApiCommandResourceType.java | 1 +
.../java/org/apache/cloudstack/quota/QuotaTariff.java | 10 +++++-----
.../security/dao/SecurityGroupVMMapDaoImpl.java | 2 +-
.../main/java/com/cloud/utils/db/GenericDaoBase.java | 4 ++--
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 10 ++++++++++
.../org/apache/cloudstack/quota/vo/QuotaTariffVO.java | 5 +++--
.../cloudstack/api/command/QuotaTariffCreateCmd.java | 7 +++++++
.../cloudstack/api/command/QuotaTariffDeleteCmd.java | 7 +++++++
.../cloudstack/api/command/QuotaTariffUpdateCmd.java | 7 +++++++
.../api/response/QuotaResponseBuilderImpl.java | 18 +++++++++++++++++-
ui/src/components/view/SearchView.vue | 3 ++-
ui/src/components/widgets/ResourceLabel.vue | 4 ++--
ui/src/config/section/compute.js | 4 ++--
ui/src/utils/plugins.js | 1 +
15 files changed, 78 insertions(+), 16 deletions(-)
copy plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImgException.java => api/src/main/java/org/apache/cloudstack/quota/QuotaTariff.java (80%)
(cloudstack) 01/01: Merge branch '4.18' into 4.19
Posted by da...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit d99b1b9c2d0174b80c6597b33bb3a601885acd1e
Merge: b82ea3de2d2 223a9b8031c
Author: Daan Hoogland <da...@onecht.net>
AuthorDate: Fri Mar 8 08:19:49 2024 +0100
Merge branch '4.18' into 4.19
api/src/main/java/com/cloud/event/EventTypes.java | 11 ++++++++++
.../cloudstack/api/ApiCommandResourceType.java | 1 +
.../org/apache/cloudstack/quota/QuotaTariff.java | 25 ++++++++++++++++++++++
.../security/dao/SecurityGroupVMMapDaoImpl.java | 2 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 ++--
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 10 +++++++++
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 5 +++--
.../api/command/QuotaTariffCreateCmd.java | 7 ++++++
.../api/command/QuotaTariffDeleteCmd.java | 7 ++++++
.../api/command/QuotaTariffUpdateCmd.java | 7 ++++++
.../api/response/QuotaResponseBuilderImpl.java | 18 +++++++++++++++-
ui/src/components/view/SearchView.vue | 3 ++-
ui/src/components/widgets/ResourceLabel.vue | 4 ++--
ui/src/config/section/compute.js | 4 ++--
ui/src/utils/plugins.js | 1 +
15 files changed, 98 insertions(+), 11 deletions(-)
diff --cc api/src/main/java/com/cloud/event/EventTypes.java
index c4833d3433a,f579fdb23f1..d385fa9ed07
--- a/api/src/main/java/com/cloud/event/EventTypes.java
+++ b/api/src/main/java/com/cloud/event/EventTypes.java
@@@ -29,10 -29,8 +29,11 @@@ import org.apache.cloudstack.api.respon
import org.apache.cloudstack.api.response.ZoneResponse;
import org.apache.cloudstack.config.Configuration;
import org.apache.cloudstack.ha.HAConfig;
+import org.apache.cloudstack.storage.object.Bucket;
+import org.apache.cloudstack.storage.object.ObjectStore;
+ import org.apache.cloudstack.quota.QuotaTariff;
import org.apache.cloudstack.usage.Usage;
+import org.apache.cloudstack.vm.schedule.VMSchedule;
import com.cloud.dc.DataCenter;
import com.cloud.dc.DataCenterGuestIpv6Prefix;
@@@ -719,16 -694,11 +720,21 @@@ public class EventTypes
// SystemVM
public static final String EVENT_LIVE_PATCH_SYSTEMVM = "LIVE.PATCH.SYSTEM.VM";
+ // OBJECT STORE
+ public static final String EVENT_OBJECT_STORE_CREATE = "OBJECT.STORE.CREATE";
+ public static final String EVENT_OBJECT_STORE_DELETE = "OBJECT.STORE.DELETE";
+ public static final String EVENT_OBJECT_STORE_UPDATE = "OBJECT.STORE.UPDATE";
+
+ // BUCKETS
+ public static final String EVENT_BUCKET_CREATE = "BUCKET.CREATE";
+ public static final String EVENT_BUCKET_DELETE = "BUCKET.DELETE";
+ public static final String EVENT_BUCKET_UPDATE = "BUCKET.UPDATE";
+
+ // Quota
+ public static final String EVENT_QUOTA_TARIFF_CREATE = "QUOTA.TARIFF.CREATE";
+ public static final String EVENT_QUOTA_TARIFF_DELETE = "QUOTA.TARIFF.DELETE";
+ public static final String EVENT_QUOTA_TARIFF_UPDATE = "QUOTA.TARIFF.UPDATE";
+
static {
// TODO: need a way to force author adding event types to declare the entity details as well, with out braking
@@@ -1165,19 -1123,12 +1171,24 @@@
entityEventDetails.put(EVENT_IMPORT_VCENTER_STORAGE_POLICIES, "StoragePolicies");
entityEventDetails.put(EVENT_IMAGE_STORE_DATA_MIGRATE, ImageStore.class);
+ entityEventDetails.put(EVENT_IMAGE_STORE_OBJECT_DOWNLOAD, ImageStore.class);
+ entityEventDetails.put(EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE, ImageStore.class);
entityEventDetails.put(EVENT_LIVE_PATCH_SYSTEMVM, "SystemVMs");
+ //Object Store
+ entityEventDetails.put(EVENT_OBJECT_STORE_CREATE, ObjectStore.class);
+ entityEventDetails.put(EVENT_OBJECT_STORE_UPDATE, ObjectStore.class);
+ entityEventDetails.put(EVENT_OBJECT_STORE_DELETE, ObjectStore.class);
+
+ //Buckets
+ entityEventDetails.put(EVENT_BUCKET_CREATE, Bucket.class);
+ entityEventDetails.put(EVENT_BUCKET_UPDATE, Bucket.class);
+ entityEventDetails.put(EVENT_BUCKET_DELETE, Bucket.class);
++
+ // Quota
+ entityEventDetails.put(EVENT_QUOTA_TARIFF_CREATE, QuotaTariff.class);
+ entityEventDetails.put(EVENT_QUOTA_TARIFF_DELETE, QuotaTariff.class);
+ entityEventDetails.put(EVENT_QUOTA_TARIFF_UPDATE, QuotaTariff.class);
}
public static String getEntityForEvent(String eventName) {
diff --cc api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
index affceb4e3f9,1549167bc39..1f2363583b0
--- a/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
+++ b/api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
@@@ -78,9 -78,7 +78,10 @@@ public enum ApiCommandResourceType
VmSnapshot(com.cloud.vm.snapshot.VMSnapshot.class),
Role(org.apache.cloudstack.acl.Role.class),
VpnCustomerGateway(com.cloud.network.Site2SiteCustomerGateway.class),
+ ManagementServer(org.apache.cloudstack.management.ManagementServerHost.class),
+ ObjectStore(org.apache.cloudstack.storage.object.ObjectStore.class),
+ Bucket(org.apache.cloudstack.storage.object.Bucket.class);
+ QuotaTariff(org.apache.cloudstack.quota.QuotaTariff.class);
private final Class<?> clazz;
diff --cc ui/src/config/section/compute.js
index f189b48d56f,9bf8c949144..f1b3e1b2c99
--- a/ui/src/config/section/compute.js
+++ b/ui/src/config/section/compute.js
@@@ -31,11 -32,10 +31,11 @@@ export default
permission: ['listVirtualMachinesMetrics'],
resourceType: 'UserVm',
params: () => {
- var params = { details: 'servoff,tmpl,nics,backoff' }
+ var params = { details: 'servoff,tmpl,iso,nics,backoff' }
if (store.getters.metrics) {
- params = { details: 'servoff,tmpl,nics,backoff,stats' }
+ params = { details: 'servoff,tmpl,iso,nics,backoff,stats' }
}
+ params.isvnf = false
return params
},
filters: () => {