fix CLOUDSTACK-2930, exception while applying ACL rule with protocol as ALL.

Mice Xia · Mice Xia · commit 5e56e43e31da · 2013-06-14T13:19:07.000+08:00
1) change UI, disable startport and endport when protocol=All
2) validate parameters for API createNetworkACL
diff --git a/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java b/server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
@@ -294,6 +294,10 @@ private void validateNetworkACLItem(Integer portStart, Integer portEnd, List<Str
             throw new InvalidParameterValueException("Start port can't be bigger than end port");
         }
 
+        // start port and end port must be null for protocol = 'all'
+        if ((portStart != null || portEnd != null ) && protocol != null && protocol.equalsIgnoreCase("all"))
+            throw new InvalidParameterValueException("start port and end port must be null if protocol = 'all'");
+
         if (sourceCidrList != null) {
             for (String cidr: sourceCidrList){
                 if (!NetUtils.isValidCIDR(cidr)){
diff --git a/ui/scripts/vpc.js b/ui/scripts/vpc.js
@@ -97,6 +97,13 @@
                      name != 'icmpcode' &&
                      name != 'cidrlist';
             });
+            var $portFields = $inputs.filter(function() {
+              var name = $(this).attr('name');
+              return $.inArray(name, [
+                'startport',
+                'endport'
+              ]) > -1;
+            });
 
             var $protocolinput = args.$form.find('td input');
             var $protocolFields = $protocolinput.filter(function(){
@@ -124,6 +131,10 @@
               $icmpFields.hide();
               $icmpFields.parent().find('label.error').hide();
               $protocolFields.hide().removeClass('required');
+              if ($(this).val() == 'all'){
+                $portFields.attr('disabled', 'disabled');
+                $portFields.hide();
+              }
             }
           });
 
@@ -216,11 +227,11 @@
 
 
        
-        if((args.data.protocol == 'tcp' || args.data.protocol == 'udp' || args.data.protocol == 'all') && (args.data.startport=="" || args.data.startport == undefined)){
+        if((args.data.protocol == 'tcp' || args.data.protocol == 'udp') && (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)){
+        else if((args.data.protocol == 'tcp' || args.data.protocol == 'udp')  && (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');
         }
