Merge pull request #653 from jeongda-young/pciHostdevices

devices 태그, 가상머신이 정지 된 후 호스트 디바이스 탭 안보이는 오류 수정

Author: jschoiRR

ui/src/views/compute/InstanceTab.vue

@@ -115,7 +115,7 @@
           :virtualmachine="vm"
           :loading="loading"/>
       </a-tab-pane>
-      <a-tab-pane :tab="$t('label.listhostdevices')" key="pcidevices" v-if="hasPciDevices">
+      <a-tab-pane :tab="$t('label.listhostdevices')" key="pcidevices" v-if="shouldShowPciDevicesTab">
         <div v-if="pciDevices.length > 0">
           <a-table
             :columns="pciColumns"
@@ -318,6 +318,12 @@ export default {
   },
   mounted () {
     this.setCurrentTab()
+    this.fetchPciDevices()
+  },
+  computed: {
+    shouldShowPciDevicesTab () {
+      return this.pciDevices.length > 0
+    }
   },
   methods: {
     setCurrentTab () {
@@ -353,11 +359,10 @@ export default {
         }
       })
 
-      // PCI 디바이스 할당 여부만 확인
       this.hasPciDevices = false
       if (this.vm.details) {
         for (const [key, value] of Object.entries(this.vm.details)) {
-          if (key.startsWith('extraconfig-') && value.includes('<hostdev')) {
+          if (key.startsWith('extraconfig-') && (value.includes('<hostdev') || value.includes('pci'))) {
             this.hasPciDevices = true
             break
           }
@@ -418,14 +423,113 @@ export default {
     async handleChangeTab (activeKey) {
       if (activeKey === 'pcidevices') {
         await this.fetchPciDevices()
+        if (this.pciDevices.length === 0) {
+          this.currentTab = 'details'
+          return
+        }
       }
       if (this.currentTab !== activeKey) {
         this.currentTab = activeKey
       }
     },
     async fetchPciDevices () {
       this.pciDevices = []
-      if (!this.vm.hostid) return
+      if (!this.vm.hostid) {
+        // VM이 정지된 상태에서도 PCI 디바이스 정보 표시
+        if (this.vm.details) {
+          const pciAddresses = []
+
+          for (const [key, value] of Object.entries(this.vm.details)) {
+            if (key.startsWith('extraconfig-') && value.includes('<hostdev')) {
+              const sourceMatch = value.match(/<source>\s*<address[^>]*domain='([^']*)'[^>]*bus='([^']*)'[^>]*slot='([^']*)'[^>]*function='([^']*)'[^>]*\/>\s*<\/source>/)
+              if (sourceMatch) {
+                const [, domain, bus, slot, function_] = sourceMatch
+
+                const domainHex = domain.replace('0x', '')
+                const busHex = bus.replace('0x', '')
+                const slotHex = slot.replace('0x', '')
+                const functionHex = function_.replace('0x', '')
+                const pciAddress = `${busHex.padStart(2, '0')}:${slotHex.padStart(2, '0')}.${functionHex}`
+                pciAddresses.push({
+                  key: key,
+                  pciAddress: pciAddress,
+                  domain: domainHex,
+                  bus: busHex,
+                  slot: slotHex,
+                  function: functionHex
+                })
+              } else {
+              }
+            }
+          }
+          if (pciAddresses.length > 0) {
+            try {
+              let hostId = this.vm.hostid || this.vm.lastHostId
+              if (!hostId) {
+                const zoneResponse = await api('listHosts', {
+                  zoneid: this.vm.zoneid,
+                  type: 'Routing',
+                  state: 'Up'
+                })
+
+                if (zoneResponse?.listhostsresponse?.host && zoneResponse.listhostsresponse.host.length > 0) {
+                  hostId = zoneResponse.listhostsresponse.host[0].id
+                }
+              }
+
+              if (!hostId) {
+                console.error('No hostId available for PCI device lookup')
+                pciAddresses.forEach(addr => {
+                  this.pciDevices.push({
+                    key: addr.key,
+                    hostDevicesName: `PCI Device at ${addr.pciAddress}`,
+                    hostDevicesText: `Domain: ${addr.domain}, Bus: ${addr.bus}, Slot: ${addr.slot}, Function: ${addr.function}`
+                  })
+                })
+                return
+              }
+
+              const response = await api('listHostDevices', {
+                id: hostId
+              })
+
+              const devices = response?.listhostdevicesresponse?.listhostdevices?.[0]
+              if (devices && devices.hostdevicesname && devices.hostdevicestext) {
+                for (let i = 0; i < devices.hostdevicesname.length; i++) {
+                  const deviceName = devices.hostdevicesname[i]
+                  const deviceText = devices.hostdevicestext[i]
+                  const pciMatch = deviceName.match(/^([0-9a-fA-F]{2}:[0-9a-fA-F]{2}\.[0-9a-fA-F])/)
+                  if (pciMatch) {
+                    const devicePciAddress = pciMatch[1].toLowerCase()
+
+                    const matchingAddress = pciAddresses.find(addr => {
+                      const addrLower = addr.pciAddress.toLowerCase()
+                      return addrLower === devicePciAddress
+                    })
+                    if (matchingAddress) {
+                      console.log('Found matching device:', deviceName)
+                      this.pciDevices.push({
+                        key: matchingAddress.key,
+                        hostDevicesName: deviceName,
+                        hostDevicesText: deviceText
+                      })
+                    }
+                  }
+                }
+              }
+            } catch (error) {
+              pciAddresses.forEach(addr => {
+                this.pciDevices.push({
+                  key: addr.key,
+                  hostDevicesName: `PCI Device at ${addr.pciAddress}`,
+                  hostDevicesText: `Domain: ${addr.domain}, Bus: ${addr.bus}, Slot: ${addr.slot}, Function: ${addr.function}`
+                })
+              })
+            }
+          }
+        }
+        return
+      }
 
       try {
         const vmNumericId = this.vm.instancename.split('-')[2]

ui/src/views/storage/HostDevicesTransfer.vue

@@ -250,13 +250,9 @@ export default {
 
                 const vm = response?.listvirtualmachinesresponse?.virtualmachine?.[0]
                 const details = vm?.details || {}
-
-                // extraconfig에 해당 호스트 디바이스 설정이 남아있는지 확인
                 const hasDeviceConfig = Object.values(details).some(value =>
                   value.includes('<hostdev') && value.includes(hostDevicesName)
                 )
-
-                // 설정이 남아있다면 삭제하지 않음
                 if (hasDeviceConfig) {
                   return
                 }
@@ -277,17 +273,18 @@ export default {
     },
 
     generateXmlConfig (hostDeviceName) {
-      // PCI 디바이스인 경우 (기존 로직)
       const [pciAddress] = hostDeviceName.split(' ')
       const [bus, slotFunction] = pciAddress.split(':')
       const [slot, func] = slotFunction.split('.')
 
       return `
+      <devices>
       <hostdev mode='subsystem' type='pci' managed='yes'>
         <source>
           <address domain='0x0000' bus='0x${bus}' slot='0x${slot}' function='0x${func}'/>
         </source>
       </hostdev>
+      </devices>
       `.trim()
     },
 
@@ -321,3 +318,4 @@ export default {
   }
 }
 </style>
+