openstacksdk 3.2.0__tar.gz → 3.3.0__tar.gz

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/AUTHORS

@@ -119,6 +119,7 @@ Dr. Jens Harbott <harbott@osism.tech>
 Duan Jiong <jduan@fiberhome.com>
 Duc Truong <dtruong@blizzard.com>
 Dylan Zapzalka <dylanjameszapzalka@hotmail.com>
+Ebil Jacob <ebilj@andrew.cmu.edu>
 EdLeafe <ed@leafe.com>
 Emilien Lefrancois <elefrancois@outlook.com>
 Eric Fried <openstack@fried.cc>

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/ChangeLog

@@ -1,14 +1,24 @@
 CHANGES
 =======
 
+3.3.0
+-----
+
+* compute, volume: Improve 'update\_quota\_set'
+* compute: Correct base path for default, detailed quotas
+* Use mypy syntax compatible with older pythons
+* Combine 3 auto\_allocated\_topology tests into one test
+* Run auto\_allocated\_topology functional tests in the own project
+* baremetal: Adds list node firmware support
+
 3.2.0
 -----
 
 * tests: Rework warnings-related tests
 * compute, block storage: Add support for quota class sets
 * compute: Add additional server create parameters
-* compute: Add support for legacy 'onSharedStorage' param
 * compute: Add additional options to Server.rebuild
+* compute: Add support for legacy 'onSharedStorage' param
 * compute: Add server tag proxy methods
 * compute: Add Server.clear\_password action
 * compute, block storage: Minor fixes to limits

