');
-
+
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));
+ 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..7705958dad4 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) {
- /*
- * 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
- */
+ 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
+ */
var $rows = $(':ui-dialog .list-view tbody tr');
var vms = args.context.instances;
-
+
// Assign subselect values
$(vms).each(function() {
var vm = this;
@@ -143,53 +143,31 @@
$.extend(vm, { _subselect: $vmRow.find('.subselect select').val() });
});
- /*
- var array1 = [];
- for (var i = 0; i < vms.length; i++) {
- array1.push(vms[i].id);
- }
- var virtualmachineids = array1.join(',');
- var inputData = {
- id: args.context.internalLoadBalancers[0].id,
- virtualmachineids: virtualmachineids
- };
- */
- //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.
- /*
- if (args.context.ipAddresses[0].isportable) {
- 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 +189,10 @@
}
};
};
-
+
var aclMultiEdit = {
noSelect: true,
-
+
reorder: {
moveDrag: {
action: function(args) {
@@ -1192,12 +1170,12 @@
label: 'label.id'
}
},
- dataProvider: function(args) {
- var data = {
- vpcid: args.context.vpc[0].id
- };
+ dataProvider: function(args) {
+ var data = {
+ vpcid: args.context.vpc[0].id
+ };
listViewDataProvider(args, data);
-
+
$.ajax({
url: createURL('listNetworkACLLists'),
data: data,
@@ -2281,7 +2259,7 @@
if (this.id == args.context.vpcGateways[0].aclid) {
return true;
}
-
+
items.push({
id: this.id,
description: this.name
@@ -2289,7 +2267,7 @@
return true;
});
-
+
args.response.success({
data: items
});
@@ -2412,13 +2390,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 +2791,12 @@
}
});
}
- },
+ },
passive: {
label: 'label.passive',
isBoolean: true,
isChecked: false
- }
+ }
}
},
action: function(args) {
@@ -2882,10 +2860,10 @@
passive: {
label: 'label.passive',
converter: cloudStack.converters.toBooleanText
- },
+ },
publicip: {
label: 'label.ip.address'
- },
+ },
gateway: {
label: 'label.gateway'
},
@@ -3099,7 +3077,7 @@
if (args.context.networks[0].type == "Isolated") { //Isolated network
cloudStack.dialog.confirm({
message: 'message.confirm.current.guest.CIDR.unchanged',
- action: function() { //"Yes" button is clicked
+ action: function() { //"Yes" button is clicked
array1.push("&changecidr=false");
$.ajax({
url: createURL("updateNetwork&id=" + args.context.networks[0].id + array1.join("")),
@@ -3352,30 +3330,30 @@
},
tabFilter: function(args) {
- var hiddenTabs = ['ipAddresses', 'acl']; // Disable IP address tab; it is redundant with 'view all' button
-
- var networkOfferingHavingELB = false;
+ var hiddenTabs = ['ipAddresses', 'acl']; // Disable IP address tab; it is redundant with 'view all' button
+
+ var networkOfferingHavingELB = false;
var services = args.context.networks[0].service;
if(services != null) {
- 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;
- }
- }
- }
+ 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;
- }
- }
- }
+ }
+ }
+ }
if (networkOfferingHavingELB == false) {
hiddenTabs.push("addloadBalancer");
}
-
+
return hiddenTabs;
},
@@ -3490,13 +3468,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 +3953,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..8d80c8778c6 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -34,39 +34,39 @@
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;
- }
- if ('vlanId' in trafficConfig) {
- if (trafficLabel.length > 0)
- trafficLabel += ',';
- trafficLabel += trafficConfig.vlanId;
- }
- if ('vSwitchType' in trafficConfig) {
- if (trafficLabel.length > 0)
- 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)
- }
- }
- }
+ if ('label' in trafficConfig) {
+ trafficLabel = trafficConfig.label;
+ }
+ else {
+ trafficLabel = '';
+
+ if ('vSwitchName' in trafficConfig) {
+ trafficLabel += trafficConfig.vSwitchName;
+ }
+ if ('vlanId' in trafficConfig) {
+ if (trafficLabel.length > 0)
+ trafficLabel += ',';
+ trafficLabel += trafficConfig.vlanId;
+ }
+ if ('vSwitchType' in trafficConfig) {
+ if (trafficLabel.length > 0)
+ 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)
+ }
+ }
+ }
}
-
+
var hypervisorAttr, trafficLabelStr;
switch (hypervisor) {
@@ -348,7 +348,7 @@
$('.setup-guest-traffic').addClass('basic');
$('.setup-guest-traffic').removeClass('advanced');
skipGuestTrafficStep = false; //set value
- } else { //args.data['network-model'] == 'Advanced' && args.data["zone-advanced-sg-enabled"] != "on"
+ } else { //args.data['network-model'] == 'Advanced' && args.data["zone-advanced-sg-enabled"] != "on"
$('.setup-guest-traffic').removeClass('basic');
$('.setup-guest-traffic').addClass('advanced');
@@ -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',
@@ -829,7 +829,7 @@
if ((args.data['network-model'] == 'Basic') || (args.data['network-model'] == 'Advanced' && args.data["zone-advanced-sg-enabled"] == "on")) {
$guestTrafficDesc.find('#for_basic_zone').css('display', 'inline');
$guestTrafficDesc.find('#for_advanced_zone').hide();
- } else { //args.data['network-model'] == 'Advanced' && args.data["zone-advanced-sg-enabled"] != "on"
+ } else { //args.data['network-model'] == 'Advanced' && args.data["zone-advanced-sg-enabled"] != "on"
$guestTrafficDesc.find('#for_advanced_zone').css('display', 'inline');
$guestTrafficDesc.find('#for_basic_zone').hide();
}
@@ -961,37 +961,15 @@
});
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');
-
- $form.find('.form-item[rel=vSwitchPublicName]').css('display','inline-block');
- $form.find('.form-item[rel=vSwitchGuestName]').css('display','inline-block');
-
- $form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').css('display','inline-block');
- $form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').css('display','inline-block');
- */
-
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'inline-block');
$form.find('.form-item[rel=overridepublictraffic]').find('input[type=checkbox]').removeAttr('checked');
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'inline-block');
$form.find('.form-item[rel=overrideguesttraffic]').find('input[type=checkbox]').removeAttr('checked');
-
-
-
} 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');
- $form.find('.form-item[rel=vSwitchGuestName]').css('display','none');
- */
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
-
}
$form.find('[rel=vCenterHost]').css('display', 'block');
@@ -1004,7 +982,6 @@
} else {
$vsmFields.css('display', 'none');
}
- //$("#cluster_name_label", $dialogAddCluster).text("vCenter Cluster:");
} else if ($(this).val() == "Ovm3") {
$form.find('.form-item[rel=ovm3pool]').css('display', 'inline-block');
$form.find('.form-item[rel=ovm3pool]').find('input[type=checkbox]').removeAttr('checked');
@@ -1013,22 +990,13 @@
$form.find('.form-item[rel=ovm3cluster]').find('input[type=checkbox]').removeAttr('checked');
$form.find('[rel=ovm3vip]').css('display', 'block');
} else {
- //$('li[input_group="vmware"]', $dialogAddCluster).hide();
-
$form.find('.form-item[rel=overridepublictraffic]').css('display', 'none');
$form.find('.form-item[rel=overrideguesttraffic]').css('display', 'none');
- //$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');
- //$form.find('.form-item[rel=vSwitchGuestName]').css('display', 'none');
-
$form.find('[rel=vCenterHost]').css('display', 'none');
$form.find('[rel=vCenterUsername]').css('display', 'none');
$form.find('[rel=vCenterPassword]').css('display', 'none');
$form.find('[rel=vCenterDatacenter]').css('display', 'none');
-
- //$("#cluster_name_label", $dialogAddCluster).text("Cluster:");
}
});
}
@@ -1075,79 +1043,6 @@
},
- /*
- vSwitchPublicType: {
- label: 'Public Traffic vSwitch Type',
- select: function(args) {
- var items = []
- var vSwitchEnabled = false;
- $.ajax({
- url: createURL('listConfigurations'),
- data: {
- name: 'vmware.use.nexus.vswitch'
- },
- async: false,
- success: function(json) {
- if (json.listconfigurationsresponse.configuration[0].value == 'true') {
- vSwitchEnabled = true;
- }
- }
- });
-
- if (vSwitchEnabled) {
-
- items.push({
- id: "nexusdvs",
- description: "Cisco Nexus 1000v Distributed Virtual Switch"
- });
-
- items.push({
- id: "vmwaresvs",
- description: "VMware vNetwork Standard Virtual Switch"
- });
- items.push({
- id: "vmwaredvs",
- description: "VMware vNetwork Distributed Virtual Switch"
- });
-
-
-
-
- }
-
- // items.push({id: " ", description: " "});
- else {
- items.push({
- id: "vmwaredvs",
- description: "VMware vNetwork Distributed Virtual Switch"
- });
- items.push({
- id: "vmwaresvs",
- description: "VMware vNetwork Standard Virtual Switch"
- });
- items.push({
- id: "nexusdvs",
- description: "Cisco Nexus 1000v Distributed Virtual Switch"
- });
-
- }
- args.response.success({
- data: items
- });
- },
- isHidden: true,
- dependsOn: 'overridepublictraffic'
- },
- */
-
- /*
- vSwitchPublicName: {
- label: 'Public Traffic vSwitch Name',
- dependsOn: 'overridepublictraffic',
- isHidden: true
- },
- */
-
overrideguesttraffic: {
label: 'label.override.guest.traffic',
isBoolean: true,
@@ -1155,81 +1050,6 @@
},
- /*
- vSwitchGuestType: {
- label: 'Guest Traffic vSwitch Type',
- select: function(args) {
- var items = []
- //items.push({ id:" ", description:" "});
-
- var vSwitchEnabled = false;
- var items = []
- $.ajax({
- url: createURL('listConfigurations'),
- data: {
- name: 'vmware.use.nexus.vswitch'
- },
- async: false,
- success: function(json) {
- if (json.listconfigurationsresponse.configuration[0].value == 'true') {
- vSwitchEnabled = true;
- }
- }
- });
-
- if (vSwitchEnabled) {
-
- items.push({
- id: "nexusdvs",
- description: "Cisco Nexus 1000v Distributed Virtual Switch"
- });
- items.push({
- id: "vmwaresvs",
- description: "VMware vNetwork Standard Virtual Switch"
- });
- items.push({
- id: "vmwaredvs",
- description: "VMware vNetwork Distributed Virtual Switch"
- });
-
-
-
-
- } else {
-
- items.push({
- id: "vmwaredvs",
- description: "VMware vNetwork Distributed Virtual Switch"
- });
- items.push({
- id: "vmwaresvs",
- description: "VMware vNetwork Standard Virtual Switch"
- });
- items.push({
- id: "nexusdvs",
- description: "Cisco Nexus 1000v Distributed Virtual Switch"
- });
-
- }
- args.response.success({
- data: items
- });
-
- },
- isHidden: true,
- dependsOn: 'overrideguesttraffic'
-
- },
- */
-
- /*
- vSwitchGuestName: {
- label: 'Guest Traffic vSwitch Name',
- dependsOn: 'overrideguesttraffic',
- isHidden: true
- },
- */
-
//Cisco Nexus Vswitch
vsmipaddress: {
label: 'label.cisco.nexus1000v.ip.address',
@@ -1265,25 +1085,20 @@
var $form = args.$form;
if (selectedClusterObj.hypervisortype == "VMware") {
- //$('li[input_group="general"]', $dialogAddHost).hide();
$form.find('[rel=hostname]').hide();
$form.find('[rel=username]').hide();
$form.find('[rel=password]').hide();
- //$('li[input_group="vmware"]', $dialogAddHost).show();
$form.find('[rel=vcenterHost]').css('display', 'block');
- //$('li[input_group="baremetal"]', $dialogAddHost).hide();
$form.find('[rel=baremetalCpuCores]').hide();
$form.find('[rel=baremetalCpu]').hide();
$form.find('[rel=baremetalMemory]').hide();
$form.find('[rel=baremetalMAC]').hide();
- //$('li[input_group="Ovm"]', $dialogAddHost).hide();
$form.find('[rel=agentUsername]').hide();
$form.find('[rel=agentPassword]').hide();
- //$('li[input_group="Ovm3"]', $dialogAddHost).hide();
$form.find('.form-item[rel=agentUsername]').hide();
$form.find('.form-item[rel=agentPassword]').hide();
$form.find('.form-item[rel=agentPort]').hide();
@@ -1291,25 +1106,20 @@
$form.find('.form-item[rel=ovm3pool]').hide();
$form.find('.form-item[rel=ovm3cluster]').hide();
} else if (selectedClusterObj.hypervisortype == "BareMetal") {
- //$('li[input_group="general"]', $dialogAddHost).show();
$form.find('[rel=hostname]').css('display', 'block');
$form.find('[rel=username]').css('display', 'block');
$form.find('[rel=password]').css('display', 'block');
- //$('li[input_group="baremetal"]', $dialogAddHost).show();
$form.find('[rel=baremetalCpuCores]').css('display', 'block');
$form.find('[rel=baremetalCpu]').css('display', 'block');
$form.find('[rel=baremetalMemory]').css('display', 'block');
$form.find('[rel=baremetalMAC]').css('display', 'block');
- //$('li[input_group="vmware"]', $dialogAddHost).hide();
$form.find('[rel=vcenterHost]').hide();
- //$('li[input_group="Ovm"]', $dialogAddHost).hide();
$form.find('[rel=agentUsername]').hide();
$form.find('[rel=agentPassword]').hide();
- //$('li[input_group="Ovm3"]', $dialogAddHost).hide();
$form.find('.form-item[rel=agentUsername]').hide();
$form.find('.form-item[rel=agentPassword]').hide();
$form.find('.form-item[rel=agentPort]').hide();
@@ -1317,46 +1127,37 @@
$form.find('.form-item[rel=ovm3pool]').hide();
$form.find('.form-item[rel=ovm3cluster]').hide();
} else if (selectedClusterObj.hypervisortype == "Ovm") {
- //$('li[input_group="general"]', $dialogAddHost).show();
$form.find('[rel=hostname]').css('display', 'block');
$form.find('[rel=username]').css('display', 'block');
$form.find('[rel=password]').css('display', 'block');
- //$('li[input_group="vmware"]', $dialogAddHost).hide();
$form.find('[rel=vcenterHost]').hide();
- //$('li[input_group="baremetal"]', $dialogAddHost).hide();
$form.find('[rel=baremetalCpuCores]').hide();
$form.find('[rel=baremetalCpu]').hide();
$form.find('[rel=baremetalMemory]').hide();
$form.find('[rel=baremetalMAC]').hide();
- //$('li[input_group="Ovm"]', $dialogAddHost).show();
$form.find('[rel=agentUsername]').css('display', 'block');
$form.find('[rel=agentUsername]').find('input').val("oracle");
$form.find('[rel=agentPassword]').css('display', 'block');
- //$('li[input_group="Ovm3"]', $dialogAddHost).hide();
$form.find('.form-item[rel=agentPort]').hide();
$form.find('.form-item[rel=ovm3vip]').hide();
$form.find('.form-item[rel=ovm3pool]').hide();
$form.find('.form-item[rel=ovm3cluster]').hide();
} else if (selectedClusterObj.hypervisortype == "Ovm3") {
- //$('li[input_group="general"]', $dialogAddHost).show();
$form.find('.form-item[rel=hostname]').css('display', 'inline-block');
$form.find('.form-item[rel=username]').css('display', 'inline-block');
$form.find('.form-item[rel=password]').css('display', 'inline-block');
- //$('li[input_group="vmware"]', $dialogAddHost).hide();
$form.find('.form-item[rel=vcenterHost]').hide();
- //$('li[input_group="baremetal"]', $dialogAddHost).hide();
$form.find('.form-item[rel=baremetalCpuCores]').hide();
$form.find('.form-item[rel=baremetalCpu]').hide();
$form.find('.form-item[rel=baremetalMemory]').hide();
$form.find('.form-item[rel=baremetalMAC]').hide();
- //$('li[input_group="Ovm3"]', $dialogAddHost).show();
$form.find('.form-item[rel=agentUsername]').css('display', 'inline-block');
$form.find('.form-item[rel=agentUsername]').find('input').val("oracle");
$form.find('.form-item[rel=agentPassword]').css('display', 'inline-block');
@@ -1366,24 +1167,20 @@
$form.find('.form-item[rel=ovm3pool]').css('display', 'inline-block');
$form.find('.form-item[rel=ovm3cluster]').css('display', 'inline-block');
} else {
- //$('li[input_group="general"]', $dialogAddHost).show();
$form.find('[rel=hostname]').css('display', 'block');
$form.find('[rel=username]').css('display', 'block');
$form.find('[rel=password]').css('display', 'block');
- //$('li[input_group="vmware"]', $dialogAddHost).hide();
$form.find('[rel=vcenterHost]').hide();
- //$('li[input_group="baremetal"]', $dialogAddHost).hide();
$form.find('[rel=baremetalCpuCores]').hide();
$form.find('[rel=baremetalCpu]').hide();
$form.find('[rel=baremetalMemory]').hide();
$form.find('[rel=baremetalMAC]').hide();
- //$('li[input_group="Ovm"]', $dialogAddHost).hide();
$form.find('[rel=agentUsername]').hide();
$form.find('[rel=agentPassword]').hide();
- //$('li[input_group="Ovm3"]', $dialogAddHost).hide();
+
$form.find('.form-item[rel=agentPort]').hide();
$form.find('.form-item[rel=ovm3vip]').hide();
$form.find('.form-item[rel=ovm3pool]').hide();
@@ -1569,7 +1366,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -1590,7 +1387,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "PreSetup",
description: "PreSetup"
@@ -1607,7 +1404,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "vmfs",
description: "vmfs"
@@ -1615,13 +1412,13 @@
args.response.success({
data: items
});
- } else if (selectedClusterObj.hypervisortype == "Hyperv") {
- var items = [];
- items.push({
+ } else if (selectedClusterObj.hypervisortype == "Hyperv") {
+ var items = [];
+ items.push({
id: "SMB",
description: "SMB/CIFS"
});
- args.response.success({
+ args.response.success({
data: items
});
} else if (selectedClusterObj.hypervisortype == "Ovm") {
@@ -1629,7 +1426,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "ocfs2",
description: "ocfs2"
@@ -1642,7 +1439,7 @@
items.push({
id: "nfs",
description: "nfs"
- });
+ });
items.push({
id: "SharedMountPoint",
description: "SharedMountPoint"
@@ -1675,154 +1472,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 +1629,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 +1643,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();
@@ -1888,29 +1685,29 @@
//SMB
smbDomain: {
- label: 'label.smb.domain',
- validation: {
+ label: 'label.smb.domain',
+ validation: {
required: true
},
isHidden: true
- },
+ },
smbUsername: {
- label: 'label.smb.username',
- validation: {
+ label: 'label.smb.username',
+ validation: {
required: true
},
isHidden: true
},
smbPassword: {
- label: 'label.smb.password',
- isPassword: true,
- validation: {
+ label: 'label.smb.password',
+ isPassword: true,
+ validation: {
required: true
},
isHidden: true
},
-
-
+
+
//iscsi
iqn: {
label: 'label.target.iqn',
@@ -1972,45 +1769,45 @@
}
},
secondaryStorage: {
- fields: {
+ fields: {
provider: {
label: 'label.provider',
select: function(args) {
- var storageproviders = [];
- storageproviders.push({ id: '', description: ''});
-
- $.ajax({
- url: createURL('listImageStores'),
- data: {
- provider: 'S3'
- },
- async: true,
- 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.
- } 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"
- */
- 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'});
- }
+ var storageproviders = [];
+ storageproviders.push({ id: '', description: ''});
+
+ $.ajax({
+ url: createURL('listImageStores'),
+ data: {
+ provider: 'S3'
+ },
+ async: true,
+ 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.
+ } 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"
+ */
+ 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'});
+ }
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();
-
+ $fields.filter('[rel=name]').hide();
+
//NFS
$fields.filter('[rel=zoneid]').hide();
$fields.filter('[rel=nfsServer]').hide();
@@ -2020,7 +1817,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();
@@ -2042,9 +1839,9 @@
$fields.filter('[rel=username]').hide();
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "NFS") {
- $fields.filter('[rel=name]').css('display', 'inline-block');
-
- //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');
$fields.filter('[rel=path]').css('display', 'inline-block');
@@ -2053,7 +1850,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();
@@ -2075,9 +1872,9 @@
$fields.filter('[rel=username]').hide();
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "SMB") {
- $fields.filter('[rel=name]').css('display', 'inline-block');
-
- //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');
$fields.filter('[rel=path]').css('display', 'inline-block');
@@ -2086,7 +1883,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();
@@ -2108,17 +1905,17 @@
$fields.filter('[rel=username]').hide();
$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=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();
$fields.filter('[rel=path]').hide();
@@ -2127,19 +1924,19 @@
$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();
+ $fields.filter('[rel=accesskey]').hide();
$fields.filter('[rel=secretkey]').hide();
$fields.filter('[rel=bucket]').hide();
$fields.filter('[rel=endpoint]').hide();
$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=accesskey]').css('display', 'inline-block');
$fields.filter('[rel=secretkey]').css('display', 'inline-block');
$fields.filter('[rel=bucket]').css('display', 'inline-block');
$fields.filter('[rel=endpoint]').css('display', 'inline-block');
@@ -2147,22 +1944,22 @@
$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();
$fields.filter('[rel=username]').hide();
$fields.filter('[rel=key]').hide();
} else if ($(this).val() == "Swift") {
- $fields.filter('[rel=name]').css('display', 'inline-block');
-
- //NFS
+ $fields.filter('[rel=name]').css('display', 'inline-block');
+
+ //NFS
$fields.filter('[rel=zoneid]').hide();
$fields.filter('[rel=nfsServer]').hide();
$fields.filter('[rel=path]').hide();
@@ -2171,7 +1968,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 +1990,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 +2001,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.
@@ -2222,29 +2019,28 @@
},
//NFS, SMB (end)
-
- //SMB (begin)
+ //SMB (begin)
smbDomain: {
- label: 'label.smb.domain',
- validation: {
+ label: 'label.smb.domain',
+ validation: {
required: true
}
},
smbUsername: {
- label: 'label.smb.username',
- validation: {
+ label: 'label.smb.username',
+ validation: {
required: true
}
},
smbPassword: {
- label: 'label.smb.password',
- isPassword: true,
- validation: {
+ label: 'label.smb.password',
+ isPassword: true,
+ validation: {
required: true
}
- },
+ },
//SMB (end)
-
+
//S3 (begin)
accesskey: {
label: 'label.s3.access_key',
@@ -2272,7 +2068,7 @@
isHidden: true
},
usehttps: {
- label: 'label.s3.use_https',
+ label: 'label.s3.use_https',
isBoolean: true,
isChecked: true,
isHidden: true
@@ -2314,7 +2110,6 @@
},
//S3 (end)
-
//Swift (begin)
url: {
label: 'label.url',
@@ -2340,7 +2135,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.
@@ -2371,7 +2166,7 @@
if (args.data.zone.guestcidraddress != null && args.data.zone.guestcidraddress.length > 0)
array1.push("&guestcidraddress=" + todb(args.data.zone.guestcidraddress));
- } else { // args.data.zone.sgEnabled == true
+ } else { // args.data.zone.sgEnabled == true
array1.push("&securitygroupenabled=true");
}
}
@@ -2408,29 +2203,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']);
- var data = {
- zoneid: json.createzoneresponse.zone.id
- };
- if (args.data.zone.domain != null)
- $.extend(data, {
- domainid: args.data.zone.domain
- });
- if (args.data.zone.account != "")
- $.extend(data, {
- account: args.data.zone.account
- });
+ 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)
+ $.extend(data, {
+ domainid: args.data.zone.domain
+ });
+ 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
@@ -3139,7 +2934,7 @@
stepFns.addPod({
data: args.data
});
- } else { //args.data.zone.sgEnabled == true //Advanced SG-enabled zone
+ } else { //args.data.zone.sgEnabled == true //Advanced SG-enabled zone
stepFns.addGuestNetwork({
data: args.data
});
@@ -3664,7 +3459,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
@@ -3857,7 +3652,7 @@
url.push("lbdevicecapacity=" + capacity);
}
- var dedicated = (args.data.basicPhysicalNetwork.dedicated == "on"); //boolean (true/false)
+ var dedicated = (args.data.basicPhysicalNetwork.dedicated == "on"); //boolean (true/false)
if (isQuestionMarkAdded == false) {
url.push("?");
isQuestionMarkAdded = true;
@@ -4063,7 +3858,7 @@
} else if (args.data.zone.networkType == "Advanced") {
if (args.data.zone.sgEnabled != true) {
array1.push("&forVirtualNetwork=true");
- } else { //args.data.zone.sgEnabled == true
+ } else { //args.data.zone.sgEnabled == true
array1.push("&forVirtualNetwork=false");
}
}
@@ -4362,38 +4157,17 @@
array1.push("&username=" + todb(args.data.cluster.vCenterUsername));
array1.push("&password=" + todb(args.data.cluster.vCenterPassword));
- //dvswitch is enabled
- /*
- if (args.data.cluster.vSwitchPublicType != "")
- array1.push('&publicvswitchtype=' + args.data.cluster.vSwitchPublicType);
- */
-
- /*
- if (args.data.cluster.vSwitchPublicName != "")
- array1.push("&publicvswitchname=" + args.data.cluster.vSwitchPublicName);
- */
-
- /*
- 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);
+ 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);
- }
+ array1.push('&vsmpassword=' + args.data.cluster.vsmpassword);
+ }
var hostname = args.data.cluster.vCenterHost;
var dcName = args.data.cluster.vCenterDatacenter;
@@ -4459,7 +4233,7 @@
$.ajax({
url: createURL("addCluster" + array1.join("")),
dataType: "json",
- type: "POST",
+ type: "POST",
success: function(json) {
stepFns.addHost({
data: $.extend(args.data, {
@@ -4557,8 +4331,6 @@
} else {
addHostAjax();
}
-
-
},
addPrimaryStorage: function(args) {
@@ -4580,59 +4352,59 @@
//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)"
- });
+ 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;
url = nfsURL(server, path);
} else if (args.data.primaryStorage.protocol == "SMB") {
- var path = args.data.primaryStorage.path;
+ var path = args.data.primaryStorage.path;
if (path.substring(0, 1) != "/")
path = "/" + path;
url = smbURL(server, path);
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;
@@ -4665,15 +4437,15 @@
},
addSecondaryStorage: function(args) {
- if (args.data.secondaryStorage.provider == '') {
+ if (args.data.secondaryStorage.provider == '') {
complete({
data: args.data
- });
+ });
return; //skip addSecondaryStorage if provider dropdown is blank
- }
-
-
- message(_l('message.creating.secondary.storage'));
+ }
+
+
+ message(_l('message.creating.secondary.storage'));
var data = {};
if (args.data.secondaryStorage.name != null && args.data.secondaryStorage.name.length > 0) {
@@ -4746,13 +4518,13 @@
});
}
});
- } 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.
- $.extend(data, {
+ });
+ } 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',
'details[0].value': args.data.secondaryStorage.accesskey,
@@ -4788,9 +4560,9 @@
$.ajax({
url: createURL('addImageStore'),
data: data,
- success: function(json) {
- g_regionsecondaryenabled = true;
-
+ success: function(json) {
+ g_regionsecondaryenabled = true;
+
complete({
data: $.extend(args.data, {
returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage
@@ -4804,9 +4576,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 +4632,14 @@
$.ajax({
url: createURL('addImageStore'),
data: data,
- success: function(json) {
- g_regionsecondaryenabled = true;
-
+ success: function(json) {
+ g_regionsecondaryenabled = true;
+
complete({
data: $.extend(args.data, {
returnedSecondaryStorage: json.addimagestoreresponse.secondarystorage
})
- });
+ });
},
error: function(XMLHttpResponse) {
var errorMsg = parseXMLHttpResponse(XMLHttpResponse);
@@ -4878,7 +4650,7 @@
}
});
}
- }
+ }
};
var complete = function(args) {
|