CLOUDSTACK-2491:NTier: Creation of ACL Rule for protocol AH (51) and ESP (50) Fails
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/6d688753 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/6d688753 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/6d688753 Branch: refs/heads/object_store Commit: 6d6887533ff6270335b2b64bd5b9fc453c41182f Parents: 68a428f Author: Pranav Saxena <pranav.sax...@citrix.com> Authored: Wed May 15 18:01:10 2013 +0530 Committer: Pranav Saxena <pranav.sax...@citrix.com> Committed: Wed May 15 18:01:10 2013 +0530 ---------------------------------------------------------------------- ui/scripts/vpc.js | 16 ++++++++++++++-- 1 files changed, 14 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6d688753/ui/scripts/vpc.js ---------------------------------------------------------------------- diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js index 5d436f3..0c4a446 100644 --- a/ui/scripts/vpc.js +++ b/ui/scripts/vpc.js @@ -94,8 +94,8 @@ }, 'protocolnumber': {label:'Protocol Number',isDisabled:true,isHidden:true,edit:true}, - 'startport': { edit: true, label: 'label.start.port' }, - 'endport': { edit: true, label: 'label.end.port' }, + 'startport': { edit: true, label: 'label.start.port' , isOptional:true }, + 'endport': { edit: true, label: 'label.end.port' , isOptional:true}, 'networkid': { label: 'Select Tier', select: function(args) { @@ -165,7 +165,18 @@ else delete args.data.protocolnumber; + + if((args.data.protocol == 'tcp' || args.data.protocol == 'udp' || args.data.protocol == 'all') && (args.data.startport=="" || args.data.startport == undefined)){ + cloudStack.dialog.notice({message:_l('Start Port or End Port value should not be blank')}); + $(window).trigger('cloudStack.fullRefresh'); + } + else if((args.data.protocol == 'tcp' || args.data.protocol == 'udp' || args.data.protocol == 'all') && (args.data.endport=="" || args.data.endport == undefined)){ + cloudStack.dialog.notice({message:_l('Start Port or End Port value should not be blank')}); + $(window).trigger('cloudStack.fullRefresh'); + } + + else{ $.ajax({ url: createURL('createNetworkACL'), data: $.extend(args.data, { @@ -202,6 +213,7 @@ } }); } + } }, actions: { destroy: {