{openstacksdk-3.2.0/openstacksdk.egg-info → openstacksdk-3.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.2
 Name: openstacksdk
-Version: 3.2.0
+Version: 3.3.0
 Summary: An SDK for building applications to work with OpenStack
 Home-page: https://docs.openstack.org/openstacksdk/
 Author: OpenStack

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/baremetal/v1/_common.py

@@ -88,6 +88,9 @@ DEPLOY_STEPS_VERSION = '1.69'
 CHANGE_BOOT_MODE_VERSION = '1.76'
 """API version in which boot_mode and secure_boot states can be changed"""
 
+FIRMWARE_VERSION = '1.86'
+"""API version in which firmware components of a node can be accessed"""
+
 
 class Resource(resource.Resource):
     base_path: str

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/baremetal/v1/_proxy.py

@@ -1243,6 +1243,16 @@ class Proxy(proxy.Proxy):
         res = self._get_resource(_node.Node, node)
         return res.set_traits(self, traits)
 
+    def list_node_firmware(self, node):
+        """Lists firmware components for a node.
+
+        :param node: The value can be the name or ID of a node or a
+            :class:`~openstack.baremetal.v1.node.Node` instance.
+        :returns: A list of the node's firmware components.
+        """
+        res = self._get_resource(_node.Node, node)
+        return res.list_firmware(self)
+
     def volume_connectors(self, details=False, **query):
         """Retrieve a generator of volume_connector.
 

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/baremetal/v1/node.py

@@ -1397,6 +1397,37 @@ class Node(_common.Resource):
         exceptions.raise_from_response(response, error_message=msg)
         return response.json()
 
+    def list_firmware(self, session):
+        """List firmware components associated with the node.
+
+        :param session: The session to use for making this request.
+        :returns: The HTTP response.
+        """
+        session = self._get_session(session)
+        version = self._assert_microversion_for(
+            session,
+            'fetch',
+            _common.FIRMWARE_VERSION,
+            error_message=("Cannot use node list firmware components API"),
+        )
+
+        request = self._prepare_request(requires_id=True)
+        request.url = utils.urljoin(request.url, 'firmware')
+
+        response = session.get(
+            request.url,
+            headers=request.headers,
+            microversion=version,
+            retriable_status_codes=_common.RETRIABLE_STATUS_CODES,
+        )
+
+        msg = "Failed to list firmware components for node {node}".format(
+            node=self.id
+        )
+        exceptions.raise_from_response(response, error_message=msg)
+
+        return response.json()
+
     def patch(
         self,
         session,

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/block_storage/v2/_proxy.py

@@ -10,6 +10,8 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
+import warnings
+
 from openstack.block_storage import _base_proxy
 from openstack.block_storage.v2 import backup as _backup
 from openstack.block_storage.v2 import capabilities as _capabilities
@@ -23,6 +25,7 @@ from openstack.block_storage.v2 import type as _type
 from openstack.block_storage.v2 import volume as _volume
 from openstack.identity.v3 import project as _project
 from openstack import resource
+from openstack import warnings as os_warnings
 
 
 class Proxy(_base_proxy.BaseBlockStorageProxy):
@@ -769,22 +772,37 @@ class Proxy(_base_proxy.BaseBlockStorageProxy):
             query = {}
         return res.delete(self, **query)
 
-    def update_quota_set(self, quota_set, query=None, **attrs):
+    def update_quota_set(self, project, **attrs):
         """Update a QuotaSet.
 
-        :param quota_set: Either the ID of a quota_set or a
-            :class:`~openstack.block_storage.v2.quota_set.QuotaSet` instance.
-        :param dict query: Optional parameters to be used with update call.
+        :param project: ID or instance of
+            :class:`~openstack.identity.project.Project` of the project for
+            which the quota should be reset.
         :param attrs: The attributes to update on the QuotaSet represented
             by ``quota_set``.
 
         :returns: The updated QuotaSet
-        :rtype: :class:`~openstack.block_storage.v2.quota_set.QuotaSet`
-        """
-        res = self._get_resource(_quota_set.QuotaSet, quota_set, **attrs)
-        if not query:
-            query = {}
-        return res.commit(self, **query)
+        :rtype: :class:`~openstack.block_storage.v3.quota_set.QuotaSet`
+        """
+        if 'project_id' in attrs or isinstance(project, _quota_set.QuotaSet):
+            warnings.warn(
+                "The signature of 'update_quota_set' has changed and it "
+                "now expects a Project as the first argument, in line "
+                "with the other quota set methods.",
+                os_warnings.RemovedInSDK50Warning,
+            )
+            if isinstance(project, _quota_set.QuotaSet):
+                attrs['project_id'] = project.project_id
+
+            # cinder doesn't support any query parameters so we simply pop
+            # these
+            if 'query' in attrs:
+                attrs.pop('params')
+        else:
+            project = self._get_resource(_project.Project, project)
+            attrs['project_id'] = project.id
+
+        return self._update(_quota_set.QuotaSet, None, **attrs)
 
     # ====== VOLUME METADATA ======
     def get_volume_metadata(self, volume):

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/block_storage/v3/_proxy.py

@@ -11,6 +11,7 @@
 # under the License.
 
 import typing as ty
+import warnings
 
 from openstack.block_storage import _base_proxy
 from openstack.block_storage.v3 import attachment as _attachment
@@ -36,6 +37,7 @@ from openstack import exceptions
 from openstack.identity.v3 import project as _project
 from openstack import resource
 from openstack import utils
+from openstack import warnings as os_warnings
 
 
 class Proxy(_base_proxy.BaseBlockStorageProxy):
@@ -1794,22 +1796,37 @@ class Proxy(_base_proxy.BaseBlockStorageProxy):
 
         return res.delete(self, **query)
 
-    def update_quota_set(self, quota_set, query=None, **attrs):
+    def update_quota_set(self, project, **attrs):
         """Update a QuotaSet.
 
-        :param quota_set: Either the ID of a quota_set or a
-            :class:`~openstack.block_storage.v3.quota_set.QuotaSet` instance.
-        :param dict query: Optional parameters to be used with update call.
+        :param project: ID or instance of
+            :class:`~openstack.identity.project.Project` of the project for
+            which the quota should be reset.
         :param attrs: The attributes to update on the QuotaSet represented
             by ``quota_set``.
 
         :returns: The updated QuotaSet
         :rtype: :class:`~openstack.block_storage.v3.quota_set.QuotaSet`
         """
-        res = self._get_resource(_quota_set.QuotaSet, quota_set, **attrs)
-        if not query:
-            query = {}
-        return res.commit(self, **query)
+        if 'project_id' in attrs or isinstance(project, _quota_set.QuotaSet):
+            warnings.warn(
+                "The signature of 'update_quota_set' has changed and it "
+                "now expects a Project as the first argument, in line "
+                "with the other quota set methods.",
+                os_warnings.RemovedInSDK50Warning,
+            )
+            if isinstance(project, _quota_set.QuotaSet):
+                attrs['project_id'] = project.project_id
+
+            # cinder doesn't support any query parameters so we simply pop
+            # these
+            if 'query' in attrs:
+                attrs.pop('params')
+        else:
+            project = self._get_resource(_project.Project, project)
+            attrs['project_id'] = project.id
+
+        return self._update(_quota_set.QuotaSet, None, **attrs)
 
     # ====== SERVICES ======
     @ty.overload

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/cloud/_block_storage.py

@@ -13,7 +13,6 @@
 import warnings
 
 from openstack.block_storage.v3._proxy import Proxy
-from openstack.block_storage.v3 import quota_set as _qs
 from openstack.cloud import _utils
 from openstack import exceptions
 from openstack import warnings as os_warnings
@@ -842,12 +841,9 @@ class BlockStorageCloudMixin:
         :raises: :class:`~openstack.exceptions.SDKException` if the resource to
             set the quota does not exist.
         """
+        project = self.identity.find_project(name_or_id, ignore_missing=False)
 
-        proj = self.identity.find_project(name_or_id, ignore_missing=False)
-
-        self.block_storage.update_quota_set(
-            _qs.QuotaSet(project_id=proj.id), **kwargs
-        )
+        self.block_storage.update_quota_set(project=project, **kwargs)
 
     def get_volume_quotas(self, name_or_id):
         """Get volume quotas for a project

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/cloud/_compute.py

@@ -21,7 +21,6 @@ from openstack.cloud import _utils
 from openstack.cloud import exc
 from openstack.cloud import meta
 from openstack.compute.v2._proxy import Proxy
-from openstack.compute.v2 import quota_set as _qs
 from openstack.compute.v2 import server as _server
 from openstack import exceptions
 from openstack import utils
@@ -1774,11 +1773,9 @@ class ComputeCloudMixin:
         :raises: :class:`~openstack.exceptions.SDKException` if the resource to
             set the quota does not exist.
         """
-        proj = self.identity.find_project(name_or_id, ignore_missing=False)
+        project = self.identity.find_project(name_or_id, ignore_missing=False)
         kwargs['force'] = True
-        self.compute.update_quota_set(
-            _qs.QuotaSet(project_id=proj.id), **kwargs
-        )
+        self.compute.update_quota_set(project=project, **kwargs)
 
     def get_compute_quotas(self, name_or_id):
         """Get quota for a project

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/compute/v2/_proxy.py

@@ -37,6 +37,7 @@ from openstack.compute.v2 import usage as _usage
 from openstack.compute.v2 import volume_attachment as _volume_attachment
 from openstack import exceptions
 from openstack.identity.v3 import project as _project
+from openstack.identity.v3 import user as _user
 from openstack.network.v2 import security_group as _sg
 from openstack import proxy
 from openstack import resource
@@ -2465,7 +2466,8 @@ class Proxy(proxy.Proxy):
             None,
             project_id=project.id,
         )
