This is an automated email from the ASF dual-hosted git repository. pearl11594 pushed a commit to branch fix-ss-access-status in repository https://gitbox.apache.org/repos/asf/cloudstack.git
commit 3551598c5f393516dcb257666d270080c6a44d27 Author: Pearl Dsilva <[email protected]> AuthorDate: Mon Jan 8 13:38:13 2024 -0500 Image Store: View Access status of the image store and view events --- api/src/main/java/com/cloud/event/EventTypes.java | 2 ++ server/src/main/java/com/cloud/storage/StorageManagerImpl.java | 2 ++ ui/src/components/view/ListView.vue | 2 +- ui/src/config/section/infra/secondaryStorages.js | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/src/main/java/com/cloud/event/EventTypes.java b/api/src/main/java/com/cloud/event/EventTypes.java index 67fed5500ee..5d525229095 100644 --- a/api/src/main/java/com/cloud/event/EventTypes.java +++ b/api/src/main/java/com/cloud/event/EventTypes.java @@ -400,6 +400,7 @@ public class EventTypes { public static final String EVENT_IMAGE_STORE_DATA_MIGRATE = "IMAGE.STORE.MIGRATE.DATA"; public static final String EVENT_IMAGE_STORE_RESOURCES_MIGRATE = "IMAGE.STORE.MIGRATE.RESOURCES"; public static final String EVENT_IMAGE_STORE_OBJECT_DOWNLOAD = "IMAGE.STORE.OBJECT.DOWNLOAD"; + public static final String EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE = "IMAGE.STORE.ACCESS.UPDATED"; // Configuration Table public static final String EVENT_CONFIGURATION_VALUE_EDIT = "CONFIGURATION.VALUE.EDIT"; @@ -1164,6 +1165,7 @@ public class EventTypes { 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 diff --git a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java index 04889d0b2a8..615c7b6760e 100644 --- a/server/src/main/java/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/main/java/com/cloud/storage/StorageManagerImpl.java @@ -3261,6 +3261,8 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } @Override + @ActionEvent(eventType = EventTypes.EVENT_UPDATE_IMAGE_STORE_ACCESS_STATE, + eventDescription = "image store access updated") public ImageStore updateImageStoreStatus(Long id, Boolean readonly) { // Input validation ImageStoreVO imageStoreVO = _imageStoreDao.findById(id); diff --git a/ui/src/components/view/ListView.vue b/ui/src/components/view/ListView.vue index a61f1930f71..093e7d663a0 100644 --- a/ui/src/components/view/ListView.vue +++ b/ui/src/components/view/ListView.vue @@ -340,7 +340,7 @@ <template v-if="column.key === 'softwareversion'"> <span> {{ record.softwareversion ? record.softwareversion : 'N/A' }} </span> </template> - <template v-if="column.key === 'access'"> + <template v-if="column.key === 'readonly'"> <status :text="record.readonly ? 'ReadOnly' : 'ReadWrite'" displayText /> </template> <template v-if="column.key === 'requiresupgrade'"> diff --git a/ui/src/config/section/infra/secondaryStorages.js b/ui/src/config/section/infra/secondaryStorages.js index 774c233c446..cc580d4d79b 100644 --- a/ui/src/config/section/infra/secondaryStorages.js +++ b/ui/src/config/section/infra/secondaryStorages.js @@ -27,6 +27,7 @@ export default { columns: () => { var fields = ['name', 'url', 'protocol', 'scope', 'zonename'] if (store.getters.apis.listImageStores.params.filter(x => x.name === 'readonly').length > 0) { + // fields.push('readonly') fields.push({ field: 'readonly', customTitle: 'access'
