From 18c3d470c6c2896c4334234ecb8e9ddda03f44a0 Mon Sep 17 00:00:00 2001
From: Wei Zhou <weizhou@apache.org>
Date: Mon, 26 Feb 2024 14:21:26 +0100
Subject: [PATCH 1/5] CKS: fix /opt/bin/deploy-cloudstack-secret in CKS control
 nodes (#8697)

---
 .../src/main/resources/script/deploy-cloudstack-secret        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret b/plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret
index 9ffd3ecc84a..f4536feca36 100755
--- a/plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret
+++ b/plugins/integrations/kubernetes-service/src/main/resources/script/deploy-cloudstack-secret
@@ -21,14 +21,14 @@ function usage() {
 Usage: ./deploy-cloudstack-secret [OPTIONS]...
 To deploy the keys needed for the cloudstack kubernetes provider.
 Arguments:
-  -u, --url string         ID of the cluster
+  -u, --url string         URL of the CloudStack API
   -k, --key string         API Key
   -s, --secret string      Secret Key
   -p, --project string     Project ID
 Other arguments:
   -h, --help              Display this help message and exit
 Examples:
-  ./deploy-cloudstack-secret -u http://localhost:8080 -k abcd -s efgh
+  ./deploy-cloudstack-secret -u http://10.10.10.10:8080/client/api -k abcd -s efgh
 USAGE
     exit 0
 }

From e545259bd36da42385f9cf3e046178ca53a1f296 Mon Sep 17 00:00:00 2001
From: Harshit Soni <42745435+Harshitsoni2000@users.noreply.github.com>
Date: Mon, 26 Feb 2024 18:57:54 +0530
Subject: [PATCH 2/5] Added JS Script to pick Favicon, Title from config file
 (#7418)

---
 ui/public/config.json |  2 ++
 ui/public/index.html  | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ui/public/config.json b/ui/public/config.json
index ed64b15423b..57d120aed5e 100644
--- a/ui/public/config.json
+++ b/ui/public/config.json
@@ -14,6 +14,8 @@
   "logo": "assets/logo.svg",
   "minilogo": "assets/mini-logo.svg",
   "banner": "assets/banner.svg",
+  "loginPageTitle": "CloudStack",
+  "loginPageFavicon": "assets/logo.svg",
   "error": {
     "403": "assets/403.png",
     "404": "assets/404.png",
diff --git a/ui/public/index.html b/ui/public/index.html
index 54ec6da25d1..1a09e46a4e0 100644
--- a/ui/public/index.html
+++ b/ui/public/index.html
@@ -22,8 +22,8 @@
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <meta name="viewport" content="width=device-width,initial-scale=1.0">
-    <link rel="icon" href="<%= BASE_URL %>cloud.ico">
-    <title>Apache CloudStack</title>
+    <link id="favicon" rel="icon" href="<%= BASE_URL %>cloud.ico">
+    <title id="title" >Apache CloudStack</title>
     <style>
       .loader {
         border: 16px solid #F3F3F3;
@@ -54,4 +54,12 @@
       <div class="loader"></div>
     </div>
   </body>
+  <script type="text/javascript">
+    fetch('./config.json')
+      .then(response => response.json())
+      .then(data => {
+        document.getElementById("favicon").setAttribute("href", data.loginPageFavicon);
+        document.getElementById("title").innerHTML = data.loginPageTitle;
+      }).catch((err) => {});
+  </script>
 </html>

From 08dc1bbcd4ba4923ee43360155d23b6645ce6a37 Mon Sep 17 00:00:00 2001
From: Vishesh <vishesh92@gmail.com>
Date: Mon, 26 Feb 2024 19:10:01 +0530
Subject: [PATCH 3/5] UI: cleanup arrangement of instance schedule modal dialog
 (#8620)

* polish modal for instance schedule

* fixup
---
 ui/public/locales/en.json                  |   1 +
 ui/src/views/compute/InstanceSchedules.vue | 247 ++++++++++++++-------
 2 files changed, 162 insertions(+), 86 deletions(-)

diff --git a/ui/public/locales/en.json b/ui/public/locales/en.json
index 39e12a9517e..05850327d6a 100644
--- a/ui/public/locales/en.json
+++ b/ui/public/locales/en.json
@@ -579,6 +579,7 @@
 "label.creating.iprange": "Creating IP ranges",
 "label.credit": "Credit",
 "label.cron": "Cron expression",
+"label.cron.mode": "Cron mode",
 "label.crosszones": "Cross zones",
 "label.currency": "Currency",
 "label.current": "Current",
diff --git a/ui/src/views/compute/InstanceSchedules.vue b/ui/src/views/compute/InstanceSchedules.vue
index 41694adce33..67e1f6ed749 100644
--- a/ui/src/views/compute/InstanceSchedules.vue
+++ b/ui/src/views/compute/InstanceSchedules.vue
@@ -22,8 +22,9 @@
       style="width: 100%; margin-bottom: 10px"
       @click="showAddModal"
       :loading="loading"
-      :disabled="!('createVMSchedule' in $store.getters.apis)">
-      <template #icon><plus-outlined/></template> {{ $t('label.schedule.add') }}
+      :disabled="!('createVMSchedule' in $store.getters.apis)"
+    >
+      <template #icon><plus-outlined /></template> {{ $t('label.schedule.add') }}
     </a-button>
     <list-view
       :loading="tabLoading"
@@ -35,7 +36,8 @@
       @update-selected-columns="updateSelectedColumns"
       @update-vm-schedule="updateVMSchedule"
       @remove-vm-schedule="removeVMSchedule"
-      @refresh="this.fetchData"/>
+      @refresh="this.fetchData"
+    />
     <a-pagination
       class="row-element"
       style="margin-top: 10px"
@@ -43,12 +45,13 @@
       :current="page"
       :pageSize="pageSize"
       :total="totalCount"
-      :showTotal="total => `${$t('label.showing')} ${Math.min(total, 1+((page-1)*pageSize))}-${Math.min(page*pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
+      :showTotal="total => `${$t('label.showing')} ${Math.min(total, 1 + ((page - 1) * pageSize))}-${Math.min(page * pageSize, total)} ${$t('label.of')} ${total} ${$t('label.items')}`"
       :pageSizeOptions="pageSizeOptions"
       @change="changePage"
       @showSizeChange="changePage"
       showSizeChanger
-      showQuickJumper>
+      showQuickJumper
+    >
       <template #buildOptionText="props">
         <span>{{ props.value }} / {{ $t('label.page') }}</span>
       </template>
@@ -60,66 +63,68 @@
     :title="$t('label.schedule')"
     :maskClosable="false"
     :closable="true"
-    :footer="null"
-    @cancel="closeModal">
+    @cancel="closeModal"
+    @ok="submitForm"
+  >
     <a-form
       layout="vertical"
       :ref="formRef"
       :model="form"
       :rules="rules"
       @finish="submitForm"
-      v-ctrl-enter="submitForm">
-      <a-form-item name="description" ref="description">
+      v-ctrl-enter="submitForm"
+    >
+      <a-form-item
+        name="description"
+        ref="description"
+        :wrapperCol="{ span: 24 }"
+      >
         <template #label>
-          <tooltip-label :title="$t('label.description')" :tooltip="apiParams.description.description"/>
+          <tooltip-label
+            :title="$t('label.description')"
+            :tooltip="apiParams.description.description"
+          />
         </template>
         <a-input
           v-model:value="form.description"
-          v-focus="true" />
+          v-focus="true"
+        />
       </a-form-item>
-      <a-form-item name="action" ref="action">
+      <a-form-item
+        name="action"
+        ref="action"
+        :wrapperCol="{ span: 24 }"
+      >
         <template #label>
-          <tooltip-label :title="$t('label.action')" :tooltip="apiParams.action.description"/>
+          <tooltip-label
+            :title="$t('label.action')"
+            :tooltip="apiParams.action.description"
+          />
         </template>
         <a-radio-group
           v-model:value="form.action"
           button-style="solid"
-          :disabled="isEdit">
-          <a-radio-button v-for="action in actions" :key="action.id" :value="action.value">
+          :disabled="isEdit"
+        >
+          <a-radio-button
+            v-for="action in actions"
+            :key="action.id"
+            :value="action.value"
+          >
             {{ $t(action.label) }}
           </a-radio-button>
         </a-radio-group>
       </a-form-item>
-      <a-form-item name="schedule" ref="schedule">
+      <a-form-item
+        name="timezone"
+        ref="timezone"
+        :wrapperCol="{ span: 24 }"
+      >
         <template #label>
-          <tooltip-label :title="$t('label.schedule')" :tooltip="apiParams.schedule.description"/>
-        </template>
-        <label>{{ $t('label.advanced.mode') }}</label>
-        <a-switch
-          v-model:checked="form.useCronFormat"
-          >
-        </a-switch>
-        <br/>
-        <span v-if="!form.useCronFormat">
-        <cron-ant
-          v-model="form.schedule"
-          :periods="periods"
-          :button-props="{ type: 'primary', size: 'small', disabled: form.useCronFormat }"
-          @error="error=$event"/>
-      </span>
-      <span v-if="form.useCronFormat">
-        <label>{{ generateHumanReadableSchedule(form.schedule) }}</label>
-        <br/>
-      </span>
-        <a-input
-          :addonBefore="$t('label.cron')"
-          v-model:value="form.schedule"
-          :disabled="!form.useCronFormat"
-          v-focus="true" />
-      </a-form-item>
-      <a-form-item name="timezone" ref="timezone">
-        <template #label>
-          <tooltip-label :title="$t('label.timezone')" :tooltip="apiParams.timezone.description"/>
+          <tooltip-label
+            :title="$t('label.timezone')"
+            :tooltip="apiParams.timezone.description"
+          />
         </template>
         <a-select
           showSearch
@@ -128,54 +133,119 @@
           :filterOption="(input, option) => {
             return option.label.toLowerCase().indexOf(input.toLowerCase()) >= 0
           }"
-          :loading="fetching">
-          <a-select-option v-for="opt in timeZoneMap" :key="opt.id" :label="opt.name || opt.description">
+          :loading="fetching"
+        >
+          <a-select-option
+            v-for="opt in timeZoneMap"
+            :key="opt.id"
+            :label="opt.name || opt.description"
+          >
             {{ opt.name || opt.description }}
           </a-select-option>
         </a-select>
       </a-form-item>
-      <a-form-item name="startDate" ref="startDate">
+      <a-row justify="space-between">
+        <a-col>
+          <a-form-item
+            name="startDate"
+            ref="startDate"
+          >
+            <template #label>
+              <tooltip-label
+                :title="$t('label.start.date.and.time')"
+                :tooltip="apiParams.startdate.description"
+              />
+            </template>
+            <a-date-picker
+              v-model:value="form.startDate"
+              show-time
+              :locale="this.$i18n.locale"
+              :placeholder="$t('message.select.start.date.and.time')"
+            />
+          </a-form-item>
+        </a-col>
+        <a-col>
+          <a-form-item
+            name="endDate"
+            ref="endDate"
+          >
+            <template #label>
+              <tooltip-label
+                :title="$t('label.end.date.and.time')"
+                :tooltip="apiParams.enddate.description"
+              />
+            </template>
+            <a-date-picker
+              v-model:value="form.endDate"
+              show-time
+              :locale="this.$i18n.locale"
+              :placeholder="$t('message.select.end.date.and.time')"
+            />
+          </a-form-item>
+        </a-col>
+      </a-row>
+      <a-form-item
+        name="schedule"
+        ref="schedule"
+        :wrapperCol="{ span: 24 }"
+      >
         <template #label>
-          <tooltip-label :title="$t('label.start.date.and.time')" :tooltip="apiParams.startdate.description"/>
+          <tooltip-label
+            :title="$t('label.schedule')"
+            :tooltip="apiParams.schedule.description"
+          />
         </template>
-        <a-date-picker
-          v-model:value="form.startDate"
-          show-time
-          :locale="this.$i18n.locale"
-          :placeholder="$t('message.select.start.date.and.time')"/>
+        <a-row
+          style="margin-bottom: 15px; text-align: center;"
+          justify="space-around"
+          align="middle"
+        >
+          <cron-ant
+            v-if="!form.useCronFormat"
+            v-model="form.schedule"
+            :periods="periods"
+            :button-props="{ type: 'primary', size: 'small', disabled: form.useCronFormat }"
+            @error="error = $event"
+          />
+          <label
+            v-if="form.useCronFormat">
+            {{ generateHumanReadableSchedule(form.schedule) }}
+          </label>
+        </a-row>
+        <a-row
+          justify="space-between"
+          align="middle"
+        >
+          <a-col>
+            <label>{{ $t('label.cron.mode') }}</label>
+          </a-col>
+          <a-col>
+            <a-switch v-model:checked="form.useCronFormat">
+            </a-switch>
+          </a-col>
+          <a-col :span="12">
+            <a-input
+              :addonBefore="$t('label.cron')"
+              v-model:value="form.schedule"
+              :disabled="!form.useCronFormat"
+              v-focus="true"
+            />
+          </a-col>
+        </a-row>
       </a-form-item>
-      <a-form-item name="endDate" ref="endDate">
+      <a-form-item
+        name="enabled"
+        ref="enabled"
+        :wrapperCol="{ span: 24}"
+      >
         <template #label>
-          <tooltip-label :title="$t('label.end.date.and.time')" :tooltip="apiParams.enddate.description"/>
+          <tooltip-label
+            :title="$t('label.enabled')"
+            :tooltip="apiParams.enabled.description"
+          />
         </template>
-        <a-date-picker
-          v-model:value="form.endDate"
-          show-time
-          :locale="this.$i18n.locale"
-          :placeholder="$t('message.select.end.date.and.time')"/>
+        <a-switch v-model:checked="form.enabled" />
       </a-form-item>
-      <a-form-item name="enabled" ref="enabled">
-        <template #label>
-          <tooltip-label :title="$t('label.enabled')" :tooltip="apiParams.enabled.description"/>
-        </template>
-        <a-switch
-          v-model:checked="form.enabled">
-        </a-switch>
-      </a-form-item>
-      <div :span="24" class="action-button">
-        <a-button
-          :loading="loading"
-          @click="closeModal">
-          {{ $t('label.cancel') }}
-        </a-button>
-        <a-button
-          :loading="loading"
-          ref="submit"
-          type="primary"
-          htmlType="submit">
-          {{ $t('label.ok') }}
-        </a-button>
-      </div>
     </a-form>
   </a-modal>
 </template>
@@ -191,7 +261,12 @@ import { mixinForm } from '@/utils/mixin'
 import { timeZone } from '@/utils/timezone'
 import debounce from 'lodash/debounce'
 import cronstrue from 'cronstrue/i18n'
-import moment from 'moment-timezone'
+import dayjs from 'dayjs'
+import utc from 'dayjs/plugin/utc'
+import timezone from 'dayjs/plugin/timezone'
+
+dayjs.extend(utc)
+dayjs.extend(timezone)
 
 export default {
   name: 'InstanceSchedules',
@@ -323,8 +398,8 @@ export default {
       this.isEdit = true
       Object.assign(this.form, schedule)
       // Some weird issue when we directly pass in the moment with tz object
-      this.form.startDate = moment(moment(schedule.startdate).tz(schedule.timezone).format(this.pattern))
-      this.form.endDate = schedule.enddate ? moment(moment(schedule.enddate).tz(schedule.timezone).format(this.pattern)) : ''
+      this.form.startDate = dayjs(schedule.startdate).tz(schedule.timezone)
+      this.form.endDate = schedule.enddate ? dayjs(dayjs(schedule.enddate).tz(schedule.timezone)) : null
       this.showAddModal()
     },
     showAddModal () {
@@ -431,7 +506,7 @@ export default {
       this.updateColumns()
     },
     generateHumanReadableSchedule (schedule) {
-      return cronstrue.toString(schedule, { locale: this.$i18n.locale, throwExceptionOnParseError: false })
+      return cronstrue.toString(schedule, { locale: this.$i18n.locale, throwExceptionOnParseError: false, verbose: true })
     },
     updateColumns () {
       this.columns = []

From b4404fbcc7ebd207507f22eea435eae9d388075b Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhishek.mrt22@gmail.com>
Date: Mon, 26 Feb 2024 19:17:41 +0530
Subject: [PATCH 4/5] db: fix wrong cloud.domain_view (#8705)

---
 .../META-INF/db/views/cloud.domain_view.sql   | 153 +++++++++++++-----
 1 file changed, 114 insertions(+), 39 deletions(-)

diff --git a/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql b/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
index 90a398e1ec5..2d8a9b536f2 100644
--- a/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
+++ b/engine/schema/src/main/resources/META-INF/db/views/cloud.domain_view.sql
@@ -15,46 +15,121 @@
 -- specific language governing permissions and limitations
 -- under the License.
 
--- cloud.affinity_group_view source
+-- VIEW `cloud`.`domain_view`;
 
+DROP VIEW IF EXISTS `cloud`.`domain_view`;
 
-DROP VIEW IF EXISTS `cloud`.`affinity_group_view`;
-
-CREATE VIEW `cloud`.`affinity_group_view` AS
+CREATE VIEW `cloud`.`domain_view` AS
 select
-    `affinity_group`.`id` AS `id`,
-    `affinity_group`.`name` AS `name`,
-    `affinity_group`.`type` AS `type`,
-    `affinity_group`.`description` AS `description`,
-    `affinity_group`.`uuid` AS `uuid`,
-    `affinity_group`.`acl_type` AS `acl_type`,
-    `account`.`id` AS `account_id`,
-    `account`.`uuid` AS `account_uuid`,
-    `account`.`account_name` AS `account_name`,
-    `account`.`type` AS `account_type`,
-    `domain`.`id` AS `domain_id`,
-    `domain`.`uuid` AS `domain_uuid`,
-    `domain`.`name` AS `domain_name`,
-    `domain`.`path` AS `domain_path`,
-    `projects`.`id` AS `project_id`,
-    `projects`.`uuid` AS `project_uuid`,
-    `projects`.`name` AS `project_name`,
-    `vm_instance`.`id` AS `vm_id`,
-    `vm_instance`.`uuid` AS `vm_uuid`,
-    `vm_instance`.`name` AS `vm_name`,
-    `vm_instance`.`state` AS `vm_state`,
-    `user_vm`.`display_name` AS `vm_display_name`
+    `domain`.`id` AS `id`,
+    `domain`.`parent` AS `parent`,
+    `domain`.`name` AS `name`,
+    `domain`.`uuid` AS `uuid`,
+    `domain`.`owner` AS `owner`,
+    `domain`.`path` AS `path`,
+    `domain`.`level` AS `level`,
+    `domain`.`child_count` AS `child_count`,
+    `domain`.`next_child_seq` AS `next_child_seq`,
+    `domain`.`created` AS `created`,
+    `domain`.`removed` AS `removed`,
+    `domain`.`state` AS `state`,
+    `domain`.`network_domain` AS `network_domain`,
+    `domain`.`type` AS `type`,
+    `vmlimit`.`max` AS `vmLimit`,
+    `vmcount`.`count` AS `vmTotal`,
+    `iplimit`.`max` AS `ipLimit`,
+    `ipcount`.`count` AS `ipTotal`,
+    `volumelimit`.`max` AS `volumeLimit`,
+    `volumecount`.`count` AS `volumeTotal`,
+    `snapshotlimit`.`max` AS `snapshotLimit`,
+    `snapshotcount`.`count` AS `snapshotTotal`,
+    `templatelimit`.`max` AS `templateLimit`,
+    `templatecount`.`count` AS `templateTotal`,
+    `vpclimit`.`max` AS `vpcLimit`,
+    `vpccount`.`count` AS `vpcTotal`,
+    `projectlimit`.`max` AS `projectLimit`,
+    `projectcount`.`count` AS `projectTotal`,
+    `networklimit`.`max` AS `networkLimit`,
+    `networkcount`.`count` AS `networkTotal`,
+    `cpulimit`.`max` AS `cpuLimit`,
+    `cpucount`.`count` AS `cpuTotal`,
+    `memorylimit`.`max` AS `memoryLimit`,
+    `memorycount`.`count` AS `memoryTotal`,
+    `primary_storage_limit`.`max` AS `primaryStorageLimit`,
+    `primary_storage_count`.`count` AS `primaryStorageTotal`,
+    `secondary_storage_limit`.`max` AS `secondaryStorageLimit`,
+    `secondary_storage_count`.`count` AS `secondaryStorageTotal`
 from
-    ((((((`affinity_group`
-join `account` on
-    ((`affinity_group`.`account_id` = `account`.`id`)))
-join `domain` on
-    ((`affinity_group`.`domain_id` = `domain`.`id`)))
-left join `projects` on
-    ((`projects`.`project_account_id` = `account`.`id`)))
-left join `affinity_group_vm_map` on
-    ((`affinity_group`.`id` = `affinity_group_vm_map`.`affinity_group_id`)))
-left join `vm_instance` on
-    ((`vm_instance`.`id` = `affinity_group_vm_map`.`instance_id`)))
-left join `user_vm` on
-    ((`user_vm`.`id` = `vm_instance`.`id`)));
+    `cloud`.`domain`
+        left join
+    `cloud`.`resource_limit` vmlimit ON domain.id = vmlimit.domain_id
+        and vmlimit.type = 'user_vm'
+        left join
+    `cloud`.`resource_count` vmcount ON domain.id = vmcount.domain_id
+        and vmcount.type = 'user_vm'
+        left join
+    `cloud`.`resource_limit` iplimit ON domain.id = iplimit.domain_id
+        and iplimit.type = 'public_ip'
+        left join
+    `cloud`.`resource_count` ipcount ON domain.id = ipcount.domain_id
+        and ipcount.type = 'public_ip'
+        left join
+    `cloud`.`resource_limit` volumelimit ON domain.id = volumelimit.domain_id
+        and volumelimit.type = 'volume'
+        left join
+    `cloud`.`resource_count` volumecount ON domain.id = volumecount.domain_id
+        and volumecount.type = 'volume'
+        left join
+    `cloud`.`resource_limit` snapshotlimit ON domain.id = snapshotlimit.domain_id
+        and snapshotlimit.type = 'snapshot'
+        left join
+    `cloud`.`resource_count` snapshotcount ON domain.id = snapshotcount.domain_id
+        and snapshotcount.type = 'snapshot'
+        left join
+    `cloud`.`resource_limit` templatelimit ON domain.id = templatelimit.domain_id
+        and templatelimit.type = 'template'
+        left join
+    `cloud`.`resource_count` templatecount ON domain.id = templatecount.domain_id
+        and templatecount.type = 'template'
+        left join
+    `cloud`.`resource_limit` vpclimit ON domain.id = vpclimit.domain_id
+        and vpclimit.type = 'vpc'
+        left join
+    `cloud`.`resource_count` vpccount ON domain.id = vpccount.domain_id
+        and vpccount.type = 'vpc'
+        left join
+    `cloud`.`resource_limit` projectlimit ON domain.id = projectlimit.domain_id
+        and projectlimit.type = 'project'
+        left join
+    `cloud`.`resource_count` projectcount ON domain.id = projectcount.domain_id
+        and projectcount.type = 'project'
+        left join
+    `cloud`.`resource_limit` networklimit ON domain.id = networklimit.domain_id
+        and networklimit.type = 'network'
+        left join
+    `cloud`.`resource_count` networkcount ON domain.id = networkcount.domain_id
+        and networkcount.type = 'network'
+        left join
+    `cloud`.`resource_limit` cpulimit ON domain.id = cpulimit.domain_id
+        and cpulimit.type = 'cpu'
+        left join
+    `cloud`.`resource_count` cpucount ON domain.id = cpucount.domain_id
+        and cpucount.type = 'cpu'
+        left join
+    `cloud`.`resource_limit` memorylimit ON domain.id = memorylimit.domain_id
+        and memorylimit.type = 'memory'
+        left join
+    `cloud`.`resource_count` memorycount ON domain.id = memorycount.domain_id
+        and memorycount.type = 'memory'
+        left join
+    `cloud`.`resource_limit` primary_storage_limit ON domain.id = primary_storage_limit.domain_id
+        and primary_storage_limit.type = 'primary_storage'
+        left join
+    `cloud`.`resource_count` primary_storage_count ON domain.id = primary_storage_count.domain_id
+        and primary_storage_count.type = 'primary_storage'
+        left join
+    `cloud`.`resource_limit` secondary_storage_limit ON domain.id = secondary_storage_limit.domain_id
+        and secondary_storage_limit.type = 'secondary_storage'
+        left join
+    `cloud`.`resource_count` secondary_storage_count ON domain.id = secondary_storage_count.domain_id
+        and secondary_storage_count.type = 'secondary_storage';

From f731fe882c5b8459a14da9a13269a8360df2743e Mon Sep 17 00:00:00 2001
From: Suresh Kumar Anaparti <suresh.anaparti@shapeblue.com>
Date: Mon, 26 Feb 2024 20:16:31 +0530
Subject: [PATCH 5/5] Storage plugin support to check if volume on datastore
 requires access for migration (#8655)

* Check if volume on datastore requires access for migration, and grant/revoke volume access if requires

* Updated default implementation for requiresAccessForMigration method in PrimaryDataStoreDriver
---
 .../api/storage/PrimaryDataStoreDriver.java         |  4 ++++
 .../engine/subsystem/api/storage/VolumeService.java |  2 ++
 .../engine/orchestration/VolumeOrchestrator.java    |  8 ++++----
 .../storage/volume/VolumeServiceImpl.java           | 13 +++++++++++++
 .../driver/ScaleIOPrimaryDataStoreDriver.java       |  5 +++++
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
index 540d4f6673a..4ab88c19316 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/PrimaryDataStoreDriver.java
@@ -42,6 +42,10 @@ public interface PrimaryDataStoreDriver extends DataStoreDriver {
 
     void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
+    default boolean requiresAccessForMigration(DataObject dataObject) {
+        return false;
+    }
+
     /**
      * intended for managed storage (cloud.storage_pool.managed = true)
      * if not managed, return volume.getSize()
diff --git a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
index 2c12b70e9eb..a6ebf95a99c 100644
--- a/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
+++ b/engine/api/src/main/java/org/apache/cloudstack/engine/subsystem/api/storage/VolumeService.java
@@ -54,6 +54,8 @@ public interface VolumeService {
 
     void revokeAccess(DataObject dataObject, Host host, DataStore dataStore);
 
+    boolean requiresAccessForMigration(DataObject dataObject, DataStore dataStore);
+
     /**
      * Creates the volume based on the given criteria
      *
diff --git a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
index c3908795f7c..ec10c344157 100644
--- a/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
+++ b/engine/orchestration/src/main/java/org/apache/cloudstack/engine/orchestration/VolumeOrchestrator.java
@@ -1228,8 +1228,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
                 DataStore dataStore = dataStoreMgr.getDataStore(volumeForVm.getPoolId(), DataStoreRole.Primary);
                 PrimaryDataStore primaryDataStore = (PrimaryDataStore)dataStore;
 
-                // This might impact other managed storages, grant access for PowerFlex storage pool only
-                if (primaryDataStore.isManaged() && primaryDataStore.getPoolType() == Storage.StoragePoolType.PowerFlex) {
+                // This might impact other managed storages, enable requires access for migration in relevant datastore driver (currently enabled for PowerFlex storage pool only)
+                if (primaryDataStore.isManaged() && volService.requiresAccessForMigration(volumeInfo, dataStore)) {
                     volService.revokeAccess(volumeInfo, host, dataStore);
                 }
             }
@@ -1507,8 +1507,8 @@ public class VolumeOrchestrator extends ManagerBase implements VolumeOrchestrati
             disk.setDetails(getDetails(volumeInfo, dataStore));
 
             PrimaryDataStore primaryDataStore = (PrimaryDataStore)dataStore;
-            // This might impact other managed storages, grant access for PowerFlex storage pool only
-            if (primaryDataStore.isManaged() && primaryDataStore.getPoolType() == Storage.StoragePoolType.PowerFlex) {
+            // This might impact other managed storages, enable requires access for migration in relevant datastore driver (currently enabled for PowerFlex storage pool only)
+            if (primaryDataStore.isManaged() && volService.requiresAccessForMigration(volumeInfo, dataStore)) {
                 volService.grantAccess(volFactory.getVolume(vol.getId()), dest.getHost(), dataStore);
             }
 
diff --git a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
index 47577cc52b2..03460d0d1e5 100644
--- a/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
+++ b/engine/storage/volume/src/main/java/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
@@ -266,6 +266,19 @@ public class VolumeServiceImpl implements VolumeService {
         }
     }
 
+    @Override
+    public boolean requiresAccessForMigration(DataObject dataObject, DataStore dataStore) {
+        DataStoreDriver dataStoreDriver = dataStore != null ? dataStore.getDriver() : null;
+        if (dataStoreDriver == null) {
+            return false;
+        }
+
+        if (dataStoreDriver instanceof PrimaryDataStoreDriver) {
+            return ((PrimaryDataStoreDriver)dataStoreDriver).requiresAccessForMigration(dataObject);
+        }
+        return false;
+    }
+
     @Override
     public AsyncCallFuture<VolumeApiResult> createVolumeAsync(VolumeInfo volume, DataStore dataStore) {
         AsyncCallFuture<VolumeApiResult> future = new AsyncCallFuture<VolumeApiResult>();
diff --git a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
index cad88dcdd15..431fddb566f 100644
--- a/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
+++ b/plugins/storage/volume/scaleio/src/main/java/org/apache/cloudstack/storage/datastore/driver/ScaleIOPrimaryDataStoreDriver.java
@@ -302,6 +302,11 @@ public class ScaleIOPrimaryDataStoreDriver implements PrimaryDataStoreDriver {
         return null;
     }
 
+    @Override
+    public boolean requiresAccessForMigration(DataObject dataObject) {
+        return true;
+    }
+
     @Override
     public long getUsedBytes(StoragePool storagePool) {
         long usedSpaceBytes = 0;