Merge branch 'ablestack-diplo' of https://github.com/ablecloud-team/ablestack-cloud into ablestack-diplo

Author: dhslove

scripts/util/update-mold-theme-from-license.sh

@@ -5,7 +5,7 @@ config_path="/usr/share/cloudstack-management/webapp/config.json"
 # ko_path="/usr/share/cloudstack-management/webapp/locales/ko_KR.json"
 # en_path="/usr/share/cloudstack-management/webapp/locales/en.json"
 
-if [ "ablestack" == "$type" ]; then
+if [ "ABLESTACK" == "$type" ]; then
 
   echo "ABLECLOUD ABLESTACK Mold 테마 설정 중...."
 
@@ -36,7 +36,7 @@ if [ "ablestack" == "$type" ]; then
 
   echo "ABLECLOUD ABLESTACK Mold 테마 설정 완료!"
 
-elif [ "clostack" == "$type" ]; then
+elif [ "Clostack" == "$type" ]; then
 
   echo "CLOIT CLOSTACK Mold 테마 설정 중...."
 
@@ -67,8 +67,8 @@ elif [ "clostack" == "$type" ]; then
 
   echo "CLOIT CLOSTACK Mold 테마 설정 완료!"
 
-elif [ "hv" == "$type" ]; then
-  echo "효성 UCP HV Mold 테마 설정 중...."
+elif [ "UCP HV powered by ABLESTACK" == "$type" ]; then
+  echo "효성인포메이션시스템 UCP HV Mold 테마 설정 중...."
 
   # 로고 파일 변경
   sed -i "/\"logo\"/ c\  \"logo\": \"assets/logo-hv.png\","  $config_path
@@ -95,6 +95,6 @@ elif [ "hv" == "$type" ]; then
   sed -i "/\"@mini-logo-magin-top\"/ c\    \"@mini-logo-magin-top\": \"8px\","  $config_path
   sed -i "/\"@mini-logo-magin-bottom\"/ c\    \"@mini-logo-magin-bottom\": \"8px\","  $config_path
 
-  echo "효성 UCP HV Mold 테마 설정 완료!"
+  echo "효성인포메이션시스템 UCP HV Mold 테마 설정 완료!"
 
 fi

ui/public/locales/en.json

@@ -4798,5 +4798,6 @@
 "state.deytroying" : "Deleting",
 "state.scheduled" : "Scheduled",
 "state.started" : "Started",
-"message.delete.device.allocation": "Unassigning devices in virtual machines"
+"message.delete.device.allocation": "Unassigning devices in virtual machines",
+"message.cannot.remove.device.vm.running": "Running virtual machines cannot be removed"
 }

ui/public/locales/ko_KR.json

@@ -4797,5 +4797,6 @@
 "state.backingup": "\ubc31\uc5c5 \uc911",
 "state.destroying": "\uc0ad\uc81c \uc911",
 "state.scheduled" : "\uc608\uc815\ub428",
-"state.started" : "\uc2dc\uc791"
+"state.started" : "\uc2dc\uc791",
+"message.cannot.remove.device.vm.running": "\uc2e4\ud589 \uc911\uc778 \uac00\uc0c1\uba38\uc2e0\uc740 \ub514\ubc14\uc774\uc2a4\ub97c \ud574\uc81c\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4."
 }

ui/src/views/infra/ListHostDevicesTab.vue

@@ -374,6 +374,11 @@ export default {
     openModal (record) {
       this.selectedResource = { ...this.resource, hostDevicesName: record.hostDevicesName }
       this.showAddModal = true
+      this.$nextTick(() => {
+        if (this.$refs.hostDevicesTransfer) {
+          this.$refs.hostDevicesTransfer.refreshVMList()
+        }
+      })
     },
     closeAction () {
       this.showAddModal = false
@@ -619,6 +624,16 @@ export default {
           details: 'all'
         })
         const vm = vmResponse?.listvirtualmachinesresponse?.virtualmachine?.[0]
+        if (vm && vm.state === 'Running') {
+          this.$notification.warning({
+            message: this.$t('label.warning'),
+            description: this.$t('message.cannot.remove.device.vm.running')
+          })
+          this.showPciDeleteModal = false
+          this.selectedPciDevice = null
+          this.pciConfigs = {}
+          return
+        }
 
         const params = {
           id: vm.id
@@ -668,10 +683,28 @@ export default {
       this.pciConfigs = {}
     },
     showConfirmModal (device) {
-      console.log('Selected device:', device)
-      console.log('VM Names:', this.vmNames)
-      this.selectedPciDevice = device
-      this.showPciDeleteModal = true
+      if (device.virtualmachineid) {
+        api('listVirtualMachines', {
+          id: device.virtualmachineid,
+          listall: true
+        }).then(response => {
+          const vm = response?.listvirtualmachinesresponse?.virtualmachine?.[0]
+          if (vm && vm.state === 'Running') {
+            this.$notification.warning({
+              message: this.$t('label.warning'),
+              description: this.$t('message.cannot.remove.device.vm.running')
+            })
+            return
+          }
+          this.selectedPciDevice = device
+          this.showPciDeleteModal = true
+        }).catch(error => {
+          this.$notifyError(error)
+        })
+      } else {
+        this.selectedPciDevice = device
+        this.showPciDeleteModal = true
+      }
     },
     async updateDataWithVmNames () {
       try {

ui/src/views/storage/HostDevicesTransfer.vue

@@ -110,7 +110,6 @@ export default {
           }).then(detailResponse => {
             const vmDetails = detailResponse.listvirtualmachinesresponse.virtualmachine[0]
 
-            // XML 형식이 아닌 extraconfig 제거
             if (vmDetails.details) {
               const filteredDetails = {}
               Object.entries(vmDetails.details).forEach(([key, value]) => {
@@ -140,13 +139,12 @@ export default {
           }
 
           this.virtualmachines = detailedVms.filter(vm => {
-            if (latestAllocatedVmIds.has(vm.id.toString()) &&
-                vm.details?.['extraconfig-1']?.toLowerCase().includes('usb') ||
-                vm.details?.['extraconfig-1']?.toLowerCase().includes('disk type=\'block\' device=\'lun\'')) {
-              return false
+            if (vm.state === 'Running') {
+              return true
             }
-            return true
+            return false
           })
+          console.log('Filtered VMs for allocation (All Running VMs):', this.virtualmachines.length)
         })
       }).catch(error => {
         this.$notifyError(error.message || 'Failed to fetch VMs')
@@ -202,7 +200,6 @@ export default {
           [`details[0].extraconfig-${nextConfigNum}`]: xmlConfig
         }
 
-        // 기존 XML 설정만 유지
         Object.entries(details).forEach(([key, value]) => {
           if (key.startsWith('extraconfig-') && value.includes('<hostdev')) {
             params[`details[0].${key}`] = value