python-openstackclient 6.2.0__py3-none-any.whl → 6.2.1__py3-none-any.whl

openstackclient/identity/common.py

@@ -87,6 +87,18 @@ def get_resource(manager, name_type_or_id):
         raise exceptions.CommandError(msg % name_type_or_id)
 
 
+def get_resource_by_id(manager, resource_id):
+    """Get resource by ID
+
+    Raises CommandError if the resource is not found
+    """
+    try:
+        return manager.get(resource_id)
+    except identity_exc.NotFound:
+        msg = _("Resource with id {} not found")
+        raise exceptions.CommandError(msg.format(resource_id))
+
+
 def _get_token_resource(client, resource, parsed_name, parsed_domain=None):
     """Peek into the user's auth token to get resource IDs
 

openstackclient/identity/v3/access_rule.py

@@ -37,7 +37,7 @@ class DeleteAccessRule(command.Command):
             'access_rule',
             metavar='<access-rule>',
             nargs="+",
-            help=_('Access rule(s) to delete (name or ID)'),
+            help=_('Access rule ID(s) to delete'),
         )
         return parser
 
@@ -47,8 +47,9 @@ class DeleteAccessRule(command.Command):
         errors = 0
         for ac in parsed_args.access_rule:
             try:
-                access_rule = utils.find_resource(
-                    identity_client.access_rules, ac)
+                access_rule = common.get_resource_by_id(
+                    identity_client.access_rules, ac
+                )
                 identity_client.access_rules.delete(access_rule.id)
             except Exception as e:
                 errors += 1
@@ -103,14 +104,15 @@ class ShowAccessRule(command.ShowOne):
         parser.add_argument(
             'access_rule',
             metavar='<access-rule>',
-            help=_('Access rule to display (name or ID)'),
+            help=_('Access rule ID to display'),
         )
         return parser
 
     def take_action(self, parsed_args):
         identity_client = self.app.client_manager.identity
-        access_rule = utils.find_resource(identity_client.access_rules,
-                                          parsed_args.access_rule)
+        access_rule = common.get_resource_by_id(
+            identity_client.access_rules, parsed_args.access_rule
+        )
 
         access_rule._info.pop('links', None)
 

openstackclient/network/v2/network_service_provider.py

@@ -26,18 +26,24 @@ class ListNetworkServiceProvider(command.Lister):
         client = self.app.client_manager.network
 
         columns = (
-            'service_type',
-            'name',
-            'is_default',
+            "service_type",
+            "name",
+            "is_default",
         )
         column_headers = (
-            'Service Type',
-            'Name',
-            'Default',
+            "Service Type",
+            "Name",
+            "Default",
         )
 
         data = client.service_providers()
-        return(column_headers,
-               (utils.get_item_properties(
-                   s, columns,
-               ) for s in data))
+        return (
+            column_headers,
+            (
+                utils.get_item_properties(
+                    s,
+                    columns,
+                )
+                for s in data
+            ),
+        )

openstackclient/tests/unit/identity/v3/test_access_rule.py

@@ -14,10 +14,9 @@
 #
 
 import copy
-from unittest import mock
 
+from keystoneclient import exceptions as identity_exc
 from osc_lib import exceptions
-from osc_lib import utils
 
 from openstackclient.identity.v3 import access_rule
 from openstackclient.tests.unit import fakes
@@ -69,10 +68,13 @@ class TestAccessRuleDelete(TestAccessRule):
         )
         self.assertIsNone(result)
 
-    @mock.patch.object(utils, 'find_resource')
-    def test_delete_multi_access_rules_with_exception(self, find_mock):
-        find_mock.side_effect = [self.access_rules_mock.get.return_value,
-                                 exceptions.CommandError]
+    def test_delete_multi_access_rules_with_exception(self):
+        # mock returns for common.get_resource_by_id
+        mock_get = self.access_rules_mock.get
+        mock_get.side_effect = [
+            mock_get.return_value,
+            identity_exc.NotFound,
+        ]
         arglist = [
             identity_fakes.access_rule_id,
             'nonexistent_access_rule',
@@ -89,12 +91,10 @@ class TestAccessRuleDelete(TestAccessRule):
             self.assertEqual('1 of 2 access rules failed to'
                              ' delete.', str(e))
 
-        find_mock.assert_any_call(self.access_rules_mock,
-                                  identity_fakes.access_rule_id)
-        find_mock.assert_any_call(self.access_rules_mock,
-                                  'nonexistent_access_rule')
+        mock_get.assert_any_call(identity_fakes.access_rule_id)
+        mock_get.assert_any_call('nonexistent_access_rule')
 
-        self.assertEqual(2, find_mock.call_count)
+        self.assertEqual(2, mock_get.call_count)
         self.access_rules_mock.delete.assert_called_once_with(
             identity_fakes.access_rule_id)
 

{python_openstackclient-6.2.0.dist-info → python_openstackclient-6.2.1.dist-info}/AUTHORS

@@ -110,6 +110,7 @@ Doug Hellmann <doug.hellmann@dreamhost.com>
 Doug Hellmann <doug@doughellmann.com>
 Doug Wiegley <dwiegley@salesforce.com>
 Dougal Matthews <dougal@redhat.com>
+Douglas Mendizábal <dmendiza@redhat.com>
 Dr. Jens Harbott <harbott@osism.tech>
 Einst Crazy <yu.changcai@99cloud.net>
 Elena Ezhova <eezhova@mirantis.com>

{python_openstackclient-6.2.0.dist-info → python_openstackclient-6.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-openstackclient
-Version: 6.2.0
+Version: 6.2.1
 Summary: OpenStack Command-line Client
 Home-page: https://docs.openstack.org/python-openstackclient/latest/
 Author: OpenStack

{python_openstackclient-6.2.0.dist-info → python_openstackclient-6.2.1.dist-info}/RECORD

@@ -41,7 +41,7 @@ openstackclient/compute/v2/service.py,sha256=lFOh49wQNlFWeNGlhYdclyg_ALLEMIfy83P
 openstackclient/compute/v2/usage.py,sha256=PFR5zuev2Sfo96lkUrPln_-R_I228PUGCEzUgu_kJvM,8937
 openstackclient/identity/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/identity/client.py,sha256=O4GgzRaSKpzgxvA24-beDDb6HFuFJR3XQ3WqkdPr5NQ,2433
-openstackclient/identity/common.py,sha256=djiJGxPeRS1wP0MHe1CKuWkHOFKeAkWUCyeltmWRgwA,10836
+openstackclient/identity/common.py,sha256=72nCrrkl4wbYE6-DZB5-sJqXun5b1ShbjvQTCyVD4KA,11167
 openstackclient/identity/v2_0/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/identity/v2_0/catalog.py,sha256=5KPtImNGcIsiCqaATiLtVg5ymN95RoqK0bN87wDnJrM,3398
 openstackclient/identity/v2_0/ec2creds.py,sha256=3-QtZrse0ZhiD8OlImzyZG6uOzG0vgrXXkcGzKcW5i4,6433
@@ -53,7 +53,7 @@ openstackclient/identity/v2_0/service.py,sha256=JqF-kPIOmtEd5s3cbCi1pDmzSDwQvN80
 openstackclient/identity/v2_0/token.py,sha256=wP06EE393ddc08UjIBREKq_Tzrgs7L_cN_P-AU3Pwd0,2227
 openstackclient/identity/v2_0/user.py,sha256=shd-FShR1pcNgAVnJPfc_AR7fbEjKNWTQoUMAMdCpV0,13247
 openstackclient/identity/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-openstackclient/identity/v3/access_rule.py,sha256=eTzaI8HijBjQbnMGQaa8pmprpAR-X3ktxdhGNAvXMTg,3913
+openstackclient/identity/v3/access_rule.py,sha256=9QOpwb8az_jeSjzUaSq0F88dW2USWplaPjUAbRvDMq0,3902
 openstackclient/identity/v3/application_credential.py,sha256=FcZGaP2FYnMGWKP7dyP1qtfH6vTpVtg1XnentnLZAWo,9177
 openstackclient/identity/v3/catalog.py,sha256=Csy-1UUUPxhsjxB15bAh0OcjfvLd0L-MRPQOT6_Mnhw,3204
 openstackclient/identity/v3/consumer.py,sha256=0g7uKEb_oAV3wTMly0IY4ogbvYLBOQC8cvGg-6qwGAY,4679
@@ -118,7 +118,7 @@ openstackclient/network/v2/network_qos_rule_type.py,sha256=-6RHHjzxVQ7lWXHMbCSWY
 openstackclient/network/v2/network_rbac.py,sha256=mtS_wWjX5noqS0NyvSGl7dE8CkZ0T0YQ71vUegsFcQM,12138
 openstackclient/network/v2/network_segment.py,sha256=E0j14mxPgDsWCZ3wQ_-cjUskUU1ZfXpLQxpPTgLyrkc,8710
 openstackclient/network/v2/network_segment_range.py,sha256=u_0qNX_SgXBj7l-jBLwXkAdR28Nn2NjV7d4kemzYIjY,17190
-openstackclient/network/v2/network_service_provider.py,sha256=EBrfrkGRLuKv1BPIBzTu5onjIm6j4nr7zOrNDd4UyLo,1295
+openstackclient/network/v2/network_service_provider.py,sha256=b0pKHxB5Qq1U2lfOCWHKJ8CMX661gBbKtv0jXvuE3Xg,1384
 openstackclient/network/v2/network_trunk.py,sha256=cjHGNbRiS7nXn-IDpau5pHLxdtwuATVtKGIsqsE_5Y8,14028
 openstackclient/network/v2/port.py,sha256=4W5GqMKw2HnMZDY6gcsH7XnwTNluAiKPgLLFEzkAqZM,41064
 openstackclient/network/v2/router.py,sha256=zsr4oHaw0WhNQmIvPrfb1U-K0rK_hXf0kpExsnIErmA,36215
@@ -307,7 +307,7 @@ openstackclient/tests/unit/identity/v2_0/test_token.py,sha256=U5xvDVhqoWKlMtQJ7C
 openstackclient/tests/unit/identity/v2_0/test_user.py,sha256=10IWTMivtM1_OSQ9gGSjgijFHxurt7Bl1d6ZWwQh5aA,25322
 openstackclient/tests/unit/identity/v3/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 openstackclient/tests/unit/identity/v3/fakes.py,sha256=uxc51jJSrr08l7czr0mbXmZB_QJOb8jNKWTaWqxLryI,34955
-openstackclient/tests/unit/identity/v3/test_access_rule.py,sha256=h4hA-a0rtFU3kJQJVgpJw6RY3V1o4JCHGEt-FztwULY,5694
+openstackclient/tests/unit/identity/v3/test_access_rule.py,sha256=5ZVw6M0nn8F2cyT7LQB2F6O3Qx0r9WJuyAmfhEnvBCo,5599
 openstackclient/tests/unit/identity/v3/test_application_credential.py,sha256=D1EO49CBqWSF4gAV3edOinj8AeuitGqXTxAbW4IOqH4,14492
 openstackclient/tests/unit/identity/v3/test_catalog.py,sha256=4rDq3QkRy8KghpgxffdgIHgPdrweZbM8VWAGuN8l_vc,4897
 openstackclient/tests/unit/identity/v3/test_consumer.py,sha256=jK5fSrOBqM5gw_VUPkQU8hr-DOAHFyVWEsOvUvFWufI,6837
@@ -467,11 +467,11 @@ openstackclient/volume/v3/volume_group.py,sha256=99F6h80FWFLiBfE2Sl-c4qnfQVPQMQj
 openstackclient/volume/v3/volume_group_snapshot.py,sha256=D22s5ntEcUNy8TVVHkZOu7TA8ouaXi8ujkBq5ZuIF6k,6936
 openstackclient/volume/v3/volume_group_type.py,sha256=jgn-qlZKhOFhr9ImvHFHOR8BvjVlVt93f39DJLBPfJE,12579
 openstackclient/volume/v3/volume_message.py,sha256=MpQUFHWITqVaqTsKg3_B_-f4I2RGAV3PpUxY8cj04oM,5173
-python_openstackclient-6.2.0.dist-info/AUTHORS,sha256=KXt_Lo7oBFnuUUXWV_cBnfcg32qu6GhWJ0jKI7Cu6xQ,20151
-python_openstackclient-6.2.0.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-python_openstackclient-6.2.0.dist-info/METADATA,sha256=VkmwO_koJfYrvUKf1UG3keHc-28NmDb7Dfav0bMfh-w,6469
-python_openstackclient-6.2.0.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
-python_openstackclient-6.2.0.dist-info/entry_points.txt,sha256=BjwZ6EzUVhRjJnWppdeyHD2tte2i0Lcvs0xrYM-vnYs,50595
-python_openstackclient-6.2.0.dist-info/pbr.json,sha256=MTpVlC-fY_ZnhDT2c8Zu1prCk8J25ojuk3olxgZIbqY,47
-python_openstackclient-6.2.0.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
-python_openstackclient-6.2.0.dist-info/RECORD,,
+python_openstackclient-6.2.1.dist-info/AUTHORS,sha256=nJbWkAiUutJnfeF-wHwrYObbIPdosIOC2XdIHpa9lxs,20193
+python_openstackclient-6.2.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+python_openstackclient-6.2.1.dist-info/METADATA,sha256=HBWrybr3GXsnWgNXvOPWEWU2atEWf0BVBc8gQ46wyao,6469
+python_openstackclient-6.2.1.dist-info/WHEEL,sha256=g4nMs7d-Xl9-xC9XovUrsDHGXt-FT0E17Yqo92DEfvY,92
+python_openstackclient-6.2.1.dist-info/entry_points.txt,sha256=BjwZ6EzUVhRjJnWppdeyHD2tte2i0Lcvs0xrYM-vnYs,50595
+python_openstackclient-6.2.1.dist-info/pbr.json,sha256=7m8bKh9ypnq5JA6ZOdmuW5ZVz8E-qtipYulTDExGE3A,47
+python_openstackclient-6.2.1.dist-info/top_level.txt,sha256=htg7z9oZgysRuVUHn-m1Bk6XLGOeV65nMbZX9H8qhs0,16
+python_openstackclient-6.2.1.dist-info/RECORD,,

python_openstackclient-6.2.1.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "02172959", "is_release": true}

python_openstackclient-6.2.0.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "05d34ffc", "is_release": true}