cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kous...@apache.org
Subject [6/8] git commit: updated refs/heads/master to ef9830d
Date Tue, 09 Dec 2014 09:30:03 GMT
CLOUDSTACK-8047: UI > zone wizard > add primary storage step: (zone-wide-primary-storage)
fix a bug that failed to get cluster's hypervisor value if previous step (e.g. add host step)
has ever failed.


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

Branch: refs/heads/master
Commit: 0af15e4a2cc7ead3764856567b35d8dddcc09d8e
Parents: be38b97
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Dec 8 15:18:01 2014 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Dec 8 15:18:01 2014 -0800

----------------------------------------------------------------------
 ui/scripts/zoneWizard.js | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0af15e4a/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 2c90f2b..4ce4efb 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -4458,8 +4458,16 @@
                     array1.push("&scope=" + todb(args.data.primaryStorage.scope));
 
                     //zone-wide-primary-storage is supported only for KVM and VMWare
-                    if (args.data.primaryStorage.scope == "zone") {
-                        array1.push("&hypervisor=" + todb(args.data.cluster.hypervisor));
//hypervisor type of the hosts in zone that will be attached to this storage pool. KVM, VMware
supported as of now.
+                    if (args.data.primaryStorage.scope == "zone") { //hypervisor type of
the hosts in zone that will be attached to this storage pool. KVM, VMware supported as of
now.
+                        if(args.data.cluster.hypervisor != undefined) {        
+                    	    array1.push("&hypervisor=" + todb(args.data.cluster.hypervisor));

+                        } else if(args.data.returnedCluster.hypervisortype != undefined)
{        
+                    	    array1.push("&hypervisor=" + todb(args.data.returnedCluster.hypervisortype));

+                        } else {
+                        	cloudStack.dialog.notice({
+                            	message: "Error: args.data.cluster.hypervisor is undefined.
So is args.data.returnedCluster.hypervisortype (zone-wide-primary-storage)"
+                            });     
+                        }
                     }
 
                     var server = args.data.primaryStorage.server;


Mime
View raw message