Updated Branches: refs/heads/4.2 b3576cac2 -> 17148b2c6
CLOUDSTACK-3487: Add egress default policy to network offering UI Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/17148b2c Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/17148b2c Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/17148b2c Branch: refs/heads/4.2 Commit: 17148b2c6a4dd8095a6686166555e8c9943e3da8 Parents: b3576ca Author: Brian Federle <[email protected]> Authored: Tue Jul 30 12:55:10 2013 -0700 Committer: Brian Federle <[email protected]> Committed: Tue Jul 30 12:55:21 2013 -0700 ---------------------------------------------------------------------- .../classes/resources/messages.properties | 1 + ui/dictionary.jsp | 1 + ui/scripts/configuration.js | 33 +++++++++++++++++++- 3 files changed, 34 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17148b2c/client/WEB-INF/classes/resources/messages.properties ---------------------------------------------------------------------- diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 342a134..72c66c6 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,6 +14,7 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. +label.egress.default.policy=Egress Default Policy label.routing=Routing label.about=About label.app.name=CloudStack http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17148b2c/ui/dictionary.jsp ---------------------------------------------------------------------- diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index a323bff..947ae7d 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,7 @@ under the License. <% long now = System.currentTimeMillis(); %> <script language="javascript"> dictionary = { +'label.egress.default.policy': '<fmt:message key="label.egress.default.policy" />', 'label.routing': '<fmt:message key="label.routing" />', 'message.validate.invalid.characters': '<fmt:message key="message.validate.invalid.characters" />', 'label.about': '<fmt:message key="label.about" />', http://git-wip-us.apache.org/repos/asf/cloudstack/blob/17148b2c/ui/scripts/configuration.js ---------------------------------------------------------------------- diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 68f38ec..f9c2498 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -1932,6 +1932,12 @@ args.$form.find('.form-item[rel=\"service.Lb.inlineModeDropdown\"]').hide(); } + if (args.$form.find('.form-item[rel=\"service.Firewall.isEnabled\"] input[type=checkbox]').is(':checked') == true) { + args.$form.find('.form-item[rel=\"egresspolicy\"]').css('display', 'inline-block'); + } else { + args.$form.find('.form-item[rel=\"egresspolicy\"]').css('display', 'none'); + } + //show LB Isolation dropdown only when (1)LB Service is checked (2)Service Provider is Netscaler OR F5 if ((args.$form.find('.form-item[rel=\"service.Lb.isEnabled\"]').find('input[type=checkbox]').is(':checked') == true) && (args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'Netscaler' || args.$form.find('.form-item[rel=\"service.Lb.provider\"]').find('select').val() == 'F5BigIp')) { args.$form.find('.form-item[rel=\"service.Lb.lbIsolationDropdown\"]').css('display', 'inline-block'); @@ -2361,6 +2367,19 @@ }] }); } + }, + + egresspolicy: { + label: 'Default egress policy', + isHidden: true, + select: function(args) { + args.response.success({ + data: [ + { id: 'ALLOW', description: 'Allow' }, + { id: 'DENY', description: 'Deny' } + ] + }); + } } } }, @@ -2485,7 +2504,6 @@ inputData['conservemode'] = false; } - // Make service provider map var serviceProviderIndex = 0; $.each(serviceProviderMap, function(key, value) { @@ -2497,6 +2515,12 @@ if (args.$form.find('.form-item[rel=availability]').css("display") == "none") inputData['availability'] = 'Optional'; + if (args.$form.find('.form-item[rel=egresspolicy]').is(':visible')) { + inputData['egressdefaultpolicy'] = formData.egresspolicy === 'ALLOW' ? true : false; + } else { + delete inputData.egresspolicy; + } + if (args.$form.find('.form-item[rel=systemOfferingForRouter]').css("display") == "none") delete inputData.systemOfferingForRouter; @@ -2723,6 +2747,13 @@ converter: cloudStack.converters.toBooleanText }, + egressdefaultpolicy: { + label: 'label.egress.default.policy', + converter: function(str) { + return str === true ? 'Allow' : 'Deny'; + } + }, + availability: { label: 'label.availability', isEditable: true,
