Support bulk deletion for commands that exist in both network and compute.

Some delete commands in networkv2 are exist in both network
and compute, They can use NetworkAndComputeDeleteclass to
supprot bulk deletion and error handling and the codes are
similar, so I change them all in this patch. The changed
commands including:
1.floating ip delete
2.security group delete
3.security group rule delete
Also, I update unit tests and docs for these commands in this patch.

Change-Id: I6c94c3d10ba579ddd9b14d17673c821e3481fd8a
Partially-Implements: blueprint multi-argument-network

Author: Huanxuan Ao

doc/source/command-objects/ip-floating.rst

@@ -66,16 +66,17 @@ Create new floating IP address
 ip floating delete
 ------------------
 
-Delete floating IP
+Delete floating IP(s)
 
 .. program:: ip floating delete
 .. code:: bash
 
-    os ip floating delete <floating-ip>
+    os ip floating delete
+        <floating-ip> [<floating-ip> ...]
 
 .. describe:: <floating-ip>
 
-    Floating IP to delete (IP address or ID)
+    Floating IP(s) to delete (IP address or ID)
 
 ip floating list
 ----------------

doc/source/command-objects/security-group-rule.rst

@@ -104,17 +104,17 @@ Create a new security group rule
 security group rule delete
 --------------------------
 
-Delete a security group rule
+Delete security group rule(s)
 
 .. program:: security group rule delete
 .. code:: bash
 
     os security group rule delete
-        <rule>
+        <rule> [<rule> ...]
 
 .. describe:: <rule>
 
-    Security group rule to delete (ID only)
+    Security group rule(s) to delete (ID only)
 
 security group rule list
 ------------------------

doc/source/command-objects/security-group.rst

@@ -45,17 +45,17 @@ Create a new security group
 security group delete
 ---------------------
 
-Delete a security group
+Delete security group(s)
 
 .. program:: security group delete
 .. code:: bash
 
     os security group delete
-        <group>
+        <group> [<group> ...]
 
 .. describe:: <group>
 
-    Security group to delete (name or ID)
+    Security group(s) to delete (name or ID)
 
 security group list
 -------------------

openstackclient/network/v2/floating_ip.py

@@ -110,26 +110,28 @@ def take_action_compute(self, client, parsed_args):
         return (columns, data)
 
 
-class DeleteFloatingIP(common.NetworkAndComputeCommand):
-    """Delete floating IP"""
+class DeleteFloatingIP(common.NetworkAndComputeDelete):
+    """Delete floating IP(s)"""
+
+    # Used by base class to find resources in parsed_args.
+    resource = 'floating_ip'
+    r = None
 
     def update_parser_common(self, parser):
         parser.add_argument(
             'floating_ip',
             metavar="<floating-ip>",
-            help=_("Floating IP to delete (IP address or ID)")
+            nargs="+",
+            help=_("Floating IP(s) to delete (IP address or ID)")
         )
         return parser
 
     def take_action_network(self, client, parsed_args):
-        obj = client.find_ip(parsed_args.floating_ip)
+        obj = client.find_ip(self.r, ignore_missing=False)
         client.delete_ip(obj)
 
     def take_action_compute(self, client, parsed_args):
-        obj = utils.find_resource(
-            client.floating_ips,
-            parsed_args.floating_ip,
-        )
+        obj = utils.find_resource(client.floating_ips, self.r)
         client.floating_ips.delete(obj.id)
 
 

openstackclient/network/v2/security_group.py

@@ -164,26 +164,28 @@ def take_action_compute(self, client, parsed_args):
         return (display_columns, data)
 
 
-class DeleteSecurityGroup(common.NetworkAndComputeCommand):
-    """Delete a security group"""
+class DeleteSecurityGroup(common.NetworkAndComputeDelete):
+    """Delete security group(s)"""
+
+    # Used by base class to find resources in parsed_args.
+    resource = 'group'
+    r = None
 
     def update_parser_common(self, parser):
         parser.add_argument(
             'group',
             metavar='<group>',
-            help=_("Security group to delete (name or ID)")
+            nargs="+",
+            help=_("Security group(s) to delete (name or ID)"),
         )
         return parser
 
     def take_action_network(self, client, parsed_args):
