Merge branch 'ablecloud-team:ablestack-diplo' into mold-main#2025

Author: jschoiRR

ui/public/locales/en.json

@@ -4461,6 +4461,7 @@
 "physical.nvpcontroller.configure": "PHYSICAL.NVPCONTROLLER.CONFIGURE",
 "physical.ovscontroller.add": "PHYSICAL.OVSCONTROLLER.ADD",
 "physical.ovscontroller.delete": "PHYSICAL.OVSCONTROLLER.DELETE",
+"cluster.drs.generate": "CLUSTER.DRS.GENERATE",
 "counter.create": "COUNTER.CREATE",
 "counter.delete": "COUNTER.DELETE",
 "condition.create": "CONDITION.CREATE",

ui/public/locales/ko_KR.json

@@ -4461,6 +4461,7 @@
 "physical.nvpcontroller.configure": "\ubb3c\ub9ac.NVP\ucee8\ud2b8\ub864\ub7ec.\uad6c\uc131",
 "physical.ovscontroller.add": "\ubb3c\ub9ac.OVS\ucee8\ud2b8\ub864\ub7ec.\ucd94\uac00",
 "physical.ovscontroller.delete": "\ubb3c\ub9ac.OVSC\ucee8\ud2b8\ub864\ub7ec.\uc0ad\uc81c",
+"cluster.drs.generate": "\ud074\ub7ec\uc2a4\ud130.DRS.\uc0dd\uc131",
 "counter.create": "\uce74\uc6b4\ud130.\uc0dd\uc131",
 "counter.delete": "\uce74\uc6b4\ud130.\uc0ad\uc81c",
 "condition.create": "\uc870\uac74.\uc0dd\uc131",

ui/src/views/infra/zone/ZoneWizardNetworkSetupStep.vue

@@ -101,7 +101,6 @@
     />
 
     <div v-if="guestTrafficRangeMode">
-      <div>{{ isNsxZone }}</div>
       <static-inputs-form
         v-if="steps && steps[currentStep].formKey === 'guestTraffic'"
         @nextPressed="nextPressed"

ui/src/views/storage/HostDevicesTransfer.vue

@@ -98,26 +98,29 @@ export default {
       }
 
       this.loading = true
-
       const vmId = this.form.virtualmachineid
       const hostDevicesName = this.resource.hostDevicesName
 
-      const xmlConfig = this.generateXmlConfig(hostDevicesName)
+      api('listVirtualMachines', {
+        id: vmId,
+        details: 'min'
+      }).then(response => {
+        const vm = response.listvirtualmachinesresponse.virtualmachine[0]
+        const details = vm.details || {}
+
+        const xmlConfig = this.generateXmlConfig(hostDevicesName)
 
-      const apiName = 'updateVirtualMachine'
+        const params = { id: vmId }
 
-      if (!(apiName in this.$store.getters.apis)) {
-        this.$message.error({
-          message: this.$t('error.execute.api.failed') + ' ' + apiName,
-          description: this.$t('message.user.not.permitted.api')
+        // 기존 details 값을 유지하면서 새로운 값 추가
+        Object.keys(details).forEach(key => {
+          params[`details[0].${key}`] = details[key]
         })
-        this.loading = false
-        return
-      }
 
-      api(apiName, {
-        id: vmId,
-        'details[0].extraconfig-1': xmlConfig
+        // 필요한 추가 값 동적으로 설정
+        params[`details[0].extraconfig-1`] = xmlConfig
+
+        return api('updateVirtualMachine', params)
       }).then(() => {
         this.$message.success(this.$t('message.success.update.vm'))
         this.closeAction()
@@ -142,7 +145,7 @@ export default {
         </source>
       </hostdev>
       </devices>
-      `
+      `.trim()
     },
 
     closeAction () {