Allow the --protocol customization for CreateNetworkAclEntry to also …

…work for ReplaceNetworkAclEntry. Fixes aws#559.

awscli/customizations/ec2protocolarg.py

@@ -29,7 +29,8 @@ def _fix_args(operation, endpoint, params, **kwargs):
 
 
 def register_protocol_args(cli):
-    ('before-parameter-build.ec2.RunInstances', _fix_args),
     cli.register('before-parameter-build.ec2.CreateNetworkAclEntry',
                  _fix_args)
+    cli.register('before-parameter-build.ec2.ReplaceNetworkAclEntry',
+                 _fix_args)
 

tests/unit/ec2/test_replace_network_acl_entry.py

@@ -0,0 +1,120 @@
+#!/usr/bin/env python
+# Copyright 2012-2013 Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License"). You
+# may not use this file except in compliance with the License. A copy of
+# the License is located at
+#
+#     http://aws.amazon.com/apache2.0/
+#
+# or in the "license" file accompanying this file. This file is
+# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
+# ANY KIND, either express or implied. See the License for the specific
+# language governing permissions and limitations under the License.
+from tests.unit import BaseAWSCommandParamsTest
+
+
+class TestReplaceNetworkACLEntry(BaseAWSCommandParamsTest):
+
+    prefix = 'ec2 replace-network-acl-entry'
+
+    def test_tcp(self):
+        cmdline = self.prefix
+        cmdline += ' --network-acl-id acl-12345678'
+        cmdline += ' --rule-number 100'
+        cmdline += ' --protocol tcp'
+        cmdline += ' --rule-action allow'
+        cmdline += ' --ingress'
+        cmdline += ' --port-range From=22,To=22'
+        cmdline += ' --cidr-block 0.0.0.0/0'
+        result = {'NetworkAclId': 'acl-12345678',
+                  'RuleNumber': '100',
+                  'Protocol': '6',
+                  'RuleAction': 'allow',
+                  'Egress': 'false',
+                  'CidrBlock': '0.0.0.0/0',
+                  'PortRange.From': '22',
+                  'PortRange.To': '22'
+                  }
+        self.assert_params_for_cmd(cmdline, result)
+
+    def test_udp(self):
+        cmdline = self.prefix
+        cmdline += ' --network-acl-id acl-12345678'
+        cmdline += ' --rule-number 100'
+        cmdline += ' --protocol udp'
+        cmdline += ' --rule-action allow'
+        cmdline += ' --ingress'
+        cmdline += ' --port-range From=22,To=22'
+        cmdline += ' --cidr-block 0.0.0.0/0'
+        result = {'NetworkAclId': 'acl-12345678',
+                  'RuleNumber': '100',
+                  'Protocol': '17',
+                  'RuleAction': 'allow',
+                  'Egress': 'false',
+                  'CidrBlock': '0.0.0.0/0',
+                  'PortRange.From': '22',
+                  'PortRange.To': '22'
+                  }
+        self.assert_params_for_cmd(cmdline, result)
+
+    def test_icmp(self):
+        cmdline = self.prefix
+        cmdline += ' --network-acl-id acl-12345678'
+        cmdline += ' --rule-number 100'
+        cmdline += ' --protocol icmp'
+        cmdline += ' --rule-action allow'
+        cmdline += ' --ingress'
+        cmdline += ' --port-range From=22,To=22'
+        cmdline += ' --cidr-block 0.0.0.0/0'
+        result = {'NetworkAclId': 'acl-12345678',
+                  'RuleNumber': '100',
+                  'Protocol': '1',
+                  'RuleAction': 'allow',
+                  'Egress': 'false',
+                  'CidrBlock': '0.0.0.0/0',
+                  'PortRange.From': '22',
+                  'PortRange.To': '22'
+                  }
+        self.assert_params_for_cmd(cmdline, result)
+
+    def test_all(self):
+        cmdline = self.prefix
+        cmdline += ' --network-acl-id acl-12345678'
+        cmdline += ' --rule-number 100'
+        cmdline += ' --protocol all'
+        cmdline += ' --rule-action allow'
+        cmdline += ' --ingress'
+        cmdline += ' --port-range From=22,To=22'
+        cmdline += ' --cidr-block 0.0.0.0/0'
+        result = {'NetworkAclId': 'acl-12345678',
+                  'RuleNumber': '100',
+                  'Protocol': '-1',
+                  'RuleAction': 'allow',
+                  'Egress': 'false',
+                  'CidrBlock': '0.0.0.0/0',
+                  'PortRange.From': '22',
+                  'PortRange.To': '22'
+                  }
+        self.assert_params_for_cmd(cmdline, result)
+
+    def test_number(self):
+        cmdline = self.prefix
+        cmdline += ' --network-acl-id acl-12345678'
+        cmdline += ' --rule-number 100'
+        cmdline += ' --protocol 99'
+        cmdline += ' --rule-action allow'
+        cmdline += ' --ingress'
+        cmdline += ' --port-range From=22,To=22'
+        cmdline += ' --cidr-block 0.0.0.0/0'
+        result = {'NetworkAclId': 'acl-12345678',
+                  'RuleNumber': '100',
+                  'Protocol': '99',
+                  'RuleAction': 'allow',
+                  'Egress': 'false',
+                  'CidrBlock': '0.0.0.0/0',
+                  'PortRange.From': '22',
+                  'PortRange.To': '22'
+                  }
+        self.assert_params_for_cmd(cmdline, result)
+