cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [48/50] [abbrv] git commit: updated refs/heads/master to 7072d8d
Date Thu, 16 Oct 2014 13:26:20 GMT
CLOUDSTACK-7739: Add new vGPU types K160Q, K180Q, K280Q to the CloudStack UI.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/420d4e0d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/420d4e0d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/420d4e0d

Branch: refs/heads/master
Commit: 420d4e0da0307a8e7b0e530da1a5aedcc209516e
Parents: 5025071
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Wed Oct 15 11:19:50 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Thu Oct 16 14:25:30 2014 +0530

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java     |  9 ---------
 ui/scripts/configuration.js                         | 16 ++++++++++++++--
 2 files changed, 14 insertions(+), 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/420d4e0d/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 7dac143..1f71c0f 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<ServiceOfferingDetailsVO>();
             for (Entry<String, String> 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));
             }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/420d4e0d/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index b074b00..f88ba85 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();
@@ -533,6 +533,14 @@
                                                 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
                                             });


Mime
View raw message