From 0ad1a517a28feb497858dbcfddb23ec8da06cb25 Mon Sep 17 00:00:00 2001
From: Anshul Gangwar <anshul.gangwar@citrix.com>
Date: Fri, 21 Mar 2014 12:05:23 +0530
Subject: [PATCH] CLOUDSTACK-6267: unblocking smb as zone wide primary storage
 for hyperv

Signed-off-by: Devdeep Singh <devdeep@gmail.com>
---
 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(-)

diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java
index 3b29b336248..c27a457f0e5 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);
             }
         }
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index cdd02b29fdc..ab5cbe97801 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
                                             });
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index 988e0f98385..ab01c40be40 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',