Merge pull request #7629 from GuoLiBin6/automated-cherry-pick-of-#7628-upstream-release-3.9

Automated cherry pick of #7628: feat: 磁盘支持设置关机自动重置

Author: GuoLiBin6

containers/Compute/locales/en.json

@@ -1660,5 +1660,7 @@
   "compute.tooltip.check_fake_baremetal_server": "This operation is not supported on the machine",
   "compute.transfer.bandwidth.number.check": "Only positive integers can be entered",
   "compute.bios": "Boot Mode",
-  "compute.lvm_shared_storage.validate_tooltip": "LVM disk host does not support this operation"
+  "compute.lvm_shared_storage.validate_tooltip": "LVM disk host does not support this operation",
+  "compute.shutdown_auto_reset": "Shutdown and automatic reset",
+  "compute.disk_set_auto_reset": "Set automatic reset"
 }

containers/Compute/locales/zh-CN.json

@@ -1661,5 +1661,7 @@
   "compute.tooltip.check_fake_baremetal_server": "托管的机器不支持该操作",
   "compute.transfer.bandwidth.number.check": "只能输入正整数",
   "compute.bios": "引导模式",
-  "compute.lvm_shared_storage.validate_tooltip": "LVM磁盘主机不支持该操作"
+  "compute.lvm_shared_storage.validate_tooltip": "LVM磁盘主机不支持该操作",
+  "compute.shutdown_auto_reset": "关机自动重置",
+  "compute.disk_set_auto_reset": "设置自动重置"
 }

containers/Compute/sections/DataDisk/index.vue

@@ -21,6 +21,7 @@
           :storageParams="storageParams"
           :storageHostParams="storageHostParams"
           :isStorageShow="isStorageShow"
+          :isAutoResetShow="isAutoResetShow"
           @snapshotChange="val => snapshotChange(item, val, i)"
           @diskTypeChange="val => diskTypeChange(item, val)"
           @storageHostChange="(val) => $emit('storageHostChange', val)" />
@@ -122,6 +123,10 @@ export default {
       type: Object,
     },
     storageHostParams: Object,
+    isAutoResetShow: {
+      type: Boolean,
+      default: false,
+    },
   },
   data () {
     return {

containers/Compute/sections/Disk/index.vue

@@ -45,6 +45,10 @@
       <storage style="min-width: 480px; max-width: 500px;" :diskKey="diskKey" :decorators="decorator" :storageParams="storageParams" v-if="showStorage" :form="form" :storageHostParams="storageHostParams" @storageHostChange="(val) => $emit('storageHostChange', val)" />
       <a-button v-if="!disabled" class="mt-1" type="link" @click="storageShowClick">{{ showStorage ? $t('compute.text_135') : $t('compute.text_1350') }}</a-button>
     </template>
+    <!-- 关机重置 -->
+    <a-form-item v-if="isAutoResetShow">
+      <a-checkbox v-decorator="decorator.auto_reset">{{ $t('compute.shutdown_auto_reset') }}</a-checkbox>
+    </a-form-item>
     <!-- 磁盘容量预警信息提示 -->
     <a-tooltip v-if="storageStatusMap.tooltip">
       <template slot="title">
@@ -144,6 +148,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isAutoResetShow: {
+      type: Boolean,
+      default: false,
+    },
   },
   data () {
     return {

containers/Compute/utils/createServer.js

@@ -288,6 +288,13 @@ export const createVmDecorators = type => {
           }],
         },
       ],
+      auto_reset: [
+        'systemDiskAutoReset',
+        {
+          valuePropName: 'checked',
+          initialValue: false,
+        },
+      ],
     },
     dataDisk: {
       type: i => [
@@ -368,6 +375,13 @@ export const createVmDecorators = type => {
           }],
         },
       ],
