diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 7dac1431fad..1f71c0f2691 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -2147,7 +2147,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } detailsVO = new ArrayList(); for (Entry detailEntry : details.entrySet()) { - String value = null; if (detailEntry.getKey().equals(GPU.Keys.pciDevice.toString())) { if (detailEntry.getValue() == null) { throw new InvalidParameterValueException("Please specify a GPU Card."); @@ -2157,14 +2156,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (detailEntry.getValue() == 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)); } diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index b074b001b43..f88ba851597 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -475,8 +475,8 @@ }); var vGpuMap = {}; - vGpuMap['Group of NVIDIA Corporation GK107GL [GRID K1] GPUs'] = ['passthrough', 'GRID K100', 'GRID K120Q', 'GRID K140Q']; - vGpuMap['Group of NVIDIA Corporation GK104GL [GRID K2] GPUs'] = ['passthrough', 'GRID K200', 'GRID K220Q', 'GRID K240Q', 'GRID K260Q']; + 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', 'GRID K280Q']; args.$select.change(function() { var gpu = $(this).val(); @@ -532,6 +532,14 @@ id: 'GRID K140Q', description: 'GRID K140Q' }); + items.push({ + id: 'GRID K160Q', + description: 'GRID K160Q' + }); + items.push({ + id: 'GRID K180Q', + description: 'GRID K180Q' + }); items.push({ id: 'GRID K200', description: 'GRID K200' @@ -548,6 +556,10 @@ id: 'GRID K260Q', description: 'GRID K260Q' }); + items.push({ + id: 'GRID K280Q', + description: 'GRID K280Q' + }); args.response.success({ data: items });