mirror of
https://github.com/apache/cloudstack.git
synced 2025-10-26 08:42:29 +01:00
Compare commits
No commits in common. "4b74a99a57ca3e10a191b9eb1373cf80acf5df6e" and "8bbe253b00970c459a6c9c778c76d1ab8e969d58" have entirely different histories.
4b74a99a57
...
8bbe253b00
@ -209,10 +209,7 @@ public class ImportVmTasksManagerImpl implements ImportVmTasksManager {
|
|||||||
}
|
}
|
||||||
if (task.getVmId() != null) {
|
if (task.getVmId() != null) {
|
||||||
UserVmVO userVm = userVmDao.findById(task.getVmId());
|
UserVmVO userVm = userVmDao.findById(task.getVmId());
|
||||||
if (userVm != null) {
|
response.setVirtualMachineId(userVm.getUuid());
|
||||||
// Migrated VM could have been removed from CloudStack after the migration
|
|
||||||
response.setVirtualMachineId(userVm.getUuid());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
response.setCreated(task.getCreated());
|
response.setCreated(task.getCreated());
|
||||||
response.setLastUpdated(task.getUpdated());
|
response.setLastUpdated(task.getUpdated());
|
||||||
|
|||||||
@ -259,6 +259,26 @@
|
|||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
|
||||||
|
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
|
||||||
|
<div class="resource-detail-item__details">
|
||||||
|
<font-awesome-icon
|
||||||
|
:icon="['fa-solid', 'fa-microchip']"
|
||||||
|
class="anticon"
|
||||||
|
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
|
||||||
|
<span>
|
||||||
|
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
|
||||||
|
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
|
||||||
|
<span v-else>{{ resource.gpucardname }}</span>
|
||||||
|
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
|
||||||
|
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
|
||||||
|
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
|
||||||
|
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
|
||||||
|
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
|
||||||
|
</span>
|
||||||
|
</span>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
<div class="resource-detail-item" v-else-if="resource.memorytotalgb">
|
<div class="resource-detail-item" v-else-if="resource.memorytotalgb">
|
||||||
<div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
|
<div class="resource-detail-item__label">{{ $t('label.memory') }}</div>
|
||||||
<div class="resource-detail-item__details">
|
<div class="resource-detail-item__details">
|
||||||
@ -324,26 +344,6 @@
|
|||||||
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="resource-detail-item" v-if="'gpucardname' in resource && resource.gpucardname !== ''">
|
|
||||||
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
|
|
||||||
<div class="resource-detail-item__details">
|
|
||||||
<font-awesome-icon
|
|
||||||
:icon="['fa-solid', 'fa-microchip']"
|
|
||||||
class="anticon"
|
|
||||||
:style="[$store.getters.darkMode ? { color: 'rgba(255, 255, 255, 0.65)' } : { color: '#888' }]" />
|
|
||||||
<span>
|
|
||||||
{{ resource.gpucount ? resource.gpucount + ' x ' : '' }}
|
|
||||||
<router-link v-if="resource.gpucardid" :to="{ path: '/gpucard/' + resource.gpucardid }">{{ resource.gpucardname}} </router-link>
|
|
||||||
<span v-else>{{ resource.gpucardname }}</span>
|
|
||||||
<router-link v-if="resource.vgpuprofilename !== 'passthrough' && resource.vgpuprofileid" :to="{ path: '/vgpuprofile/' + resource.vgpuprofileid }">{{ ' (' + resource.vgpuprofilename + ')' }}</router-link>
|
|
||||||
<span v-else-if="resource.vgpuprofilename !== 'passthrough' &&resource.vgpuprofilename">{{ ' (' + resource.vgpuprofilename + ')' }}</span>
|
|
||||||
<span v-if="resource.videoram || (resource.maxresolutionx || resource.maxresolutiony)">
|
|
||||||
<br/>{{ ' [' + (resource.videoram ? (resource.videoram + 'MB') : '') + ((resource.videoram && resource.maxresolutionx && resource.maxresolutiony) ? ', ' : '') +
|
|
||||||
(resource.maxresolutionx && resource.maxresolutiony ? resource.maxresolutionx + 'x' + resource.maxresolutiony : '') + ']' }}
|
|
||||||
</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="resource-detail-item" v-if="resource.gputotal">
|
<div class="resource-detail-item" v-if="resource.gputotal">
|
||||||
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
|
<div class="resource-detail-item__label">{{ $t('label.gpu') }}</div>
|
||||||
<div class="resource-detail-item__details">
|
<div class="resource-detail-item__details">
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user