');
-
+
var itemName = multiRule._itemName ? item[multiRule._itemName] : item.name;
var $itemName = $('').html(_s(itemName));
@@ -727,14 +727,14 @@
});
});
-
+
var itemIp = multiRule._itemIp ? item[multiRule._itemIp] : null;
if (itemIp != null) {
var $itemIp = $('').html(_s(itemIp));
$tr.append($('| ').addClass('state').appendTo($tr).append($itemIp));
- }
-
-
+ }
+
+
var itemState = item._itemState ? item._itemState : item.state;
$tr.append($(' | ').addClass('state').appendTo($tr).append(
@@ -993,7 +993,7 @@
.appendTo($td);
if (field.validation) {
- $td.find('input').first().data("validation-settings", field.validation );
+ $td.find('input').first().data("validation-settings", field.validation );
}
if (field.isDisabled) $input.hide();
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
index dc1f47cb71f..54e80c9c8ac 100644
--- a/ui/scripts/vpc.js
+++ b/ui/scripts/vpc.js
@@ -31,7 +31,7 @@
subselect: {
isMultiple: true,
label: 'label.use.vm.ip',
- dataProvider: function(args) {
+ dataProvider: function(args) {
var instance = args.context.instances[0];
var network = args.context.networks[0];
@@ -41,7 +41,7 @@
virtualmachineid: instance.id,
nicId: instance.nic[0].id
},
- success: function(json) {
+ success: function(json) {
var nic = json.listnicsresponse.nic[0];
var primaryIp = nic.ipaddress;
var secondaryIps = nic.secondaryip ? nic.secondaryip : [];
@@ -126,14 +126,14 @@
});
}
}),
- action: function(args) {
+ action: function(args) {
/*
- * path 1: Network > VPC (list) > click "Configure" > pick an internal LB tier > click "Internal LB" (list) > click on a grid row (Details tab) > click "Assign VMs" tab > click Assign VMs" button on top of list
- * path 2: Network > VPC (list) > click "Configure" > pick an internal LB tier > click "Internal LB" (list) > "QuickView" on a grid row > click "Assign VMs" button in QuickView
- */
+ * path 1: Network > VPC (list) > click "Configure" > pick an internal LB tier > click "Internal LB" (list) > click on a grid row (Details tab) > click "Assign VMs" tab > click Assign VMs" button on top of list
+ * path 2: Network > VPC (list) > click "Configure" > pick an internal LB tier > click "Internal LB" (list) > "QuickView" on a grid row > click "Assign VMs" button in QuickView
+ */
var $rows = $(':ui-dialog .list-view tbody tr');
var vms = args.context.instances;
-
+
// Assign subselect values
$(vms).each(function() {
var vm = this;
@@ -155,41 +155,41 @@
};
*/
//virtualmachineids parameter has been replaced with vmidipmap parameter, so comment out the lines above.
-
-
+
+
var inputData = {
id: args.context.internalLoadBalancers[0].id
- };
- /*
+ };
+ /*
* e.g. first VM(xxx) has two IPs(10.1.1.~), second VM(yyy) has three IPs(10.2.2.~):
- * vmidipmap[0].vmid=xxx vmidipmap[0].vmip=10.1.1.11
- * vmidipmap[1].vmid=xxx vmidipmap[1].vmip=10.1.1.12
- * vmidipmap[2].vmid=yyy vmidipmap[2].vmip=10.2.2.77
- * vmidipmap[3].vmid=yyy vmidipmap[3].vmip=10.2.2.78
- * vmidipmap[4].vmid=yyy vmidipmap[4].vmip=10.2.2.79
+ * vmidipmap[0].vmid=xxx vmidipmap[0].vmip=10.1.1.11
+ * vmidipmap[1].vmid=xxx vmidipmap[1].vmip=10.1.1.12
+ * vmidipmap[2].vmid=yyy vmidipmap[2].vmip=10.2.2.77
+ * vmidipmap[3].vmid=yyy vmidipmap[3].vmip=10.2.2.78
+ * vmidipmap[4].vmid=yyy vmidipmap[4].vmip=10.2.2.79
*/
var selectedVMs = vms;
if (selectedVMs != null) {
var vmidipmapIndex = 0;
- for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) {
+ for (var vmIndex = 0; vmIndex < selectedVMs.length; vmIndex++) {
var selectedIPs = selectedVMs[vmIndex]._subselect;
for (var ipIndex = 0; ipIndex < selectedIPs.length; ipIndex++) {
inputData['vmidipmap[' + vmidipmapIndex + '].vmid'] = selectedVMs[vmIndex].id;
-
- //"ipAddresses" is not in args.context since this LB rule is under a VPC, not an address.
+
+ //"ipAddresses" is not in args.context since this LB rule is under a VPC, not an address.
/*
if (args.context.ipAddresses[0].isportable) {
- inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1];
+ inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex].split(',')[1];
} else {
inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex];
}
*/
inputData['vmidipmap[' + vmidipmapIndex + '].vmip'] = selectedIPs[ipIndex];
-
+
vmidipmapIndex++;
- }
+ }
}
- }
+ }
$.ajax({
url: createURL('assignToLoadBalancerRule'),
@@ -211,10 +211,10 @@
}
};
};
-
+
var aclMultiEdit = {
noSelect: true,
-
+
reorder: {
moveDrag: {
action: function(args) {
@@ -1192,12 +1192,12 @@
label: 'label.id'
}
},
- dataProvider: function(args) {
+ dataProvider: function(args) {
var data = {
vpcid: args.context.vpc[0].id
- };
+ };
listViewDataProvider(args, data);
-
+
$.ajax({
url: createURL('listNetworkACLLists'),
data: data,
@@ -2281,7 +2281,7 @@
if (this.id == args.context.vpcGateways[0].aclid) {
return true;
}
-
+
items.push({
id: this.id,
description: this.name
@@ -2289,7 +2289,7 @@
return true;
});
-
+
args.response.success({
data: items
});
@@ -2412,13 +2412,13 @@
success: function(json) {
var objs = json.listnetworkacllistsresponse.networkacllist;
var acl = $.grep(objs, function(obj) {
- return obj.id === args.context.vpcGateways[0].aclid;
+ return obj.id === args.context.vpcGateways[0].aclid;
});
-
+
item.aclName = acl[0] ? acl[0].name : 'None';
}
});
-
+
args.response.success({
data: item,
actionFilter: function(args) {
@@ -2813,12 +2813,12 @@
}
});
}
- },
+ },
passive: {
label: 'label.passive',
isBoolean: true,
isChecked: false
- }
+ }
}
},
action: function(args) {
@@ -2882,10 +2882,10 @@
passive: {
label: 'label.passive',
converter: cloudStack.converters.toBooleanText
- },
+ },
publicip: {
label: 'label.ip.address'
- },
+ },
gateway: {
label: 'label.gateway'
},
@@ -3353,29 +3353,29 @@
tabFilter: function(args) {
var hiddenTabs = ['ipAddresses', 'acl']; // Disable IP address tab; it is redundant with 'view all' button
-
- var networkOfferingHavingELB = false;
+
+ var networkOfferingHavingELB = false;
var services = args.context.networks[0].service;
if(services != null) {
- for(var i = 0; i < services.length; i++) {
+ for(var i = 0; i < services.length; i++) {
if (services[i].name == "Lb") {
var capabilities = services[i].capability;
if(capabilities != null) {
for(var k = 0; k < capabilities.length; k++) {
if(capabilities[k].name == "ElasticLb") {
networkOfferingHavingELB = true;
- break;
+ break;
}
}
- }
+ }
break;
- }
+ }
}
- }
+ }
if (networkOfferingHavingELB == false) {
hiddenTabs.push("addloadBalancer");
}
-
+
return hiddenTabs;
},
@@ -3490,13 +3490,13 @@
});
}
});
-
+
//include currently selected network offeirng to dropdown
items.push({
id: args.context.networks[0].networkofferingid,
description: args.context.networks[0].networkofferingdisplaytext
- });
-
+ });
+
args.response.success({
data: items
});
@@ -3975,7 +3975,7 @@
zoneid: {
label: 'label.zone',
validation: {
- required: true
+ required: true
},
isHidden: true,
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index b895bb6a4cf..28d21f8f7a4 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -34,15 +34,15 @@
physicalNetworkID = zoneType == 'Advanced' ? physicalNetworkID : 0;
var physicalNetwork = data.physicalNetworks ? data.physicalNetworks[physicalNetworkID] : null;
var trafficConfig = physicalNetwork ? physicalNetwork.trafficTypeConfiguration[trafficTypeID] : null;
-
- var trafficLabel;
+
+ var trafficLabel;
if (trafficConfig != null) {
if ('label' in trafficConfig) {
trafficLabel = trafficConfig.label;
}
else {
trafficLabel = '';
-
+
if ('vSwitchName' in trafficConfig) {
trafficLabel += trafficConfig.vSwitchName;
}
@@ -56,17 +56,17 @@
trafficLabel += ',';
trafficLabel += trafficConfig.vSwitchType;
}
-
+
if (trafficLabel.length == 0) { //trafficLabel == ''
trafficLabel = null;
- } else if (trafficLabel.length >= 1) {
- if (trafficLabel.charAt(trafficLabel.length-1) == ',') { //if last character is comma
- trafficLabel = trafficLabel.substring(0, trafficLabel.length - 1); //remove the last character (which is comma)
+ } else if (trafficLabel.length >= 1) {
+ if (trafficLabel.charAt(trafficLabel.length-1) == ',') { //if last character is comma
+ trafficLabel = trafficLabel.substring(0, trafficLabel.length - 1); //remove the last character (which is comma)
}
- }
+ }
}
}
-
+
var hypervisorAttr, trafficLabelStr;
switch (hypervisor) {
@@ -503,10 +503,10 @@
nonSupportedHypervisors["Ovm3"] = 1;
}
- if (args.context.zones[0]['network-model'] == "Advanced") { //CLOUDSTACK-7681: UI > zone wizard > Advanced zone > hypervisor => do not support BareMetal
- nonSupportedHypervisors["BareMetal"] = 1;
+ if (args.context.zones[0]['network-model'] == "Advanced") { //CLOUDSTACK-7681: UI > zone wizard > Advanced zone > hypervisor => do not support BareMetal
+ nonSupportedHypervisors["BareMetal"] = 1;
}
-
+
if (items != null) {
for (var i = 0; i < items.length; i++) {
if (items[i].name in nonSupportedHypervisors)
@@ -645,10 +645,10 @@
required: false
}
},
- isdedicated: {
+ isdedicated: {
isBoolean: true,
label: 'label.dedicated',
- isChecked: false
+ isChecked: false
},
domain: {
label: 'label.domain',
@@ -963,7 +963,7 @@
if ($(this).val() == "VMware") {
//$('li[input_sub_group="external"]', $dialogAddCluster).show();
if (dvSwitchEnabled) {
- /*
+ /*
$fields.filter('[rel=vSwitchPublicType]').css('display', 'inline-block');
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'inline-block');
@@ -983,7 +983,7 @@
} else {
- /*
+ /*
$form.find('.form-item[rel=vSwitchPublicType]').css('display', 'none');
$form.find('.form-item[rel=vSwitchGuestType]').css('display', 'none');
$form.find('.form-item[rel=vSwitchPublicName]').css('display','none');
@@ -1139,7 +1139,7 @@
dependsOn: 'overridepublictraffic'
},
*/
-
+
/*
vSwitchPublicName: {
label: 'Public Traffic vSwitch Name',
@@ -1147,7 +1147,7 @@
isHidden: true
},
*/
-
+
overrideguesttraffic: {
label: 'label.override.guest.traffic',
isBoolean: true,
@@ -1221,7 +1221,7 @@
},
*/
-
+
/*
vSwitchGuestName: {
label: 'Guest Traffic vSwitch Name',
@@ -1569,7 +1569,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -1590,7 +1590,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "PreSetup",
description: "PreSetup"
@@ -1607,7 +1607,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "vmfs",
description: "vmfs"
@@ -1615,8 +1615,8 @@
args.response.success({
data: items
});
- } else if (selectedClusterObj.hypervisortype == "Hyperv") {
- var items = [];
+ } else if (selectedClusterObj.hypervisortype == "Hyperv") {
+ var items = [];
items.push({
id: "SMB",
description: "SMB/CIFS"
@@ -1629,7 +1629,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "ocfs2",
description: "ocfs2"
@@ -1642,7 +1642,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -1675,154 +1675,154 @@
if (protocol == null)
return;
- if (protocol == "nfs") {
- $form.find('[rel=server]').css('display', 'block');
+ if (protocol == "nfs") {
+ $form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
-
- $form.find('[rel=path]').css('display', 'block');
-
- $form.find('[rel=smbUsername]').hide();
- $form.find('[rel=smbPassword]').hide();
- $form.find('[rel=smbDomain]').hide();
-
- $form.find('[rel=iqn]').hide();
- $form.find('[rel=lun]').hide();
-
- $form.find('[rel=volumegroup]').hide();
-
- $form.find('[rel=vCenterDataCenter]').hide();
- $form.find('[rel=vCenterDataStore]').hide();
- $form.find('[rel=glustervolume]').hide();
- } else if (protocol == "SMB") { //"SMB" show almost the same fields as "nfs" does, except 3 more SMB-specific fields.
- $form.find('[rel=server]').css('display', 'block');
- $form.find('[rel=server]').find(".value").find("input").val("");
-
- $form.find('[rel=path]').css('display', 'block');
-
- $form.find('[rel=smbUsername]').css('display', 'block');
- $form.find('[rel=smbPassword]').css('display', 'block');
- $form.find('[rel=smbDomain]').css('display', 'block');
-
- $form.find('[rel=iqn]').hide();
- $form.find('[rel=lun]').hide();
-
- $form.find('[rel=volumegroup]').hide();
-
- $form.find('[rel=vCenterDataCenter]').hide();
- $form.find('[rel=vCenterDataStore]').hide();
- $form.find('[rel=glustervolume]').hide();
- } else if (protocol == "ocfs2") { //ocfs2 is the same as nfs, except no server field.
- $form.find('[rel=server]').hide();
- $form.find('[rel=server]').find(".value").find("input").val("");
-
$form.find('[rel=path]').css('display', 'block');
-
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
$form.find('[rel=iqn]').hide();
$form.find('[rel=lun]').hide();
-
+
$form.find('[rel=volumegroup]').hide();
-
+
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
-
$form.find('[rel=glustervolume]').hide();
- } else if (protocol == "PreSetup") {
- $form.find('[rel=server]').hide();
- $form.find('[rel=server]').find(".value").find("input").val("localhost");
-
- $form.find('[rel=path]').css('display', 'block');
- $form.find('[rel=path]').find(".name").find("label").html('*'+_l('label.SR.name')+':');
-
- $form.find('[rel=smbUsername]').hide();
- $form.find('[rel=smbPassword]').hide();
- $form.find('[rel=smbDomain]').hide();
-
- $form.find('[rel=iqn]').hide();
- $form.find('[rel=lun]').hide();
-
- $form.find('[rel=volumegroup]').hide();
-
- $form.find('[rel=vCenterDataCenter]').hide();
- $form.find('[rel=vCenterDataStore]').hide();
-
- $form.find('[rel=glustervolume]').hide();
- } else if (protocol == "iscsi") {
- $form.find('[rel=server]').css('display', 'block');
+ } else if (protocol == "SMB") { //"SMB" show almost the same fields as "nfs" does, except 3 more SMB-specific fields.
+ $form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
-
- $form.find('[rel=path]').hide();
-
+
+ $form.find('[rel=path]').css('display', 'block');
+
+ $form.find('[rel=smbUsername]').css('display', 'block');
+ $form.find('[rel=smbPassword]').css('display', 'block');
+ $form.find('[rel=smbDomain]').css('display', 'block');
+
+ $form.find('[rel=iqn]').hide();
+ $form.find('[rel=lun]').hide();
+
+ $form.find('[rel=volumegroup]').hide();
+
+ $form.find('[rel=vCenterDataCenter]').hide();
+ $form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
+ } else if (protocol == "ocfs2") { //ocfs2 is the same as nfs, except no server field.
+ $form.find('[rel=server]').hide();
+ $form.find('[rel=server]').find(".value").find("input").val("");
+
+ $form.find('[rel=path]').css('display', 'block');
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
+ $form.find('[rel=iqn]').hide();
+ $form.find('[rel=lun]').hide();
+
+ $form.find('[rel=volumegroup]').hide();
+
+ $form.find('[rel=vCenterDataCenter]').hide();
+ $form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
+ } else if (protocol == "PreSetup") {
+ $form.find('[rel=server]').hide();
+ $form.find('[rel=server]').find(".value").find("input").val("localhost");
+
+ $form.find('[rel=path]').css('display', 'block');
+ $form.find('[rel=path]').find(".name").find("label").html('*'+_l('label.SR.name')+':');
+
+ $form.find('[rel=smbUsername]').hide();
+ $form.find('[rel=smbPassword]').hide();
+ $form.find('[rel=smbDomain]').hide();
+
+ $form.find('[rel=iqn]').hide();
+ $form.find('[rel=lun]').hide();
+
+ $form.find('[rel=volumegroup]').hide();
+
+ $form.find('[rel=vCenterDataCenter]').hide();
+ $form.find('[rel=vCenterDataStore]').hide();
+
+ $form.find('[rel=glustervolume]').hide();
+ } else if (protocol == "iscsi") {
+ $form.find('[rel=server]').css('display', 'block');
+ $form.find('[rel=server]').find(".value").find("input").val("");
+
+ $form.find('[rel=path]').hide();
+
+ $form.find('[rel=smbUsername]').hide();
+ $form.find('[rel=smbPassword]').hide();
+ $form.find('[rel=smbDomain]').hide();
+
$form.find('[rel=iqn]').css('display', 'block');
$form.find('[rel=lun]').css('display', 'block');
-
+
$form.find('[rel=volumegroup]').hide();
-
+
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
$form.find('[rel=glustervolume]').hide();
- } else if ($(this).val() == "clvm") {
- $form.find('[rel=server]').hide();
+ } else if ($(this).val() == "clvm") {
+ $form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("localhost");
-
+
$form.find('[rel=path]').hide();
-
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
$form.find('[rel=iqn]').hide();
$form.find('[rel=lun]').hide();
-
+
$form.find('[rel=volumegroup]').css('display', 'inline-block');
-
+
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
$form.find('[rel=glustervolume]').hide();
- } else if (protocol == "vmfs") {
- $form.find('[rel=server]').css('display', 'block');
+ } else if (protocol == "vmfs") {
+ $form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
-
+
$form.find('[rel=path]').hide();
-
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
$form.find('[rel=iqn]').hide();
$form.find('[rel=lun]').hide();
-
+
$form.find('[rel=volumegroup]').hide();
-
+
$form.find('[rel=vCenterDataCenter]').css('display', 'block');
$form.find('[rel=vCenterDataStore]').css('display', 'block');
$form.find('[rel=glustervolume]').hide();
- } else if (protocol == "SharedMountPoint") { //"SharedMountPoint" show the same fields as "nfs" does.
- $form.find('[rel=server]').hide();
+ } else if (protocol == "SharedMountPoint") { //"SharedMountPoint" show the same fields as "nfs" does.
+ $form.find('[rel=server]').hide();
$form.find('[rel=server]').find(".value").find("input").val("localhost");
-
- $form.find('[rel=path]').css('display', 'block');
-
+
+ $form.find('[rel=path]').css('display', 'block');
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
$form.find('[rel=iqn]').hide();
$form.find('[rel=lun]').hide();
-
+
$form.find('[rel=volumegroup]').hide();
-
+
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
@@ -1832,7 +1832,7 @@
$form.find('[rel=server]').find(".value").find("input").val("");
$form.find('[rel=path]').hide();
-
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
@@ -1846,19 +1846,19 @@
$form.find('[rel=vCenterDataStore]').hide();
$form.find('[rel=glustervolume]').css('display', 'block');
- } else {
- $form.find('[rel=server]').css('display', 'block');
+ } else {
+ $form.find('[rel=server]').css('display', 'block');
$form.find('[rel=server]').find(".value").find("input").val("");
-
+
$form.find('[rel=smbUsername]').hide();
$form.find('[rel=smbPassword]').hide();
$form.find('[rel=smbDomain]').hide();
-
+
$form.find('[rel=iqn]').hide();
$form.find('[rel=lun]').hide();
-
+
$form.find('[rel=volumegroup]').hide();
-
+
$form.find('[rel=vCenterDataCenter]').hide();
$form.find('[rel=vCenterDataStore]').hide();
@@ -1893,7 +1893,7 @@
required: true
},
isHidden: true
- },
+ },
smbUsername: {
label: 'label.smb.username',
validation: {
@@ -1909,8 +1909,8 @@
},
isHidden: true
},
-
-
+
+
//iscsi
iqn: {
label: 'label.target.iqn',
@@ -1972,45 +1972,45 @@
}
},
secondaryStorage: {
- fields: {
+ fields: {
provider: {
label: 'label.provider',
select: function(args) {
- var storageproviders = [];
- storageproviders.push({ id: '', description: ''});
-
+ var storageproviders = [];
+ storageproviders.push({ id: '', description: ''});
+
$.ajax({
url: createURL('listImageStores'),
data: {
provider: 'S3'
},
async: true,
- success: function(json) {
+ success: function(json) {
var s3stores = json.listimagestoresresponse.imagestore;
- if(s3stores != null && s3stores.length > 0) {
- storageproviders.push({ id: 'S3', description: 'S3'}); //if (region-wide) S3 store exists already, only "S3" option should be included here. Any other type of store is not allowed to be created since cloudstack doesn't support multiple types of store at this point.
+ if(s3stores != null && s3stores.length > 0) {
+ storageproviders.push({ id: 'S3', description: 'S3'}); //if (region-wide) S3 store exists already, only "S3" option should be included here. Any other type of store is not allowed to be created since cloudstack doesn't support multiple types of store at this point.
} else {
- /*
+ /*
UI no longer gets providers from "listStorageProviders&type=image" because:
(1) Not all of returned values are handled by UI (e.g. Provider "NetApp" is not handled by UI).
- (2) Provider "SMB" which is handled by UI is not returned from "listStorageProviders&type=image"
+ (2) Provider "SMB" which is handled by UI is not returned from "listStorageProviders&type=image"
*/
storageproviders.push({ id: 'NFS', description: 'NFS'});
storageproviders.push({ id: 'SMB', description: 'SMB/CIFS'});
storageproviders.push({ id: 'S3', description: 'S3'});
- storageproviders.push({ id: 'Swift', description: 'Swift'});
- }
+ storageproviders.push({ id: 'Swift', description: 'Swift'});
+ }
args.response.success({
data: storageproviders
- });
-
- args.$select.change(function() {
+ });
+
+ args.$select.change(function() {
var $form = $(this).closest('form');
var $fields = $form.find('.field');
if ($(this).val() == "") {
$fields.filter('[rel=name]').hide();
-
+
//NFS
$fields.filter('[rel=zoneid]').hide();
$fields.filter('[rel=nfsServer]').hide();
@@ -2020,7 +2020,7 @@
$fields.filter('[rel=smbUsername]').hide();
$fields.filter('[rel=smbPassword]').hide();
$fields.filter('[rel=smbDomain]').hide();
-
+
//S3
$fields.filter('[rel=accesskey]').hide();
$fields.filter('[rel=secretkey]').hide();
@@ -2043,7 +2043,7 @@
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "NFS") {
$fields.filter('[rel=name]').css('display', 'inline-block');
-
+
//NFS
$fields.filter('[rel=zoneid]').css('display', 'inline-block');
$fields.filter('[rel=nfsServer]').css('display', 'inline-block');
@@ -2053,7 +2053,7 @@
$fields.filter('[rel=smbUsername]').hide();
$fields.filter('[rel=smbPassword]').hide();
$fields.filter('[rel=smbDomain]').hide();
-
+
//S3
$fields.filter('[rel=accesskey]').hide();
$fields.filter('[rel=secretkey]').hide();
@@ -2076,7 +2076,7 @@
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "SMB") {
$fields.filter('[rel=name]').css('display', 'inline-block');
-
+
//NFS
$fields.filter('[rel=zoneid]').css('display', 'inline-block');
$fields.filter('[rel=nfsServer]').css('display', 'inline-block');
@@ -2086,7 +2086,7 @@
$fields.filter('[rel=smbUsername]').css('display', 'inline-block');
$fields.filter('[rel=smbPassword]').css('display', 'inline-block');
$fields.filter('[rel=smbDomain]').css('display', 'inline-block');
-
+
//S3
$fields.filter('[rel=accesskey]').hide();
$fields.filter('[rel=secretkey]').hide();
@@ -2109,15 +2109,15 @@
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "S3") {
$fields.filter('[rel=name]').css('display', 'inline-block');
-
+
if(s3stores != null && s3stores.length > 0) {
$fields.filter('[rel=name]').find('input').val(s3stores[0].name);
$fields.filter('[rel=name]').find('input').attr("disabled", "disabled");
} else {
//$fields.filter('[rel=name]').find('input').val("");
$fields.filter('[rel=name]').find('input').removeAttr("disabled");
- }
-
+ }
+
//NFS
$fields.filter('[rel=zoneid]').hide();
$fields.filter('[rel=nfsServer]').hide();
@@ -2127,7 +2127,7 @@
$fields.filter('[rel=smbUsername]').hide();
$fields.filter('[rel=smbPassword]').hide();
$fields.filter('[rel=smbDomain]').hide();
-
+
//S3
if(s3stores != null && s3stores.length > 0) {
$fields.filter('[rel=accesskey]').hide();
@@ -2137,7 +2137,7 @@
$fields.filter('[rel=usehttps]').hide();
$fields.filter('[rel=connectiontimeout]').hide();
$fields.filter('[rel=maxerrorretry]').hide();
- $fields.filter('[rel=sockettimeout]').hide();
+ $fields.filter('[rel=sockettimeout]').hide();
} else {
$fields.filter('[rel=accesskey]').css('display', 'inline-block');
$fields.filter('[rel=secretkey]').css('display', 'inline-block');
@@ -2147,13 +2147,13 @@
$fields.filter('[rel=connectiontimeout]').css('display', 'inline-block');
$fields.filter('[rel=maxerrorretry]').css('display', 'inline-block');
$fields.filter('[rel=sockettimeout]').css('display', 'inline-block');
- }
+ }
$fields.filter('[rel=createNfsCache]').find('input').attr('checked', 'checked');
$fields.filter('[rel=createNfsCache]').find('input').attr("disabled", "disabled"); //Create NFS staging is required for S3 at this moment. So, disallow user to uncheck "Create NFS Secondary Staging" checkbox
$fields.filter('[rel=createNfsCache]').css('display', 'inline-block');
$fields.filter('[rel=nfsCacheNfsServer]').css('display', 'inline-block');
$fields.filter('[rel=nfsCachePath]').css('display', 'inline-block');
-
+
//Swift
$fields.filter('[rel=url]').hide();
$fields.filter('[rel=account]').hide();
@@ -2161,7 +2161,7 @@
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "Swift") {
$fields.filter('[rel=name]').css('display', 'inline-block');
-
+
//NFS
$fields.filter('[rel=zoneid]').hide();
$fields.filter('[rel=nfsServer]').hide();
@@ -2171,7 +2171,7 @@
$fields.filter('[rel=smbUsername]').hide();
$fields.filter('[rel=smbPassword]').hide();
$fields.filter('[rel=smbDomain]').hide();
-
+
//S3
$fields.filter('[rel=accesskey]').hide();
$fields.filter('[rel=secretkey]').hide();
@@ -2193,10 +2193,10 @@
$fields.filter('[rel=username]').css('display', 'inline-block');
$fields.filter('[rel=key]').css('display', 'inline-block');
}
- });
- args.$select.change();
+ });
+ args.$select.change();
}
- });
+ });
}
},
@@ -2204,7 +2204,7 @@
label: 'label.name',
isHidden: true
},
-
+
//NFS, SMB (begin)
nfsServer: {
label: 'label.server', //change label from "NFS Server" to "Server" since this field is also shown when provider "SMB/CIFS" is elected.
@@ -2223,7 +2223,7 @@
//NFS, SMB (end)
- //SMB (begin)
+ //SMB (begin)
smbDomain: {
label: 'label.smb.domain',
validation: {
@@ -2242,9 +2242,9 @@
validation: {
required: true
}
- },
+ },
//SMB (end)
-
+
//S3 (begin)
accesskey: {
label: 'label.s3.access_key',
@@ -2272,7 +2272,7 @@
isHidden: true
},
usehttps: {
- label: 'label.s3.use_https',
+ label: 'label.s3.use_https',
isBoolean: true,
isChecked: true,
isHidden: true
@@ -2340,7 +2340,7 @@
}
},
- action: function(args) {
+ action: function(args) {
var $wizard = args.wizard;
var formData = args.data;
var advZoneConfiguredVirtualRouterCount = 0; //for multiple physical networks in advanced zone. Each physical network has 2 virtual routers: regular one and VPC one.
@@ -2408,29 +2408,29 @@
url: createURL("createZone" + array1.join("")),
dataType: "json",
async: false,
- success: function(json) {
+ success: function(json) {
if (args.data.pluginFrom == null) { //from zone wizard, not from quick instsaller(args.data.pluginFrom != null && args.data.pluginFrom.name == 'installWizard') who doesn't have public checkbox
- if(args.data.zone.isdedicated == 'on'){ //dedicated checkbox in zone wizard is checked
- message(dictionary['message.dedicate.zone']);
+ if(args.data.zone.isdedicated == 'on'){ //dedicated checkbox in zone wizard is checked
+ message(dictionary['message.dedicate.zone']);
var data = {
- zoneid: json.createzoneresponse.zone.id
- };
- if (args.data.zone.domain != null)
+ zoneid: json.createzoneresponse.zone.id
+ };
+ if (args.data.zone.domain != null)
$.extend(data, {
domainid: args.data.zone.domain
- });
- if (args.data.zone.account != "")
+ });
+ if (args.data.zone.account != "")
$.extend(data, {
account: args.data.zone.account
- });
+ });
$.ajax({
url: createURL('dedicateZone'),
data: data,
success: function(json) {}
- });
+ });
}
- }
-
+ }
+
stepFns.addPhysicalNetworks({
data: $.extend(args.data, {
returnedZone: json.createzoneresponse.zone
@@ -3664,7 +3664,7 @@
}
});
// ***** VPC Virtual Router ***** (end) *****
- } else { //args.data.zone.sgEnabled == true //Advanced SG-enabled zone
+ } else { //args.data.zone.sgEnabled == true //Advanced SG-enabled zone
message(_l('message.enabling.security.group.provider'));
// get network service provider ID of Security Group
@@ -4377,23 +4377,23 @@
if (args.data.cluster.vSwitchGuestType != "")
array1.push('&guestvswitchtype=' + args.data.cluster.vSwitchGuestType);
*/
-
+
/*
if (args.data.cluster.vSwitchGuestName != "")
array1.push("&guestvswitchname=" + args.data.cluster.vSwitchGuestName);
*/
- if (args.data.cluster.vsmipaddress != null && args.data.cluster.vsmipaddress.length > 0) {
+ if (args.data.cluster.vsmipaddress != null && args.data.cluster.vsmipaddress.length > 0) {
array1.push('&vsmipaddress=' + args.data.cluster.vsmipaddress);
}
-
+
if(args.data.cluster.vsmusername != null && args.data.cluster.vsmusername.length > 0) {
array1.push('&vsmusername=' + args.data.cluster.vsmusername);
}
-
+
if(args.data.cluster.vsmpassword != null && args.data.cluster.vsmpassword.length > 0) {
array1.push('&vsmpassword=' + args.data.cluster.vsmpassword);
- }
+ }
var hostname = args.data.cluster.vCenterHost;
var dcName = args.data.cluster.vCenterDatacenter;
@@ -4459,7 +4459,7 @@
$.ajax({
url: createURL("addCluster" + array1.join("")),
dataType: "json",
- type: "POST",
+ type: "POST",
success: function(json) {
stepFns.addHost({
data: $.extend(args.data, {
@@ -4580,20 +4580,20 @@
//zone-wide-primary-storage is supported only for KVM and VMWare
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));
+ 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;
var url = null;
- if (args.data.primaryStorage.protocol == "nfs") {
+ if (args.data.primaryStorage.protocol == "nfs") {
var path = args.data.primaryStorage.path;
if (path.substring(0, 1) != "/")
path = "/" + path;
@@ -4606,33 +4606,33 @@
array1.push("&details[0].user=" + args.data.primaryStorage.smbUsername);
array1.push("&details[1].password=" + todb(args.data.primaryStorage.smbPassword));
array1.push("&details[2].domain=" + args.data.primaryStorage.smbDomain);
- } else if (args.data.primaryStorage.protocol == "PreSetup") {
+ } else if (args.data.primaryStorage.protocol == "PreSetup") {
var path = args.data.primaryStorage.path;
if (path.substring(0, 1) != "/")
path = "/" + path;
url = presetupURL(server, path);
- } else if (args.data.primaryStorage.protocol == "ocfs2") {
+ } else if (args.data.primaryStorage.protocol == "ocfs2") {
var path = args.data.primaryStorage.path;
if (path.substring(0, 1) != "/")
path = "/" + path;
url = ocfs2URL(server, path);
- } else if (args.data.primaryStorage.protocol == "SharedMountPoint") {
+ } else if (args.data.primaryStorage.protocol == "SharedMountPoint") {
var path = args.data.primaryStorage.path;
if (path.substring(0, 1) != "/")
path = "/" + path;
url = SharedMountPointURL(server, path);
- } else if (args.data.primaryStorage.protocol == "clvm") {
+ } else if (args.data.primaryStorage.protocol == "clvm") {
var vg = args.data.primaryStorage.volumegroup;
if (vg.substring(0, 1) != "/")
vg = "/" + vg;
url = clvmURL(vg);
- } else if (args.data.primaryStorage.protocol == "vmfs") {
+ } else if (args.data.primaryStorage.protocol == "vmfs") {
var path = args.data.primaryStorage.vCenterDataCenter;
if (path.substring(0, 1) != "/")
path = "/" + path;
path += "/" + args.data.primaryStorage.vCenterDataStore;
url = vmfsURL("dummy", path);
- } else {
+ } else {
var iqn = args.data.primaryStorage.iqn;
if (iqn.substring(0, 1) != "/")
iqn = "/" + iqn;
@@ -4668,11 +4668,11 @@
if (args.data.secondaryStorage.provider == '') {
complete({
data: args.data
- });
+ });
return; //skip addSecondaryStorage if provider dropdown is blank
}
-
-
+
+
message(_l('message.creating.secondary.storage'));
var data = {};
@@ -4746,12 +4746,12 @@
});
}
});
- } else if (args.data.secondaryStorage.provider == 'S3') {
- if($wizard.find('form[rel=secondaryStorage]').find('div[rel=name]').find('input').attr("disabled") == "disabled") { //Name textbox is disabled (and populated with S3 image setore name) when S3 image store exists. In this case, do not call addImageStore to create S3 image store.
+ } else if (args.data.secondaryStorage.provider == 'S3') {
+ if($wizard.find('form[rel=secondaryStorage]').find('div[rel=name]').find('input').attr("disabled") == "disabled") { //Name textbox is disabled (and populated with S3 image setore name) when S3 image store exists. In this case, do not call addImageStore to create S3 image store.
complete({
data: args.data
- });
- } else { //Name textbox is not disabled when S3 image store does not exist. In this case, call addImageStore to create S3 image store.
+ });
+ } else { //Name textbox is not disabled when S3 image store does not exist. In this case, call addImageStore to create S3 image store.
$.extend(data, {
provider: args.data.secondaryStorage.provider,
'details[0].key': 'accesskey',
@@ -4788,9 +4788,9 @@
$.ajax({
url: createURL('addImageStore'),
data: data,
- success: function(json) {
+ success: function(json) {
g_regionsecondaryenabled = true;
-
+
complete({
data: $.extend(args.data, {
returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage
@@ -4804,9 +4804,9 @@
args: args
});
}
- });
+ });
}
-
+
//NFS Cache
if ($wizard.find('form[rel=secondaryStorage]').find('div[rel=createNfsCache]').find("input[type=checkbox]").is(':checked') == true) {
var zoneid = args.data.secondaryStorage.nfsCacheZoneid;
@@ -4860,14 +4860,14 @@
$.ajax({
url: createURL('addImageStore'),
data: data,
- success: function(json) {
+ success: function(json) {
g_regionsecondaryenabled = true;
-
+
complete({
data: $.extend(args.data, {
returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage
})
- });
+ });
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@@ -4878,7 +4878,7 @@
}
});
}
- }
+ }
};
var complete = function(args) {
|