cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mc...@apache.org
Subject [19/35] git commit: updated refs/heads/object_store to e64030a
Date Fri, 29 Mar 2013 23:36:09 GMT
Zone wide primary storage is not supported for Xenserver as the Hypervisor but for KVM only


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

Branch: refs/heads/object_store
Commit: 5259a13e4156f54ddd8c30c7d361921f33a2e589
Parents: ee3fd18
Author: Pranav Saxena <pranav.saxena@citrix.com>
Authored: Fri Mar 29 20:45:44 2013 +0530
Committer: Pranav Saxena <pranav.saxena@citrix.com>
Committed: Fri Mar 29 20:45:44 2013 +0530

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5259a13e/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index c09da8a..11db4db 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1185,16 +1185,32 @@
            scope: {
                     label: 'label.scope',
                     select: function(args) {
+                    
+             var selectedHypervisorObj = {
+                hypervisortype: $.isArray(args.context.zones[0].hypervisor) ?
+                  // We want the cluster's hypervisor type
+                  args.context.zones[0].hypervisor[1] : args.context.zones[0].hypervisor
+              };
+
+              if(selectedHypervisorObj == null) {
+                return;
+              }
 
-            var scope = [
-                        { id: 'zone', description: _l('label.zone.wide') },
-                        { id: 'cluster', description: _l('label.cluster') },
-                        { id: 'host', description: _l('label.host') }
-                      ];
+                // ZWPS not supported for Xenserver
+             if(selectedHypervisorObj.hypervisortype == "XenServer"){
+                       var scope=[];
+                       scope.push({ id: 'cluster', description: _l('label.cluster') });
+                       scope.push({ id: 'host', description: _l('label.host') });
+                       args.response.success({data: scope});
+                    }
 
-                      args.response.success({
-                        data: scope
-                      });
+              else {
+                       var scope=[];
+                       scope.push({ id: 'zone', description: _l('label.zone.wide') });
+                       scope.push({ id: 'cluster', description: _l('label.cluster') });
+                       scope.push({ id: 'host', description: _l('label.host') });
+                       args.response.success({data: scope});
+                    }
 
                 }
 


Mime
View raw message