Merge pull request #6854 from GuoLiBin6/feat/glb-to-3.12/compute

feat(v3.12/4611): cloudpods select ios iamges
yunionio · Jul 4, 2024 · f903d6e · f903d6e
2 parents 2f47ba5 + fc3115e
commit f903d6e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/containers/Compute/sections/OsSelect/index.vue b/containers/Compute/sections/OsSelect/index.vue
@@ -131,7 +131,7 @@ export default {
         ret.unshift(IMAGES_TYPE_MAP.vmware)
         ret.push(IMAGES_TYPE_MAP.iso)
         ret.push({ ...IMAGES_TYPE_MAP.snapshot, label: this.$t(IMAGES_TYPE_MAP.snapshot.t) })
-      } else if (this.hypervisor === HYPERVISORS_MAP.proxmox.key) {
+      } else if (this.hypervisor === HYPERVISORS_MAP.proxmox.key || (this.isPrivate && this.hypervisor === HYPERVISORS_MAP.kvm.key)) {
         ret = [IMAGES_TYPE_MAP.private, IMAGES_TYPE_MAP.iso, IMAGES_TYPE_MAP.private_iso]
       } else if (this.hypervisor === HYPERVISORS_MAP.sangfor.key) {
         ret = [IMAGES_TYPE_MAP.private_iso]

diff --git a/containers/Compute/views/vminstance/create/form/Private.vue b/containers/Compute/views/vminstance/create/form/Private.vue
@@ -370,7 +370,7 @@ export default {
       if (this.isInCloudSphere) {
         return ['standard', 'customize']
       }
-      if (this.form.fd.hypervisor === HYPERVISORS_MAP.proxmox.key) {
+      if (this.form.fd.hypervisor === HYPERVISORS_MAP.proxmox.key || this.form.fd.hypervisor === HYPERVISORS_MAP.kvm.key) {
         return ['private']
       }
       return []

diff --git a/containers/Compute/views/vminstance/dialogs/SnapshotCreate.vue b/containers/Compute/views/vminstance/dialogs/SnapshotCreate.vue
@@ -20,7 +20,7 @@
               </template>
               <a-radio value="disk" :disabled="isEsxi">{{$t('compute.text_101')}}</a-radio>
             </a-tooltip>
-            <a-radio value="instance">{{$t('compute.text_102')}}</a-radio>
+            <a-radio value="instance" :disabled="isCloudpods">{{$t('compute.text_102')}}</a-radio>
           </a-radio-group>
         </a-form-item>
         <a-form-item
@@ -147,6 +147,9 @@ export default {
     isEsxi () {
       return this.params.data[0].hypervisor === hypervisorMap.esxi.key
     },
+    isCloudpods () {
+      return this.params.data[0].brand === 'Cloudpods'
+    },
     diskParams () {
       return {
         scope: this.$store.getters.scope,