From 19ec9ba383d14f4af6a1bb78dbbeaa6638ee8a4f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 May 2023 11:06:30 +0100 Subject: [PATCH] Blackify openstack.database Black used with the '-l 79 -S' flags. A future change will ignore this commit in git-blame history by adding a 'git-blame-ignore-revs' file. Change-Id: If9eb7ba7a28b0bc56b7e9efc74760243b11e66ab Signed-off-by: Stephen Finucane --- openstack/database/v1/_proxy.py | 58 ++++++---- openstack/database/v1/instance.py | 8 +- openstack/database/v1/user.py | 5 +- .../tests/unit/database/v1/test_database.py | 1 - .../tests/unit/database/v1/test_flavor.py | 1 - .../tests/unit/database/v1/test_instance.py | 28 ++--- .../tests/unit/database/v1/test_proxy.py | 103 +++++++++++------- openstack/tests/unit/database/v1/test_user.py | 1 - 8 files changed, 128 insertions(+), 77 deletions(-) diff --git a/openstack/database/v1/_proxy.py b/openstack/database/v1/_proxy.py index 154debc31..4e3df801f 100644 --- a/openstack/database/v1/_proxy.py +++ b/openstack/database/v1/_proxy.py @@ -38,8 +38,9 @@ class Proxy(proxy.Proxy): :rtype: :class:`~openstack.database.v1.database.Database` """ instance = self._get_resource(_instance.Instance, instance) - return self._create(_database.Database, instance_id=instance.id, - **attrs) + return self._create( + _database.Database, instance_id=instance.id, **attrs + ) def delete_database(self, database, instance=None, ignore_missing=True): """Delete a database @@ -58,10 +59,15 @@ class Proxy(proxy.Proxy): :returns: ``None`` """ - instance_id = self._get_uri_attribute(database, instance, - "instance_id") - self._delete(_database.Database, database, instance_id=instance_id, - ignore_missing=ignore_missing) + instance_id = self._get_uri_attribute( + database, instance, "instance_id" + ) + self._delete( + _database.Database, + database, + instance_id=instance_id, + ignore_missing=ignore_missing, + ) def find_database(self, name_or_id, instance, ignore_missing=True): """Find a single database @@ -77,9 +83,12 @@ class Proxy(proxy.Proxy): :returns: One :class:`~openstack.database.v1.database.Database` or None """ instance = self._get_resource(_instance.Instance, instance) - return self._find(_database.Database, name_or_id, - instance_id=instance.id, - ignore_missing=ignore_missing) + return self._find( + _database.Database, + name_or_id, + instance_id=instance.id, + ignore_missing=ignore_missing, + ) def databases(self, instance, **query): """Return a generator of databases @@ -124,8 +133,9 @@ class Proxy(proxy.Proxy): attempting to find a nonexistent resource. :returns: One :class:`~openstack.database.v1.flavor.Flavor` or None """ - return self._find(_flavor.Flavor, name_or_id, - ignore_missing=ignore_missing) + return self._find( + _flavor.Flavor, name_or_id, ignore_missing=ignore_missing + ) def get_flavor(self, flavor): """Get a single flavor @@ -175,8 +185,9 @@ class Proxy(proxy.Proxy): :returns: ``None`` """ - self._delete(_instance.Instance, instance, - ignore_missing=ignore_missing) + self._delete( + _instance.Instance, instance, ignore_missing=ignore_missing + ) def find_instance(self, name_or_id, ignore_missing=True): """Find a single instance @@ -189,8 +200,9 @@ class Proxy(proxy.Proxy): attempting to find a nonexistent resource. :returns: One :class:`~openstack.database.v1.instance.Instance` or None """ - return self._find(_instance.Instance, name_or_id, - ignore_missing=ignore_missing) + return self._find( + _instance.Instance, name_or_id, ignore_missing=ignore_missing + ) def get_instance(self, instance): """Get a single instance @@ -262,8 +274,12 @@ class Proxy(proxy.Proxy): :returns: ``None`` """ instance = self._get_resource(_instance.Instance, instance) - self._delete(_user.User, user, ignore_missing=ignore_missing, - instance_id=instance.id) + self._delete( + _user.User, + user, + ignore_missing=ignore_missing, + instance_id=instance.id, + ) def find_user(self, name_or_id, instance, ignore_missing=True): """Find a single user @@ -279,8 +295,12 @@ class Proxy(proxy.Proxy): :returns: One :class:`~openstack.database.v1.user.User` or None """ instance = self._get_resource(_instance.Instance, instance) - return self._find(_user.User, name_or_id, instance_id=instance.id, - ignore_missing=ignore_missing) + return self._find( + _user.User, + name_or_id, + instance_id=instance.id, + ignore_missing=ignore_missing, + ) def users(self, instance, **query): """Return a generator of users diff --git a/openstack/database/v1/instance.py b/openstack/database/v1/instance.py index 02c033bae..c24abaa4a 100644 --- a/openstack/database/v1/instance.py +++ b/openstack/database/v1/instance.py @@ -63,7 +63,9 @@ class Instance(resource.Resource): the login credentials. """ url = utils.urljoin(self.base_path, self.id, 'root') - resp = session.post(url,) + resp = session.post( + url, + ) return resp.json()['user'] def is_root_enabled(self, session): @@ -77,7 +79,9 @@ class Instance(resource.Resource): instance or ``False`` otherwise. """ url = utils.urljoin(self.base_path, self.id, 'root') - resp = session.get(url,) + resp = session.get( + url, + ) return resp.json()['rootEnabled'] def restart(self, session): diff --git a/openstack/database/v1/user.py b/openstack/database/v1/user.py index 07e6fc72a..3e7d9a688 100644 --- a/openstack/database/v1/user.py +++ b/openstack/database/v1/user.py @@ -34,8 +34,9 @@ class User(resource.Resource): #: The password of the user password = resource.Body('password') - def _prepare_request(self, requires_id=True, prepend_key=True, - base_path=None, **kwargs): + def _prepare_request( + self, requires_id=True, prepend_key=True, base_path=None, **kwargs + ): """Prepare a request for the database service's create call User.create calls require the resources_key. diff --git a/openstack/tests/unit/database/v1/test_database.py b/openstack/tests/unit/database/v1/test_database.py index 63ac5270a..95781838c 100644 --- a/openstack/tests/unit/database/v1/test_database.py +++ b/openstack/tests/unit/database/v1/test_database.py @@ -25,7 +25,6 @@ EXAMPLE = { class TestDatabase(base.TestCase): - def test_basic(self): sot = database.Database() self.assertEqual('database', sot.resource_key) diff --git a/openstack/tests/unit/database/v1/test_flavor.py b/openstack/tests/unit/database/v1/test_flavor.py index ef5f0f9b4..a6dacb4bf 100644 --- a/openstack/tests/unit/database/v1/test_flavor.py +++ b/openstack/tests/unit/database/v1/test_flavor.py @@ -24,7 +24,6 @@ EXAMPLE = { class TestFlavor(base.TestCase): - def test_basic(self): sot = flavor.Flavor() self.assertEqual('flavor', sot.resource_key) diff --git a/openstack/tests/unit/database/v1/test_instance.py b/openstack/tests/unit/database/v1/test_instance.py index ef67afc3f..0a329d379 100644 --- a/openstack/tests/unit/database/v1/test_instance.py +++ b/openstack/tests/unit/database/v1/test_instance.py @@ -32,7 +32,6 @@ EXAMPLE = { class TestInstance(base.TestCase): - def test_basic(self): sot = instance.Instance() self.assertEqual('instance', sot.resource_key) @@ -68,8 +67,10 @@ class TestInstance(base.TestCase): self.assertEqual(response.body['user'], sot.enable_root_user(sess)) - url = ("instances/%s/root" % IDENTIFIER) - sess.post.assert_called_with(url,) + url = "instances/%s/root" % IDENTIFIER + sess.post.assert_called_with( + url, + ) def test_is_root_enabled(self): sot = instance.Instance(**EXAMPLE) @@ -81,8 +82,10 @@ class TestInstance(base.TestCase): self.assertTrue(sot.is_root_enabled(sess)) - url = ("instances/%s/root" % IDENTIFIER) - sess.get.assert_called_with(url,) + url = "instances/%s/root" % IDENTIFIER + sess.get.assert_called_with( + url, + ) def test_action_restart(self): sot = instance.Instance(**EXAMPLE) @@ -93,10 +96,9 @@ class TestInstance(base.TestCase): self.assertIsNone(sot.restart(sess)) - url = ("instances/%s/action" % IDENTIFIER) + url = "instances/%s/action" % IDENTIFIER body = {'restart': {}} - sess.post.assert_called_with(url, - json=body) + sess.post.assert_called_with(url, json=body) def test_action_resize(self): sot = instance.Instance(**EXAMPLE) @@ -108,10 +110,9 @@ class TestInstance(base.TestCase): self.assertIsNone(sot.resize(sess, flavor)) - url = ("instances/%s/action" % IDENTIFIER) + url = "instances/%s/action" % IDENTIFIER body = {'resize': {'flavorRef': flavor}} - sess.post.assert_called_with(url, - json=body) + sess.post.assert_called_with(url, json=body) def test_action_resize_volume(self): sot = instance.Instance(**EXAMPLE) @@ -123,7 +124,6 @@ class TestInstance(base.TestCase): self.assertIsNone(sot.resize_volume(sess, size)) - url = ("instances/%s/action" % IDENTIFIER) + url = "instances/%s/action" % IDENTIFIER body = {'resize': {'volume': size}} - sess.post.assert_called_with(url, - json=body) + sess.post.assert_called_with(url, json=body) diff --git a/openstack/tests/unit/database/v1/test_proxy.py b/openstack/tests/unit/database/v1/test_proxy.py index 81f276dd8..98c641d5c 100644 --- a/openstack/tests/unit/database/v1/test_proxy.py +++ b/openstack/tests/unit/database/v1/test_proxy.py @@ -24,24 +24,30 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase): self.proxy = _proxy.Proxy(self.session) def test_database_create_attrs(self): - self.verify_create(self.proxy.create_database, - database.Database, - method_kwargs={"instance": "id"}, - expected_kwargs={"instance_id": "id"}) + self.verify_create( + self.proxy.create_database, + database.Database, + method_kwargs={"instance": "id"}, + expected_kwargs={"instance_id": "id"}, + ) def test_database_delete(self): - self.verify_delete(self.proxy.delete_database, - database.Database, - ignore_missing=False, - method_kwargs={"instance": "test_id"}, - expected_kwargs={"instance_id": "test_id"}) + self.verify_delete( + self.proxy.delete_database, + database.Database, + ignore_missing=False, + method_kwargs={"instance": "test_id"}, + expected_kwargs={"instance_id": "test_id"}, + ) def test_database_delete_ignore(self): - self.verify_delete(self.proxy.delete_database, - database.Database, - ignore_missing=True, - method_kwargs={"instance": "test_id"}, - expected_kwargs={"instance_id": "test_id"}) + self.verify_delete( + self.proxy.delete_database, + database.Database, + ignore_missing=True, + method_kwargs={"instance": "test_id"}, + expected_kwargs={"instance_id": "test_id"}, + ) def test_database_find(self): self._verify( @@ -50,13 +56,19 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase): method_args=["db", "instance"], expected_args=[database.Database, "db"], expected_kwargs={ - "instance_id": "instance", "ignore_missing": True}) + "instance_id": "instance", + "ignore_missing": True, + }, + ) def test_databases(self): - self.verify_list(self.proxy.databases, database.Database, - method_args=["id"], - expected_args=[], - expected_kwargs={"instance_id": "id"}) + self.verify_list( + self.proxy.databases, + database.Database, + method_args=["id"], + expected_args=[], + expected_kwargs={"instance_id": "id"}, + ) def test_database_get(self): self.verify_get(self.proxy.get_database, database.Database) @@ -74,12 +86,12 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase): self.verify_create(self.proxy.create_instance, instance.Instance) def test_instance_delete(self): - self.verify_delete(self.proxy.delete_instance, - instance.Instance, False) + self.verify_delete( + self.proxy.delete_instance, instance.Instance, False + ) def test_instance_delete_ignore(self): - self.verify_delete(self.proxy.delete_instance, - instance.Instance, True) + self.verify_delete(self.proxy.delete_instance, instance.Instance, True) def test_instance_find(self): self.verify_find(self.proxy.find_instance, instance.Instance) @@ -94,19 +106,30 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase): self.verify_update(self.proxy.update_instance, instance.Instance) def test_user_create_attrs(self): - self.verify_create(self.proxy.create_user, user.User, - method_kwargs={"instance": "id"}, - expected_kwargs={"instance_id": "id"}) + self.verify_create( + self.proxy.create_user, + user.User, + method_kwargs={"instance": "id"}, + expected_kwargs={"instance_id": "id"}, + ) def test_user_delete(self): - self.verify_delete(self.proxy.delete_user, user.User, False, - method_kwargs={"instance": "id"}, - expected_kwargs={"instance_id": "id"}) + self.verify_delete( + self.proxy.delete_user, + user.User, + False, + method_kwargs={"instance": "id"}, + expected_kwargs={"instance_id": "id"}, + ) def test_user_delete_ignore(self): - self.verify_delete(self.proxy.delete_user, user.User, True, - method_kwargs={"instance": "id"}, - expected_kwargs={"instance_id": "id"}) + self.verify_delete( + self.proxy.delete_user, + user.User, + True, + method_kwargs={"instance": "id"}, + expected_kwargs={"instance_id": "id"}, + ) def test_user_find(self): self._verify( @@ -115,13 +138,19 @@ class TestDatabaseProxy(test_proxy_base.TestProxyBase): method_args=["user", "instance"], expected_args=[user.User, "user"], expected_kwargs={ - "instance_id": "instance", "ignore_missing": True}) + "instance_id": "instance", + "ignore_missing": True, + }, + ) def test_users(self): - self.verify_list(self.proxy.users, user.User, - method_args=["test_instance"], - expected_args=[], - expected_kwargs={"instance_id": "test_instance"}) + self.verify_list( + self.proxy.users, + user.User, + method_args=["test_instance"], + expected_args=[], + expected_kwargs={"instance_id": "test_instance"}, + ) def test_user_get(self): self.verify_get(self.proxy.get_user, user.User) diff --git a/openstack/tests/unit/database/v1/test_user.py b/openstack/tests/unit/database/v1/test_user.py index 6e37ff4a3..7d5ce73ae 100644 --- a/openstack/tests/unit/database/v1/test_user.py +++ b/openstack/tests/unit/database/v1/test_user.py @@ -24,7 +24,6 @@ CREATING = { class TestUser(base.TestCase): - def test_basic(self): sot = user.User() self.assertEqual('user', sot.resource_key)