cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devd...@apache.org
Subject git commit: updated refs/heads/4.4 to 0ad1a51
Date Thu, 27 Mar 2014 10:32:51 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.4 38b8677e0 -> 0ad1a517a


CLOUDSTACK-6267: unblocking smb as zone wide primary storage for hyperv

Signed-off-by: Devdeep Singh <devdeep@gmail.com>


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

Branch: refs/heads/4.4
Commit: 0ad1a517a28feb497858dbcfddb23ec8da06cb25
Parents: 38b8677
Author: Anshul Gangwar <anshul.gangwar@citrix.com>
Authored: Fri Mar 21 12:05:23 2014 +0530
Committer: Devdeep Singh <devdeep@gmail.com>
Committed: Thu Mar 27 15:09:35 2014 +0530

----------------------------------------------------------------------
 server/src/com/cloud/storage/StorageManagerImpl.java | 2 +-
 ui/scripts/system.js                                 | 6 +++++-
 ui/scripts/zoneWizard.js                             | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ad1a517/server/src/com/cloud/storage/StorageManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 3b29b33..c27a457 100755
--- a/server/src/com/cloud/storage/StorageManagerImpl.java
+++ b/server/src/com/cloud/storage/StorageManagerImpl.java
@@ -618,7 +618,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager,
C
             } else {
                 throw new InvalidParameterValueException("Missing parameter hypervisor. Hypervisor
type is required to create zone wide primary storage.");
             }
-            if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.VMware
&& hypervisorType != HypervisorType.Any) {
+            if (hypervisorType != HypervisorType.KVM && hypervisorType != HypervisorType.VMware
&& hypervisorType != HypervisorType.Hyperv && hypervisorType != HypervisorType.Any)
{
                 throw new InvalidParameterValueException("zone wide storage pool is not supported
for hypervisor type " + hypervisor);
             }
         }

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ad1a517/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index cdd02b2..ab5cbe9 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -15131,7 +15131,11 @@
                                                 id: 'VMware',
                                                 description: _l('VMware')
                                             });
-                                            
+                                            items.push({
+                                                id: 'Hyperv',
+                                                description: _l('Hyperv')
+                                            });
+
                                             args.response.success({
                                                 data: items
                                             });

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0ad1a517/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 988e0f9..ab01c40 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1429,8 +1429,8 @@
                                 return;
                             }
 
-                            //zone-wide-primary-storage is supported only for KVM and VMWare
-                            if (selectedHypervisorObj.hypervisortype == "KVM" || selectedHypervisorObj.hypervisortype
== "VMware") {
+                            //zone-wide-primary-storage is supported only for KVM and VMWare
and Hyperv
+                            if (selectedHypervisorObj.hypervisortype == "KVM" || selectedHypervisorObj.hypervisortype
== "VMware" || selectedHypervisorObj.hypervisortype == "Hyperv") {
                                 var scope = [];
                                 scope.push({
                                     id: 'zone',


Mime
View raw message