openstack/openstacksdk
Code Issues Proposed changes

Blackify openstack.accelerator

Browse Source 
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: Ib5351abb13b5f4acac5eb554b2fa48acd276592a
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane 2023-05-05 11:04:35 +01:00
parent 33bed57501
commit 570b81f0ec
11 changed files with 116 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
openstack/accelerator/accelerator_service.py
View File

@ -16,6 +16,7 @@ from openstack import service_description
class AcceleratorService(service_description.ServiceDescription):
"""The accelerator service."""
supported_versions = {
'2': _proxy_v2.Proxy,
}

21
openstack/accelerator/v2/_proxy.py
View File

@ -18,7 +18,6 @@ from openstack import proxy
class Proxy(proxy.Proxy):
def deployables(self, **query):
"""Retrieve a generator of deployables.
@ -45,8 +44,9 @@ class Proxy(proxy.Proxy):
:param patch: The information to reconfig.
:returns: The results of FPGA reconfig.
"""
return self._get_resource(_deployable.Deployable,
uuid).patch(self, patch)
return self._get_resource(_deployable.Deployable, uuid).patch(
self, patch
)
def devices(self, **query):
"""Retrieve a generator of devices.
@ -115,7 +115,8 @@ class Proxy(proxy.Proxy):
return self._delete(
_device_profile.DeviceProfile,
device_profile,
ignore_missing=ignore_missing)
ignore_missing=ignore_missing,
)
def get_device_profile(self, uuid, fields=None):
"""Get a single device profile.
@ -146,7 +147,9 @@ class Proxy(proxy.Proxy):
return self._create(_arq.AcceleratorRequest, **attrs)
def delete_accelerator_request(
self, accelerator_request, ignore_missing=True,
self,
accelerator_request,
ignore_missing=True,
):
"""Delete a device profile
@ -164,7 +167,8 @@ class Proxy(proxy.Proxy):
return self._delete(
_arq.AcceleratorRequest,
accelerator_request,
ignore_missing=ignore_missing)
ignore_missing=ignore_missing,
)
def get_accelerator_request(self, uuid, fields=None):
"""Get a single accelerator request.
@ -185,5 +189,6 @@ class Proxy(proxy.Proxy):
that will bind/unbind the accelerator.
:returns: True if bind/unbind succeeded, False otherwise.
"""
return self._get_resource(_arq.AcceleratorRequest,
uuid).patch(self, properties)
return self._get_resource(_arq.AcceleratorRequest, uuid).patch(
self, properties
)

30
openstack/accelerator/v2/accelerator_request.py
View File

@ -56,8 +56,15 @@ class AcceleratorRequest(resource.Resource):
converted = {self.id: converted}
return converted
def patch(self, session, patch=None, prepend_key=True, has_body=True,
retry_on_conflict=None, base_path=None):
def patch(
self,
session,
patch=None,
prepend_key=True,
has_body=True,
retry_on_conflict=None,
base_path=None,
):
# This overrides the default behavior of patch because
# the PATCH method consumes a dict rather than a list. spec:
# https://specs.openstack.org/openstack/cyborg-specs/specs/train/implemented/cyborg-api
@ -72,15 +79,21 @@ class AcceleratorRequest(resource.Resource):
if not self.allow_patch:
raise exceptions.MethodNotSupported(self, "patch")
request = self._prepare_request(prepend_key=prepend_key,
base_path=base_path, patch=True)
request = self._prepare_request(
prepend_key=prepend_key, base_path=base_path, patch=True
)
microversion = self._get_microversion(session, action='patch')
if patch:
request.body = self._convert_patch(patch)
return self._commit(session, request, 'PATCH', microversion,
has_body=has_body,
retry_on_conflict=retry_on_conflict)
return self._commit(
session,
request,
'PATCH',
microversion,
has_body=has_body,
retry_on_conflict=retry_on_conflict,
)
def _consume_attrs(self, mapping, attrs):
# This overrides the default behavior of _consume_attrs because
@ -95,4 +108,5 @@ class AcceleratorRequest(resource.Resource):
# This overrides the default behavior of resource creation because
# cyborg doesn't accept resource_key in its request.
return super(AcceleratorRequest, self).create(
session, prepend_key=False, base_path=base_path)
session, prepend_key=False, base_path=base_path
)

24
openstack/accelerator/v2/deployable.py
View File

@ -41,8 +41,15 @@ class Deployable(resource.Resource):
#: The timestamp when this deployable was updated.
updated_at = resource.Body('updated_at')
def _commit(self, session, request, method, microversion, has_body=True,
retry_on_conflict=None):
def _commit(
self,
session,
request,
method,
microversion,
has_body=True,
retry_on_conflict=None,
):
session = self._get_session(session)
kwargs = {}
retriable_status_codes = set(session.retriable_status_codes or ())
@ -57,12 +64,17 @@ class Deployable(resource.Resource):
call = getattr(session, method.lower())
except AttributeError:
raise exceptions.ResourceFailure(
"Invalid commit method: %s" % method)
"Invalid commit method: %s" % method
)
request.url = request.url + "/program"
response = call(request.url, json=request.body,
headers=request.headers, microversion=microversion,
**kwargs)
response = call(
request.url,
json=request.body,
headers=request.headers,
microversion=microversion,
**kwargs
)
self.microversion = microversion
self._translate_response(response, has_body=has_body)
return self

6
openstack/accelerator/v2/device_profile.py
View File

@ -40,11 +40,13 @@ class DeviceProfile(resource.Resource):
# cannot treat multiple DeviceProfiles in list.
def _prepare_request_body(self, patch, prepend_key):
body = super(DeviceProfile, self)._prepare_request_body(
patch, prepend_key)
patch, prepend_key
)
return [body]
def create(self, session, base_path=None):
# This overrides the default behavior of resource creation because
# cyborg doesn't accept resource_key in its request.
return super(DeviceProfile, self).create(
session, prepend_key=False, base_path=base_path)
session, prepend_key=False, base_path=base_path
)

1
openstack/tests/unit/accelerator/test_version.py
View File

@ -23,7 +23,6 @@ EXAMPLE = {
class TestVersion(base.TestCase):
def test_basic(self):
sot = version.Version()
self.assertEqual('version', sot.resource_key)

13
openstack/tests/unit/accelerator/v2/test_accelerator_request.py
View File

@ -17,10 +17,9 @@ from openstack.tests.unit import base
FAKE_ID = '0725b527-e51a-41df-ad22-adad5f4546ad'
FAKE_RP_UUID = 'f4b7fe6c-8ab4-4914-a113-547af022935b'
FAKE_INSTANCE_UUID = '1ce4a597-9836-4e02-bea1-a3a6cbe7b9f9'
FAKE_ATTACH_INFO_STR = '{"bus": "5e", '\
'"device": "00", '\
'"domain": "0000", '\
'"function": "1"}'
FAKE_ATTACH_INFO_STR = (
'{"bus": "5e", ' '"device": "00", ' '"domain": "0000", ' '"function": "1"}'
)
FAKE = {
'uuid': FAKE_ID,
@ -34,7 +33,6 @@ FAKE = {
class TestAcceleratorRequest(base.TestCase):
def test_basic(self):
sot = arq.AcceleratorRequest()
self.assertEqual('arq', sot.resource_key)
@ -51,8 +49,9 @@ class TestAcceleratorRequest(base.TestCase):
sot = arq.AcceleratorRequest(**FAKE)
self.assertEqual(FAKE_ID, sot.uuid)
self.assertEqual(FAKE['device_profile_name'], sot.device_profile_name)
self.assertEqual(FAKE['device_profile_group_id'],
sot.device_profile_group_id)
self.assertEqual(
FAKE['device_profile_group_id'], sot.device_profile_group_id
)
self.assertEqual(FAKE_RP_UUID, sot.device_rp_uuid)
self.assertEqual(FAKE_INSTANCE_UUID, sot.instance_uuid)
self.assertEqual(FAKE['attach_handle_type'], sot.attach_handle_type)

1
openstack/tests/unit/accelerator/v2/test_deployable.py
View File

@ -29,7 +29,6 @@ EXAMPLE = {
class TestDeployable(base.TestCase):
def test_basic(self):
sot = deployable.Deployable()
self.assertEqual('deployable', sot.resource_key)

1
openstack/tests/unit/accelerator/v2/test_device.py
View File

@ -30,7 +30,6 @@ EXAMPLE = {
class TestDevice(base.TestCase):
def test_basic(self):
sot = device.Device()
self.assertEqual('device', sot.resource_key)

21
openstack/tests/unit/accelerator/v2/test_device_profile.py
View File

@ -19,21 +19,22 @@ FAKE = {
"uuid": u"a95e10ae-b3e3-4eab-a513-1afae6f17c51",
"name": u'afaas_example_1',
"groups": [
{"resources:ACCELERATOR_FPGA": "1",
"trait:CUSTOM_FPGA_INTEL_PAC_ARRIA10": "required",
"trait:CUSTOM_FUNCTION_ID_3AFB": "required",
},
{"resources:CUSTOM_ACCELERATOR_FOO": "2",
"resources:CUSTOM_MEMORY": "200",
"trait:CUSTOM_TRAIT_ALWAYS": "required",
}
{
"resources:ACCELERATOR_FPGA": "1",
"trait:CUSTOM_FPGA_INTEL_PAC_ARRIA10": "required",
"trait:CUSTOM_FUNCTION_ID_3AFB": "required",
},
{
"resources:CUSTOM_ACCELERATOR_FOO": "2",
"resources:CUSTOM_MEMORY": "200",
"trait:CUSTOM_TRAIT_ALWAYS": "required",
},
],
'description': 'description_test'
'description': 'description_test',
}
class TestDeviceProfile(base.TestCase):
def test_basic(self):
sot = device_profile.DeviceProfile()
self.assertEqual('device_profile', sot.resource_key)

61
openstack/tests/unit/accelerator/v2/test_proxy.py
View File

@ -30,43 +30,64 @@ class TestAcceleratorDeployable(TestAcceleratorProxy):
class TestAcceleratorDevice(TestAcceleratorProxy):
def test_list_device_profile(self):
self.verify_list(self.proxy.device_profiles,
device_profile.DeviceProfile)
self.verify_list(
self.proxy.device_profiles, device_profile.DeviceProfile
)
def test_create_device_profile(self):
self.verify_create(self.proxy.create_device_profile,
device_profile.DeviceProfile)
self.verify_create(
self.proxy.create_device_profile, device_profile.DeviceProfile
)
def test_delete_device_profile(self):
self.verify_delete(self.proxy.delete_device_profile,
device_profile.DeviceProfile, False)
self.verify_delete(
self.proxy.delete_device_profile,
device_profile.DeviceProfile,
False,
)
def test_delete_device_profile_ignore(self):
self.verify_delete(self.proxy.delete_device_profile,
device_profile.DeviceProfile, True)
self.verify_delete(
self.proxy.delete_device_profile,
device_profile.DeviceProfile,
True,
)
def test_get_device_profile(self):
self.verify_get(self.proxy.get_device_profile,
device_profile.DeviceProfile)
self.verify_get(
self.proxy.get_device_profile, device_profile.DeviceProfile
)
class TestAcceleratorRequest(TestAcceleratorProxy):
def test_list_accelerator_request(self):
self.verify_list(self.proxy.accelerator_requests,
accelerator_request.AcceleratorRequest)
self.verify_list(
self.proxy.accelerator_requests,
accelerator_request.AcceleratorRequest,
)
def test_create_accelerator_request(self):
self.verify_create(self.proxy.create_accelerator_request,
accelerator_request.AcceleratorRequest)
self.verify_create(
self.proxy.create_accelerator_request,
accelerator_request.AcceleratorRequest,
)
def test_delete_accelerator_request(self):
self.verify_delete(self.proxy.delete_accelerator_request,
accelerator_request.AcceleratorRequest, False)
self.verify_delete(
self.proxy.delete_accelerator_request,
accelerator_request.AcceleratorRequest,
False,
)
def test_delete_accelerator_request_ignore(self):
self.verify_delete(self.proxy.delete_accelerator_request,
accelerator_request.AcceleratorRequest, True)
self.verify_delete(
self.proxy.delete_accelerator_request,
accelerator_request.AcceleratorRequest,
True,
)
def test_get_accelerator_request(self):
self.verify_get(self.proxy.get_accelerator_request,
accelerator_request.AcceleratorRequest)
self.verify_get(
self.proxy.get_accelerator_request,
accelerator_request.AcceleratorRequest,
)