From eae8d70dfdc655420d13a6673f64343587838dff Mon Sep 17 00:00:00 2001 From: bfederle Date: Tue, 24 Jan 2012 15:31:36 -0800 Subject: [PATCH] Have network sticky policy use cloudStack.lbStickyPolicy() --- ui/scripts/network.js | 115 +----------------------------------------- 1 file changed, 2 insertions(+), 113 deletions(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 912c2cdd1e3..843d1f67184 100644 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -1782,118 +1782,7 @@ label: 'Sticky Policy', custom: { buttonLabel: 'Configure', - action: function(args) { - var success = args.response.success; - var fields = { - methodname: { - label: 'Stickiness method', - select: function(args) { - var $select = args.$select; - var $form = $select.closest('form'); - - args.response.success({ - data: [ - { - id: 'none', - description: 'None' - }, - { - id: 'LbCookie', - description: 'LB-based' - }, - { - id: 'AppCookie', - description: 'Cookie-based' - }, - { - id: 'SourceBased', - description: 'Source-based' - } - ] - }, 500); - - $select.change(function() { - var value = $select.val(); - var showFields = []; - - switch (value) { - case 'none': - showFields = []; - break; - case 'LbCookie': - showFields = ['name', 'mode', 'nocache', 'indirect', 'postonly', 'domain']; - break; - case 'AppCookie': - showFields = ['name', 'length', 'holdtime', 'request-learn', 'prefix', 'mode']; - break; - case 'SourceBased': - showFields = ['tablesize', 'expire']; - break; - } - - $select.closest('.form-item').siblings('.form-item').each(function() { - var $field = $(this); - var id = $field.attr('rel'); - - if ($.inArray(id, showFields) > -1) { - $field.css('display', 'inline-block'); - } else { - $field.hide(); - } - }); - - $select.closest(':ui-dialog').dialog('option', 'position', 'center'); - }); - } - }, - name: { label: 'Name', validation: { required: true }, isHidden: true }, - mode: { label: 'Mode', isHidden: true }, - length: { label: 'Length', validation: { required: true }, isHidden: true }, - holdtime: { label: 'Hold Time', validation: { required: true }, isHidden: true }, - tablesize: { label: 'Table size', isHidden: true }, - expire: { label: 'Expire', isHidden: true }, - requestlearn: { label: 'Request-Learn', isBoolean: true, isHidden: true }, - prefix: { label: 'Prefix', isBoolean: true, isHidden: true }, - nocache: { label: 'No cache', isBoolean: true, isHidden: true }, - indirect: { label: 'Indirect', isBoolean: true, isHidden: true }, - postonly: { label: 'Is post-only', isBoolean: true, isHidden: true }, - domain: { label: 'Domain', isBoolean: true, isHidden: true } - }; - - if (args.data) { - var populatedFields = $.map(fields, function(field, id) { - return id; - }); - - $(populatedFields).each(function() { - var id = this; - var field = fields[id]; - var dataItem = args.data[id]; - - if (field.isBoolean) { - field.isChecked = dataItem ? true : false; - } else { - field.defaultValue = dataItem; - } - }); - } - - cloudStack.dialog.createForm({ - form: { - title: 'Configure Sticky Policy', - desc: 'Please complete the following fields', - fields: fields - }, - after: function(args) { - var data = cloudStack.serializeForm(args.$form); - success({ - data: $.extend(data, { - _buttonLabel: data.methodname.toUpperCase() - }) - }); - } - }); - } + action: cloudStack.lbStickyPolicy() } }, 'add-vm': { @@ -1959,7 +1848,7 @@ // Create stickiness policy if (stickyData && stickyData.methodname && - stickyData.methodname != 'none') { + stickyData.methodname != 'None') { var stickyURLData = ''; var stickyParams;