-        return res.fetch(self, usage=usage, **query)
+        base_path = '/os-quota-sets/%(project_id)s/detail' if usage else None
+        return res.fetch(self, base_path=base_path, **query)
 
     def get_quota_set_defaults(self, project):
         """Show QuotaSet defaults for the project
@@ -2484,45 +2486,68 @@ class Proxy(proxy.Proxy):
             None,
             project_id=project.id,
         )
-        return res.fetch(self, base_path='/os-quota-sets/defaults')
+        return res.fetch(
+            self, base_path='/os-quota-sets/%(project_id)s/defaults'
+        )
 
     def revert_quota_set(self, project, **query):
         """Reset Quota for the project/user.
 
         :param project: ID or instance of
             :class:`~openstack.identity.project.Project` of the project for
-            which the quota should be resetted.
+            which the quota should be reset.
         :param dict query: Additional parameters to be used.
 
         :returns: ``None``
         """
         project = self._get_resource(_project.Project, project)
         res = self._get_resource(
-            _quota_set.QuotaSet,
-            None,
-            project_id=project.id,
+            _quota_set.QuotaSet, None, project_id=project.id
         )
 
         if not query:
             query = {}
         return res.delete(self, **query)
 
-    def update_quota_set(self, quota_set, query=None, **attrs):
+    def update_quota_set(self, project, *, user=None, **attrs):
         """Update a QuotaSet.
 