-        obj = client.find_security_group(parsed_args.group)
+        obj = client.find_security_group(self.r, ignore_missing=False)
         client.delete_security_group(obj)
 
     def take_action_compute(self, client, parsed_args):
-        data = utils.find_resource(
-            client.security_groups,
-            parsed_args.group,
-        )
+        data = utils.find_resource(client.security_groups, self.r)
         client.security_groups.delete(data.id)
 
 

openstackclient/network/v2/security_group_rule.py

@@ -333,23 +333,29 @@ def take_action_compute(self, client, parsed_args):
         return _format_security_group_rule_show(obj._info)
 
 
-class DeleteSecurityGroupRule(common.NetworkAndComputeCommand):
-    """Delete a security group rule"""
+class DeleteSecurityGroupRule(common.NetworkAndComputeDelete):
+    """Delete security group rule(s)"""
+
+    # Used by base class to find resources in parsed_args.
+    resource = 'rule'
+    r = None
 
     def update_parser_common(self, parser):
         parser.add_argument(
             'rule',
             metavar='<rule>',
-            help=_("Security group rule to delete (ID only)")
+            nargs="+",
+            help=_("Security group rule(s) to delete (ID only)")
         )
         return parser
 
     def take_action_network(self, client, parsed_args):
-        obj = client.find_security_group_rule(parsed_args.rule)
+        obj = client.find_security_group_rule(
+            self.r, ignore_missing=False)
         client.delete_security_group_rule(obj)
 
     def take_action_compute(self, client, parsed_args):
-        client.security_group_rules.delete(parsed_args.rule)
+        client.security_group_rules.delete(self.r)
 
 
 class ListSecurityGroupRule(common.NetworkAndComputeLister):

openstackclient/tests/compute/v2/fakes.py

@@ -452,6 +452,25 @@ def create_security_groups(attrs=None, count=2):
 
         return security_groups
 
+    @staticmethod
+    def get_security_groups(security_groups=None, count=2):
+        """Get an iterable MagicMock object with a list of faked security groups.
+
+        If security groups list is provided, then initialize the Mock object
+        with the list. Otherwise create one.
+
+        :param List security groups:
+            A list of FakeResource objects faking security groups
+        :param int count:
+            The number of security groups to fake
+        :return:
+            An iterable Mock object with side_effect set to a list of faked
+            security groups
+        """
+        if security_groups is None:
+            security_groups = FakeSecurityGroup.create_security_groups(count)
+        return mock.MagicMock(side_effect=security_groups)
+
 
 class FakeSecurityGroupRule(object):
     """Fake one or more security group rules."""

openstackclient/tests/network/v2/fakes.py

@@ -611,6 +611,25 @@ def create_security_groups(attrs=None, count=2):
 
         return security_groups
 
+    @staticmethod
+    def get_security_groups(security_groups=None, count=2):
+        """Get an iterable MagicMock object with a list of faked security groups.
+
+        If security groups list is provided, then initialize the Mock object
+        with the list. Otherwise create one.
+
+        :param List security groups:
+            A list of FakeResource objects faking security groups
+        :param int count:
+            The number of security groups to fake
+        :return:
+            An iterable Mock object with side_effect set to a list of faked
+            security groups
+        """
+        if security_groups is None:
+            security_groups = FakeSecurityGroup.create_security_groups(count)
+        return mock.MagicMock(side_effect=security_groups)
+
 
 class FakeSecurityGroupRule(object):
     """Fake one or more security group rules."""
@@ -670,6 +689,26 @@ def create_security_group_rules(attrs=None, count=2):
 
         return security_group_rules
 
+    @staticmethod
+    def get_security_group_rules(security_group_rules=None, count=2):
+        """Get an iterable MagicMock object with a list of faked security group rules.
+
+        If security group rules list is provided, then initialize the Mock
+        object with the list. Otherwise create one.
+
+        :param List security group rules:
+            A list of FakeResource objects faking security group rules
+        :param int count:
+            The number of security group rules to fake
+        :return:
+            An iterable Mock object with side_effect set to a list of faked
+            security group rules
+        """
+        if security_group_rules is None:
+            security_group_rules = (
+                FakeSecurityGroupRule.create_security_group_rules(count))
+        return mock.MagicMock(side_effect=security_group_rules)
+
 
 class FakeSubnet(object):
     """Fake one or more subnets."""