CLOUDSTACK-999: hyper-V: UI > Add Primary Storage > when hypervisor type of selected cluster is Hyperv, populate Protocol dropdown with only one option "SMB/cifs".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8ec1f3f8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8ec1f3f8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8ec1f3f8
Branch: refs/heads/disk-cache
Commit: 8ec1f3f8d079244a2a1db7d2bc9e13f0d954f6fc
Parents: 59453ea
Author: Jessica Wang <je...@apache.org>
Authored: Thu Nov 14 11:41:32 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Nov 14 11:42:59 2013 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 37 +++++++++++++------------------------
ui/scripts/zoneWizard.js | 39 ++++++++++++++-------------------------
2 files changed, 27 insertions(+), 49 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ec1f3f8/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index bba5321..6062135 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -13524,11 +13524,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -13549,11 +13545,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "PreSetup",
description: "PreSetup"
@@ -13570,15 +13562,20 @@
items.push({
id: "nfs",
description: "nfs"
+ });
+ items.push({
+ id: "vmfs",
+ description: "vmfs"
+ });
+ args.response.success({
+ data: items
});
+ } else if (selectedClusterObj.hypervisortype == "Hyperv") {
+ var items = [];
items.push({
id: "SMB",
description: "SMB/cifs"
});
- items.push({
- id: "vmfs",
- description: "vmfs"
- });
args.response.success({
data: items
});
@@ -13587,11 +13584,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "ocfs2",
description: "ocfs2"
@@ -13604,11 +13597,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8ec1f3f8/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index c5db0f9..f84812e 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -1473,11 +1473,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -1494,11 +1490,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "PreSetup",
description: "PreSetup"
@@ -1515,11 +1507,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "vmfs",
description: "vmfs"
@@ -1527,16 +1515,21 @@
args.response.success({
data: items
});
+ } else if (selectedClusterObj.hypervisortype == "Hyperv") {
+ var items = [];
+ items.push({
+ id: "SMB",
+ description: "SMB/cifs"
+ });
+ args.response.success({
+ data: items
+ });
} else if (selectedClusterObj.hypervisortype == "Ovm") {
var items = [];
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "ocfs2",
description: "ocfs2"
@@ -1549,11 +1542,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
- items.push({
- id: "SMB",
- description: "SMB/cifs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"