-        :param quota_set: Either the ID of a quota_set or a
-            :class:`~openstack.compute.v2.quota_set.QuotaSet` instance.
-        :param dict query: Optional parameters to be used with update call.
+        :param project: ID or instance of
+            :class:`~openstack.identity.project.Project` of the project for
+            which the quota should be reset.
+        :param user_id: Optional ID of the user to set quotas as.
         :param attrs: The attributes to update on the QuotaSet represented
             by ``quota_set``.
 
         :returns: The updated QuotaSet
         :rtype: :class:`~openstack.compute.v2.quota_set.QuotaSet`
         """
-        res = self._get_resource(_quota_set.QuotaSet, quota_set, **attrs)
-        if not query:
-            query = {}
-        return res.commit(self, **query)
+        query = {}
+
+        if 'project_id' in attrs or isinstance(project, _quota_set.QuotaSet):
+            warnings.warn(
+                "The signature of 'update_quota_set' has changed and it "
+                "now expects a Project as the first argument, in line "
+                "with the other quota set methods.",
+                os_warnings.RemovedInSDK50Warning,
+            )
+            if isinstance(project, _quota_set.QuotaSet):
+                attrs['project_id'] = project.project_id
+
+            if 'query' in attrs:
+                query = attrs.pop('query')
+        else:
+            project = self._get_resource(_project.Project, project)
+            attrs['project_id'] = project.id
+
+            if user:
+                user = self._get_resource(_user.User, user)
+                query['user_id'] = user.id
+
+        # we don't use Proxy._update since that doesn't allow passing arbitrary
+        # query string parameters
+        quota_set = self._get_resource(_quota_set.QuotaSet, None, **attrs)
+        return quota_set.commit(self, **query)
 
     # ========== Server actions ==========
 

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/dns/v2/_base.py

@@ -80,7 +80,7 @@ class Resource(resource.Resource):
         all_projects=None,
         **params,
     ):
-        headers: ty.Union[ty.Dict[str, str] | None] = (
+        headers: ty.Union[ty.Union[ty.Dict[str, str], None]] = (
             {} if project_id or all_projects else None
         )
 

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/tests/functional/baremetal/test_baremetal_node.py

@@ -489,3 +489,13 @@ class TestTraits(base.BaseBaremetalTest):
         self.assertEqual(['CUSTOM_FOOBAR'], self.node.traits)
         node = self.conn.baremetal.get_node(self.node)
         self.assertEqual(['CUSTOM_FOOBAR'], node.traits)
+
+
+class TestBareMetalNodeListFirmware(base.BaseBaremetalTest):
+    min_microversion = '1.86'
+
+    def test_list_firmware(self):
+        node = self.create_node(firmware_interface="no-firmware")
+        self.assertEqual("no-firmware", node.firmware_interface)
+        result = self.conn.baremetal.list_node_firmware(node)
+        self.assertEqual({'firmware': []}, result)

openstacksdk-3.3.0/openstack/tests/functional/network/v2/test_auto_allocated_topology.py

@@ -0,0 +1,116 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License 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 openstack.tests.functional import base
+
+
+class TestAutoAllocatedTopology(base.BaseFunctionalTest):
+    NETWORK_NAME = "auto_allocated_network"
+    NETWORK_ID = None
+    PROJECT_ID = None
+
+    def setUp(self):
+        super().setUp()
+        if not self.operator_cloud:
+            self.skipTest("Operator cloud is required for this test")
+        if not self.operator_cloud._has_neutron_extension(
+            "auto-allocated-topology"
+        ):
+            self.skipTest(
+                "Neutron auto-allocated-topology extension is "
+                "required for this test"
+            )
+
+        project = self._create_project()
+        self.PROJECT_ID = project['id']
+        self.test_cloud = self.operator_cloud.connect_as_project(project)
+
+        # Dry run will only pass if there is a public network
+        self._set_network_external()
+
+    def tearDown(self):
+        res = self.test_cloud.network.delete_auto_allocated_topology(
+            self.PROJECT_ID
+        )
+        self.assertIsNone(res)
+        self._destroy_project()
+        super().tearDown()
+
+    def _create_project(self):
+        project_name = 'auto_allocated_topology_test_project'
+        project = self.operator_cloud.get_project(project_name)
+        if not project:
+            params = {
+                'name': project_name,
+                'description': (
+                    'test project used only for the '
+                    'TestAutoAllocatedTopology tests class'
+                ),
+            }
+            if self.identity_version == '3':
+                params['domain_id'] = self.operator_cloud.get_domain(
+                    'default'
+                )['id']
+
+            project = self.operator_cloud.create_project(**params)
+
+        user_id = self.operator_cloud.current_user_id
+        # Grant the current user access to the project
+        role_assignment = self.operator_cloud.list_role_assignments(
+            {'user': user_id, 'project': project['id']}
+        )
+        if not role_assignment:
+            self.operator_cloud.grant_role(
+                'member', user=user_id, project=project['id'], wait=True
+            )
+        return project
+
+    def _destroy_project(self):
+        self.operator_cloud.revoke_role(
+            'member',
+            user=self.operator_cloud.current_user_id,
+            project=self.PROJECT_ID,
+        )
+        self.operator_cloud.delete_project(self.PROJECT_ID)
+
+    def test_auto_allocated_topology(self):
+        # First test validation with the 'dry-run' call
+        # Dry run option will return "dry-run=pass" in the 'id' resource
+        top = self.test_cloud.network.validate_auto_allocated_topology(
+            self.PROJECT_ID
+        )
+        self.assertEqual(self.PROJECT_ID, top.project)
+        self.assertEqual("dry-run=pass", top.id)
+
+        # test show auto_allocated_network without project id in the request
+        top = self.test_cloud.network.get_auto_allocated_topology()
+        project = self.test_cloud.session.get_project_id()
+        network = self.test_cloud.network.get_network(top.id)
+        self.assertEqual(top.project_id, project)
+        self.assertEqual(top.id, network.id)
+
+        # test show auto_allocated_network with project id in the request
+        top = self.test_cloud.network.get_auto_allocated_topology(
+            self.PROJECT_ID
+        )
+        network = self.test_cloud.network.get_network(top.id)
+        self.assertEqual(top.project_id, network.project_id)
+        self.assertEqual(top.id, network.id)
+        self.assertEqual(network.name, "auto_allocated_network")
+
+    def _set_network_external(self):
+        networks = self.test_cloud.network.networks()
+        for network in networks:
+            if network.name == "public":
+                self.test_cloud.network.update_network(
+                    network, is_default=True
+                )

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/tests/unit/baremetal/v1/test_node.py

@@ -1293,3 +1293,48 @@ class TestNodeInventory(base.TestCase):
             microversion='1.81',
             retriable_status_codes=_common.RETRIABLE_STATUS_CODES,
         )
+
+
+@mock.patch.object(node.Node, 'fetch', lambda self, session: self)
+@mock.patch.object(exceptions, 'raise_from_response', mock.Mock())
+class TestNodeFirmware(base.TestCase):
+    def setUp(self):
+        super().setUp()
+        self.node = node.Node(**FAKE)
+        self.session = mock.Mock(
+            spec=adapter.Adapter,
+            default_microversion='1.86',
+        )
+
+    def test_list_firmware(self):
+        node_firmware = {
+            "firmware": [
+                {
+                    "created_at": "2016-08-18T22:28:49.653974+00:00",
+                    "updated_at": "2016-08-18T22:28:49.653974+00:00",
+                    "component": "BMC",
+                    "initial_version": "v1.0.0",
+                    "current_version": "v1.2.0",
+                    "last_version_flashed": "v1.2.0",
+                },
+                {
+                    "created_at": "2016-08-18T22:28:49.653974+00:00",
+                    "updated_at": "2016-08-18T22:28:49.653974+00:00",
+                    "component": "BIOS",
+                    "initial_version": "v1.0.0",
+                    "current_version": "v1.1.5",
+                    "last_version_flashed": "v1.1.5",
+                },
+            ]
+        }
+        self.session.get.return_value.json.return_value = node_firmware
+
+        res = self.node.list_firmware(self.session)
+        self.assertEqual(node_firmware, res)
+
+        self.session.get.assert_called_once_with(
+            'nodes/%s/firmware' % self.node.id,
+            headers=mock.ANY,
+            microversion='1.86',
+            retriable_status_codes=_common.RETRIABLE_STATUS_CODES,
+        )

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/tests/unit/block_storage/v2/test_proxy.py

@@ -21,7 +21,8 @@ from openstack.block_storage.v2 import snapshot
 from openstack.block_storage.v2 import stats
 from openstack.block_storage.v2 import type
 from openstack.block_storage.v2 import volume
-from openstack import resource
+from openstack.identity.v3 import project
+from openstack import proxy as proxy_base
 from openstack.tests.unit import test_proxy_base
 
 
@@ -526,19 +527,17 @@ class TestQuotaSet(TestVolumeProxy):
             expected_kwargs={'user_id': 'uid'},
         )
 
-    @mock.patch('openstack.proxy.Proxy._get_resource', autospec=True)
-    def test_quota_set_update(self, gr_mock):
-        gr_mock.return_value = resource.Resource()
-        gr_mock.commit = mock.Mock()
+    @mock.patch.object(proxy_base.Proxy, '_get_resource')
+    def test_quota_set_update(self, mock_get):
+        fake_project = project.Project(id='prj')
+        mock_get.side_effect = [fake_project]
+
         self._verify(
-            'openstack.resource.Resource.commit',
+            'openstack.proxy.Proxy._update',
             self.proxy.update_quota_set,
-            method_args=['qs'],
-            method_kwargs={
-                'query': {'user_id': 'uid'},
-                'a': 'b',
-            },
-            expected_args=[self.proxy],
-            expected_kwargs={'user_id': 'uid'},
+            method_args=['prj'],
+            method_kwargs={'volumes': 123},
+            expected_args=[quota_set.QuotaSet, None],
+            expected_kwargs={'project_id': 'prj', 'volumes': 123},
         )
-        gr_mock.assert_called_with(self.proxy, quota_set.QuotaSet, 'qs', a='b')
+        mock_get.assert_called_once_with(project.Project, 'prj')

{openstacksdk-3.2.0 → openstacksdk-3.3.0}/openstack/tests/unit/block_storage/v3/test_proxy.py

@@ -28,7 +28,8 @@ from openstack.block_storage.v3 import snapshot
 from openstack.block_storage.v3 import stats
 from openstack.block_storage.v3 import type
 from openstack.block_storage.v3 import volume
-from openstack import resource
+from openstack.identity.v3 import project
+from openstack import proxy as proxy_base
 from openstack.tests.unit import test_proxy_base
 
 
@@ -1017,19 +1018,17 @@ class TestQuotaSet(TestVolumeProxy):
             expected_kwargs={'user_id': 'uid'},
         )
 
-    @mock.patch('openstack.proxy.Proxy._get_resource', autospec=True)
-    def test_quota_set_update(self, gr_mock):
-        gr_mock.return_value = resource.Resource()
-        gr_mock.commit = mock.Mock()
+    @mock.patch.object(proxy_base.Proxy, '_get_resource')
+    def test_quota_set_update(self, mock_get):
+        fake_project = project.Project(id='prj')
+        mock_get.side_effect = [fake_project]
+
         self._verify(
-            'openstack.resource.Resource.commit',
+            'openstack.proxy.Proxy._update',
             self.proxy.update_quota_set,
-            method_args=['qs'],
-            method_kwargs={
-                'query': {'user_id': 'uid'},
-                'a': 'b',
-            },
-            expected_args=[self.proxy],
-            expected_kwargs={'user_id': 'uid'},
+            method_args=['prj'],
+            method_kwargs={'volumes': 123},
+            expected_args=[quota_set.QuotaSet, None],
+            expected_kwargs={'project_id': 'prj', 'volumes': 123},
         )
-        gr_mock.assert_called_with(self.proxy, quota_set.QuotaSet, 'qs', a='b')
+        mock_get.assert_called_once_with(project.Project, 'prj')