Merge "Change to plural form of object in multi delete error message in networkv2"

Author: Jenkins

openstackclient/network/common.py

@@ -111,7 +111,7 @@ def take_action(self, parsed_args):
 
         if ret:
             total = len(resources)
-            msg = _("%(num)s of %(total)s %(resource)s failed to delete.") % {
+            msg = _("%(num)s of %(total)s %(resource)ss failed to delete.") % {
                 "num": ret,
                 "total": total,
                 "resource": self.resource,

openstackclient/tests/network/v2/test_floating_ip.py

@@ -211,7 +211,7 @@ def test_multi_floating_ips_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 floating_ip failed to delete.', str(e))
+            self.assertEqual('1 of 2 floating_ips failed to delete.', str(e))
 
         self.network.find_ip.assert_any_call(
             self.floating_ips[0].id, ignore_missing=False)
@@ -462,7 +462,7 @@ def test_multi_floating_ips_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 floating_ip failed to delete.', str(e))
+            self.assertEqual('1 of 2 floating_ips failed to delete.', str(e))
 
         self.compute.floating_ips.get.assert_any_call(
             self.floating_ips[0].id)

openstackclient/tests/network/v2/test_security_group.py

@@ -296,7 +296,7 @@ def test_multi_security_groups_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 group failed to delete.', str(e))
+            self.assertEqual('1 of 2 groups failed to delete.', str(e))
 
         self.network.find_security_group.assert_any_call(
             self._security_groups[0].name, ignore_missing=False)
@@ -384,7 +384,7 @@ def test_multi_security_groups_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 group failed to delete.', str(e))
+            self.assertEqual('1 of 2 groups failed to delete.', str(e))
 
         self.compute.security_groups.get.assert_any_call(
             self._security_groups[0].id)

openstackclient/tests/network/v2/test_security_group_rule.py

@@ -739,7 +739,7 @@ def test_multi_security_group_rules_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 rule failed to delete.', str(e))
+            self.assertEqual('1 of 2 rules failed to delete.', str(e))
 
         self.network.find_security_group_rule.assert_any_call(
             self._security_group_rules[0].id, ignore_missing=False)
@@ -819,7 +819,7 @@ def test_multi_security_group_rules_delete_with_exception(self):
             self.cmd.take_action(parsed_args)
             self.fail('CommandError should be raised.')
         except exceptions.CommandError as e:
-            self.assertEqual('1 of 2 rule failed to delete.', str(e))
+            self.assertEqual('1 of 2 rules failed to delete.', str(e))
 
         self.compute.security_group_rules.delete.assert_any_call(
             self._security_group_rules[0].id)