cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sanjaytripa...@apache.org
Subject git commit: updated refs/heads/master to 5eaf3be
Date Fri, 18 Apr 2014 08:15:33 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 29f39149b -> 5eaf3be44


CLOUDSTACK-6447: Grid K120Q and K220Q vGPU types are missing in create service offering menu.


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

Branch: refs/heads/master
Commit: 5eaf3be44af565a507401513029ba6ff793cd8d4
Parents: 29f3914
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Authored: Fri Apr 18 13:19:35 2014 +0530
Committer: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Committed: Fri Apr 18 13:49:26 2014 +0530

----------------------------------------------------------------------
 api/src/com/cloud/gpu/GPU.java |  2 ++
 ui/scripts/configuration.js    | 12 ++++++++++--
 2 files changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eaf3be4/api/src/com/cloud/gpu/GPU.java
----------------------------------------------------------------------
diff --git a/api/src/com/cloud/gpu/GPU.java b/api/src/com/cloud/gpu/GPU.java
index 0df821f..9177edb 100644
--- a/api/src/com/cloud/gpu/GPU.java
+++ b/api/src/com/cloud/gpu/GPU.java
@@ -26,8 +26,10 @@ public class GPU {
 
     public enum vGPUType {
         GRID_K100("GRID K100"),
+        GRID_K120Q("GRID K120Q"),
         GRID_K140Q("GRID K140Q"),
         GRID_K200("GRID K200"),
+        GRID_K220Q("GRID K220Q"),
         GRID_K240Q("GRID K240Q"),
         GRID_K260("GRID K260Q"),
         passthrough("passthrough");

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5eaf3be4/ui/scripts/configuration.js
----------------------------------------------------------------------
diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js
index 0e0adee..0d32ffd 100644
--- a/ui/scripts/configuration.js
+++ b/ui/scripts/configuration.js
@@ -404,8 +404,8 @@
                                             });
 
                                             var vGpuMap = {};
-                                            vGpuMap['Group of NVIDIA Corporation GK107GL
[GRID K1] GPUs'] = ['passthrough', 'GRID K100', 'GRID K140Q'];
-                                            vGpuMap['Group of NVIDIA Corporation GK104GL
[GRID K2] GPUs'] = ['passthrough', 'GRID K200', 'GRID K240Q', 'GRID K260Q'];
+                                            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'];
 
                                             args.$select.change(function() {
                                                 var gpu = $(this).val();
@@ -454,6 +454,10 @@
                                                 description: 'GRID K100'
                                             });
                                             items.push({
+                                                id: 'GRID K120Q',
+                                                description: 'GRID K120Q'
+                                            });
+                                            items.push({
                                                 id: 'GRID K140Q',
                                                 description: 'GRID K140Q'
                                             });
@@ -462,6 +466,10 @@
                                                 description: 'GRID K200'
                                             });
                                             items.push({
+                                                id: 'GRID K220Q',
+                                                description: 'GRID K220Q'
+                                            });
+                                            items.push({
                                                 id: 'GRID K240Q',
                                                 description: 'GRID K240Q'
                                             });


Mime
View raw message