+      auto_reset: i => [
+        `dataDiskAutoReset[${i}]`,
+        {
+          valuePropName: 'checked',
+          initialValue: false,
+        },
+      ],
     },
     network: {
       networkType: [
@@ -774,6 +788,9 @@ export class GenCreateData {
     if (diskSupportTypeMedium(this.fd.hypervisor)) {
       ret.backend = getOriginDiskKey(ret.backend)
     }
+    if (item.auto_reset) {
+      ret.auto_reset = true
+    }
     return ret
   }
 
@@ -818,6 +835,9 @@ export class GenCreateData {
     if (this.fd.systemDiskStorage) {
       systemDisk.storage_id = this.fd.systemDiskStorage
     }
+    if (this.fd.systemDiskAutoReset) {
+      systemDisk.auto_reset = this.fd.systemDiskAutoReset
+    }
     // #7356 新建vmware主机，数据盘没有传磁盘类型字段
     if (this.fd.hypervisor === HYPERVISORS_MAP.esxi.key) {
       dataDiskType = dataDiskType || sysDiskType
@@ -852,6 +872,9 @@ export class GenCreateData {
       if (this.fi.dataDiskMedium) {
         diskObj.medium = this.fi.dataDiskMedium
       }
+      if (this.fd.dataDiskAutoReset && this.fd.dataDiskAutoReset[key]) {
+        diskObj.auto_reset = this.fd.dataDiskAutoReset[key]
+      }
       dataDisk.push(diskObj)
     }, this.fd.dataDiskSizes)
     const disks = { data: dataDisk, system: systemDisk }

containers/Compute/views/disk/dialogs/SetAutoResetDialog.vue

@@ -0,0 +1,88 @@
+<template>
+  <base-dialog @cancel="cancelDialog">
+    <div slot="header">{{$t('compute.disk_set_auto_reset')}}</div>
+    <div slot="body">
+      <dialog-selected-tips :count="params.data.length" :name="$t('dictionary.disk')" :action="$t('compute.disk_set_auto_reset')" />
+      <dialog-table v-if="params.columns && params.columns.length" :data="params.data" :columns="params.columns.slice(0, 3)" />
+      <a-form
+        :form="form.fc">
+        <a-form-item :label="$t('compute.shutdown_auto_reset')" v-bind="formItemLayout">
+          <a-checkbox v-decorator="decorators.auto_reset" />
+        </a-form-item>
+      </a-form>
+    </div>
+    <div slot="footer">
+      <a-button type="primary" @click="handleConfirm" :loading="loading">{{ $t('dialog.ok') }}</a-button>
+      <a-button @click="cancelDialog">{{ $t('dialog.cancel') }}</a-button>
+    </div>
+  </base-dialog>
+</template>
+
+<script>
+import DialogMixin from '@/mixins/dialog'
+import WindowsMixin from '@/mixins/windows'
+
+export default {
+  name: 'DiskSetAutoResetDialog',
+  mixins: [DialogMixin, WindowsMixin],
+  data () {
+    return {
+      loading: false,
+      scope: this.$store.getters.scope,
+      form: {
+        fc: this.$form.createForm(this),
+      },
+      decorators: {
+        auto_reset: [
+          'auto_reset',
+          {
+            valuePropName: 'checked',
+            initialValue: this.params.data[0].auto_reset || false,
+          },
+        ],
+      },
+      formItemLayout: {
+        labelCol: {
+          sm: { span: 3 },
+        },
+        wrapperCol: {
+          sm: { span: 21 },
+        },
+      },
+    }
+  },
+  computed: {
+    domain () {
+      return this.params.data[0].domain_id
+    },
+    tenant () {
+      return this.params.data[0].tenant_id
+    },
+  },
+  created () {
+  },
+  methods: {
+    async handleConfirm () {
+      this.loading = true
+      try {
+        const values = await this.form.fc.validateFields()
+        this.loading = true
+        await this.params.onManager('update', {
+          id: this.params.data[0].id,
+          managerArgs: {
+            data: {
+              auto_reset: values.auto_reset,
+            },
+          },
+        })
+        this.loading = false
+        this.params.refresh()
+        this.cancelDialog()
+      } catch (error) {
+        this.loading = false
+        throw error
+      }
+    },
+  },
+}
+</script>

containers/Compute/views/disk/mixins/columns.js

@@ -127,6 +127,13 @@ export default {
         },
         hidden: this.hiddenColumns.includes('medium_type'),
       },
+      {
+        field: 'auto_reset',
+        title: this.$t('compute.shutdown_auto_reset'),
+        formatter: ({ row }) => {
+          return row.auto_reset ? this.$t('common.true') : this.$t('common.false')
+        },
+      },
     ]
   },
 }

containers/Compute/views/disk/mixins/singleActions.js

@@ -346,6 +346,25 @@ export default {
               },
               hidden: () => this.$isScopedPolicyMenuHidden('disk_hidden_menus.disk_perform_setup_snapshot_policy'),
             },
+            {
+              label: i18n.t('compute.disk_set_auto_reset'),
+              permission: 'disks_update',
+              action: () => {
+                this.createDialog('DiskSetAutoResetDialog', {
+                  vm: this,
+                  data: [obj],
+                  onManager: this.onManager,
+                  columns: this.columns,
+                  refresh: this.refresh,
+                })
+              },
+              meta: () => {
+                return {
+                  validate: true,
+                }
+              },
+              hidden: () => this.$isScopedPolicyMenuHidden('disk_hidden_menus.disk_perform_auto_reset'),
+            },
             {
               label: i18n.t('compute.driver.update'),
               permission: 'disks_update',

containers/Compute/views/disk/sidepage/Detail.vue

@@ -138,6 +138,13 @@ export default {
             return '-'
           },
         },
+        {
+          field: 'auto_reset',
+          title: this.$t('compute.shutdown_auto_reset'),
+          formatter: ({ row }) => {
+            return row.auto_reset ? this.$t('common.true') : this.$t('common.false')
+          },
+        },
       ],
       extraInfo: [
         {

containers/Compute/views/vminstance/create/components/SystemDisk.vue

@@ -16,6 +16,7 @@
       :size-disabled="sizeDisabled || disabled"
       :storage-status-map="storageStatusMap"
       :isStorageShow="isStorageShow"
+      :isAutoResetShow="isAutoResetShow"
       @showStorageChange="showStorageChange"
       @diskTypeChange="setDiskMedium"
       @storageHostChange="(val) => $emit('storageHostChange', val)" />
@@ -106,6 +107,10 @@ export default {
       type: Boolean,
       default: false,
     },
+    isAutoResetShow: {
+      type: Boolean,
+      default: false,
+    },
   },
   computed: {
     isPublic () {