apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.

Browse Source
This commit is contained in:
Sanjay Tripathi 2014-10-15 11:19:50 +05:30
parent ec6a666855
commit 1f8cf0bee4
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
View File

@ -2147,7 +2147,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
} }
detailsVO = new ArrayList<ServiceOfferingDetailsVO>(); detailsVO = new ArrayList<ServiceOfferingDetailsVO>();
for (Entry<String, String> detailEntry : details.entrySet()) { for (Entry<String, String> detailEntry : details.entrySet()) {
String value = null;
if (detailEntry.getKey().equals(GPU.Keys.pciDevice.toString())) { if (detailEntry.getKey().equals(GPU.Keys.pciDevice.toString())) {
if (detailEntry.getValue() == null) { if (detailEntry.getValue() == null) {
throw new InvalidParameterValueException("Please specify a GPU Card."); throw new InvalidParameterValueException("Please specify a GPU Card.");
@ -2157,14 +2156,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
if (detailEntry.getValue() == null) { if (detailEntry.getValue() == null) {
throw new InvalidParameterValueException("vGPUType value cannot be null"); throw new InvalidParameterValueException("vGPUType value cannot be null");
} }
for (GPU.vGPUType entry : GPU.vGPUType.values()) {
if (detailEntry.getValue().equals(entry.getType())) {
value = entry.getType();
}
}
if (value == null) {
throw new InvalidParameterValueException("Please specify valid vGPU type");
}
} }
detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue(), true)); detailsVO.add(new ServiceOfferingDetailsVO(offering.getId(), detailEntry.getKey(), detailEntry.getValue(), true));
} }

16
ui/scripts/configuration.js
View File

@ -475,8 +475,8 @@
}); });
var vGpuMap = {}; var vGpuMap = {};
vGpuMap['Group of NVIDIA Corporation GK107GL [GRID K1] GPUs'] = ['passthrough', 'GRID K100', 'GRID K120Q', 'GRID K140Q']; vGpuMap['Group of NVIDIA Corporation GK107GL [GRID K1] GPUs'] = ['passthrough', 'GRID K100', 'GRID K120Q', 'GRID K140Q', 'GRID K160Q', 'GRID K180Q'];
vGpuMap['Group of NVIDIA Corporation GK104GL [GRID K2] GPUs'] = ['passthrough', 'GRID K200', 'GRID K220Q', 'GRID K240Q', 'GRID K260Q']; vGpuMap['Group of NVIDIA Corporation GK104GL [GRID K2] GPUs'] = ['passthrough', 'GRID K200', 'GRID K220Q', 'GRID K240Q', 'GRID K260Q', 'GRID K280Q'];
args.$select.change(function() { args.$select.change(function() {
var gpu = $(this).val(); var gpu = $(this).val();
@ -532,6 +532,14 @@
id: 'GRID K140Q', id: 'GRID K140Q',
description: 'GRID K140Q' description: 'GRID K140Q'
}); });
items.push({
id: 'GRID K160Q',
description: 'GRID K160Q'
});
items.push({
id: 'GRID K180Q',
description: 'GRID K180Q'
});
items.push({ items.push({
id: 'GRID K200', id: 'GRID K200',
description: 'GRID K200' description: 'GRID K200'
@ -548,6 +556,10 @@
id: 'GRID K260Q', id: 'GRID K260Q',
description: 'GRID K260Q' description: 'GRID K260Q'
}); });
items.push({
id: 'GRID K280Q',
description: 'GRID K280Q'
});
args.response.success({ args.response.success({
data: items data: items
}); });