Merge pull request #6768 from easy-mj/feature/mj-r-master-disk_remove…

…_server feat(3.9): 新建硬盘去掉指定虚拟机
yunionio · Jun 21, 2024 · cf58689 · cf58689
2 parents 01509c0 + a87d417
commit cf58689
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 255 deletions.
diff --git a/containers/Compute/views/disk/create/components/BottomBar.vue b/containers/Compute/views/disk/create/components/BottomBar.vue
@@ -173,7 +173,7 @@ export default {
       this.loading = true
       try {
         let values = await this.form.fc.validateFields()
-        const { project, domain, cloudregion, zone, manager_id, backend, encryptEnable, encrypt_key_id, encrypt_key_alg, server, host, storage, ...rest } = values
+        const { project, domain, cloudregion, zone, manager_id, backend, encryptEnable, encrypt_key_id, encrypt_key_alg, storage, ...rest } = values
         const oProvider = PROVIDER_MAP[this.currentCloudregion.provider]
         const provider = Array.isArray(this.provider) ? this.provider[0] : this.provider
         values = {
@@ -195,36 +195,17 @@ export default {
           values.encrypt_key_alg = encrypt_key_alg
           values.encrypt_key_user_id = this.userInfo.id
         }
-        if (host) {
-          values.prefer_host_id = host
-        }
         if (storage) {
           values.storage_id = storage
         }
         Reflect.deleteProperty(values, 'cloudregion')
         Reflect.deleteProperty(values, 'zone')
-        const { data } = await this.doCreate(values)
+        await this.doCreate(values)
         const successBack = () => {
           this.$message.success(this.$t('k8s.text_184'))
           this.$router.push('/disk')
         }
-        if (server) {
-          let timer = null
-          timer = setInterval(async () => {
-            const res = await this.fetchDiskInfo(data.id)
-
-            if (res.data.status === 'ready') {
-              clearInterval(timer)
-              await this.attachServers(data, server)
-              successBack()
-            } else if (res.data.status.includes('fail')) {
-              clearInterval(timer)
-              successBack()
-            }
-          }, 1000)
-        } else {
-          successBack()
-        }
+        successBack()
       } catch (error) {
         this.loading = false
         throw error
@@ -236,18 +217,6 @@ export default {
       const backend = curVal.substr(curIndex + 2)
       return { type, backend }
     },
-    async attachServers (disk, server) {
-      return new this.$Manager('servers').batchPerformAction({
-        action: 'attachdisk',
-        ids: [server],
-        data: {
-          disk_id: disk.id,
-        },
-      })
-    },
-    async fetchDiskInfo (id) {
-      return new this.$Manager('disks').get({ id })
-    },
   },
 }
 </script>

diff --git a/containers/Compute/views/disk/create/components/HostServer.vue b/containers/Compute/views/disk/create/components/HostServer.vue
diff --git a/containers/Compute/views/disk/create/index.vue b/containers/Compute/views/disk/create/index.vue
@@ -65,9 +65,6 @@
           </a-col>
         </a-row>
       </a-form-item>
-      <a-form-item :label="$t('common.choose.server.label')" v-bind="formItemLayout" v-if="isIDC">
-        <host-server :form="form" :decorators="decorators" :query="hostQuery" />
-      </a-form-item>
       <a-form-item v-if="enableEncryption" v-bind="formItemLayout" :label="$t('compute.disk.encryption')" :extra="$t('compute.disk.encryption.extra')">
         <encrypt-keys :decorators="decorators.encrypt_keys" />
       </a-form-item>
@@ -119,8 +116,6 @@ import { getCloudEnvOptions } from '@/utils/common/hypervisor'
 import Tag from '@/sections/Tag'
 import BottomBar from './components/BottomBar'
 
-import HostServer from './components/HostServer'
-
 export default {
   name: 'DiskCreate',
   components: {
@@ -129,7 +124,6 @@ export default {
     BottomBar,
     Tag,
     EncryptKeys,
-    HostServer,
     DiskStorageSelect,
     HypervisorRadio,
   },
@@ -478,17 +472,6 @@ export default {
       }
       return params
     },
-    hostQuery () {
-      const hostQuery = {}
-      const value = this.storageItem?.value
-      if (value) {
-        const storageArr = value.split('__')
-        const storage_type = storageArr[1]
-        hostQuery.storage_type = storage_type
-      }
-      hostQuery.host_type = this.form.fd.hypervisor === 'kvm' ? 'hypervisor' : this.form.fd.hypervisor
-      return hostQuery
-    },
     dataStorageTypes () {
       return this.capbilityData.data_storage_types
     },