From 409f648ce506d7e768305f75025c4b01c5fa3008 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Fri, 5 May 2023 11:01:20 +0100 Subject: [PATCH] Blackify openstack.placement 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: If63b878036e2af53cfb4bc2ff29872253ba21597 Signed-off-by: Stephen Finucane --- openstack/placement/placement_service.py | 1 + openstack/placement/v1/_proxy.py | 14 ++++++++++---- openstack/placement/v1/resource_provider.py | 7 ++++++- .../placement/v1/test_resource_provider.py | 7 ++++--- openstack/tests/unit/placement/v1/test_proxy.py | 1 - .../tests/unit/placement/v1/test_resource_class.py | 5 ++--- .../unit/placement/v1/test_resource_provider.py | 7 ++++--- 7 files changed, 27 insertions(+), 15 deletions(-) diff --git a/openstack/placement/placement_service.py b/openstack/placement/placement_service.py index 045b36a88..2fab7a035 100644 --- a/openstack/placement/placement_service.py +++ b/openstack/placement/placement_service.py @@ -16,6 +16,7 @@ from openstack import service_description class PlacementService(service_description.ServiceDescription): """The placement service.""" + supported_versions = { '1': _proxy.Proxy, } diff --git a/openstack/placement/v1/_proxy.py b/openstack/placement/v1/_proxy.py index 67dee393c..fc6c92a44 100644 --- a/openstack/placement/v1/_proxy.py +++ b/openstack/placement/v1/_proxy.py @@ -70,7 +70,9 @@ class Proxy(proxy.Proxy): :rtype: :class:`~openstack.placement.v1.resource_class.ResourceClass` """ return self._update( - _resource_class.ResourceClass, resource_class, **attrs, + _resource_class.ResourceClass, + resource_class, + **attrs, ) def get_resource_class(self, resource_class): @@ -87,7 +89,8 @@ class Proxy(proxy.Proxy): resource class matching the criteria could be found. """ return self._get( - _resource_class.ResourceClass, resource_class, + _resource_class.ResourceClass, + resource_class, ) def resource_classes(self, **query): @@ -149,7 +152,9 @@ class Proxy(proxy.Proxy): :rtype: :class:`~openstack.placement.v1.resource_provider.ResourceProvider` """ # noqa: E501 return self._update( - _resource_provider.ResourceProvider, resource_provider, **attrs, + _resource_provider.ResourceProvider, + resource_provider, + **attrs, ) def get_resource_provider(self, resource_provider): @@ -166,7 +171,8 @@ class Proxy(proxy.Proxy): resource provider matching the criteria could be found. """ return self._get( - _resource_provider.ResourceProvider, resource_provider, + _resource_provider.ResourceProvider, + resource_provider, ) def find_resource_provider(self, name_or_id, ignore_missing=True): diff --git a/openstack/placement/v1/resource_provider.py b/openstack/placement/v1/resource_provider.py index f9ab1a9b3..1d6ba5d83 100644 --- a/openstack/placement/v1/resource_provider.py +++ b/openstack/placement/v1/resource_provider.py @@ -29,7 +29,12 @@ class ResourceProvider(resource.Resource): # Filters _query_mapping = resource.QueryParameters( - 'name', 'member_of', 'resources', 'in_tree', 'required', id='uuid', + 'name', + 'member_of', + 'resources', + 'in_tree', + 'required', + id='uuid', ) # The parent_provider_uuid and root_provider_uuid fields were introduced in diff --git a/openstack/tests/functional/placement/v1/test_resource_provider.py b/openstack/tests/functional/placement/v1/test_resource_provider.py index 11bee5298..307c82f69 100644 --- a/openstack/tests/functional/placement/v1/test_resource_provider.py +++ b/openstack/tests/functional/placement/v1/test_resource_provider.py @@ -15,7 +15,6 @@ from openstack.tests.functional import base class TestResourceProvider(base.BaseFunctionalTest): - def setUp(self): super().setUp() self._set_operator_cloud(interface='admin') @@ -29,7 +28,8 @@ class TestResourceProvider(base.BaseFunctionalTest): def tearDown(self): sot = self.conn.placement.delete_resource_provider( - self._resource_provider) + self._resource_provider + ) self.assertIsNone(sot) super().tearDown() @@ -39,7 +39,8 @@ class TestResourceProvider(base.BaseFunctionalTest): def test_get(self): sot = self.conn.placement.get_resource_provider( - self._resource_provider.id) + self._resource_provider.id + ) self.assertEqual(self.NAME, sot.name) def test_list(self): diff --git a/openstack/tests/unit/placement/v1/test_proxy.py b/openstack/tests/unit/placement/v1/test_proxy.py index 014b7a5f9..2c9cdec9c 100644 --- a/openstack/tests/unit/placement/v1/test_proxy.py +++ b/openstack/tests/unit/placement/v1/test_proxy.py @@ -17,7 +17,6 @@ from openstack.tests.unit import test_proxy_base as test_proxy_base class TestPlacementProxy(test_proxy_base.TestProxyBase): - def setUp(self): super().setUp() self.proxy = _proxy.Proxy(self.session) diff --git a/openstack/tests/unit/placement/v1/test_resource_class.py b/openstack/tests/unit/placement/v1/test_resource_class.py index 9114dec34..09e1f0e17 100644 --- a/openstack/tests/unit/placement/v1/test_resource_class.py +++ b/openstack/tests/unit/placement/v1/test_resource_class.py @@ -19,7 +19,6 @@ FAKE = { class TestResourceClass(base.TestCase): - def test_basic(self): sot = rc.ResourceClass() self.assertEqual(None, sot.resource_key) @@ -33,8 +32,8 @@ class TestResourceClass(base.TestCase): self.assertFalse(sot.allow_patch) self.assertDictEqual( - {'limit': 'limit', 'marker': 'marker'}, - sot._query_mapping._mapping) + {'limit': 'limit', 'marker': 'marker'}, sot._query_mapping._mapping + ) def test_make_it(self): sot = rc.ResourceClass(**FAKE) diff --git a/openstack/tests/unit/placement/v1/test_resource_provider.py b/openstack/tests/unit/placement/v1/test_resource_provider.py index 0b13d0a2a..a63bcb22e 100644 --- a/openstack/tests/unit/placement/v1/test_resource_provider.py +++ b/openstack/tests/unit/placement/v1/test_resource_provider.py @@ -21,7 +21,6 @@ FAKE = { class TestResourceProvider(base.TestCase): - def test_basic(self): sot = rp.ResourceProvider() self.assertEqual(None, sot.resource_key) @@ -45,12 +44,14 @@ class TestResourceProvider(base.TestCase): 'required': 'required', 'id': 'uuid', }, - sot._query_mapping._mapping) + sot._query_mapping._mapping, + ) def test_make_it(self): sot = rp.ResourceProvider(**FAKE) self.assertEqual(FAKE['uuid'], sot.id) self.assertEqual(FAKE['name'], sot.name) self.assertEqual( - FAKE['parent_provider_uuid'], sot.parent_provider_id, + FAKE['parent_provider_uuid'], + sot.parent_provider_id, )