Blackify openstack.workflow
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: I3573a93dc8fab163fda536d479cae0785b657cdb Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
parent
874ea74103
commit
9d3d986241
@ -17,7 +17,7 @@ from openstack.workflow.v2 import cron_trigger
|
||||
FAKE_INPUT = {
|
||||
'cluster_id': '8c74607c-5a74-4490-9414-a3475b1926c2',
|
||||
'node_id': 'fba2cc5d-706f-4631-9577-3956048d13a2',
|
||||
'flavor_id': '1'
|
||||
'flavor_id': '1',
|
||||
}
|
||||
|
||||
FAKE_PARAMS = {}
|
||||
@ -36,7 +36,6 @@ FAKE = {
|
||||
|
||||
|
||||
class TestCronTrigger(base.TestCase):
|
||||
|
||||
def test_basic(self):
|
||||
sot = cron_trigger.CronTrigger()
|
||||
self.assertEqual('cron_trigger', sot.resource_key)
|
||||
@ -69,19 +68,20 @@ class TestCronTrigger(base.TestCase):
|
||||
'updated_at': 'updated_at',
|
||||
'all_projects': 'all_projects',
|
||||
},
|
||||
sot._query_mapping._mapping
|
||||
sot._query_mapping._mapping,
|
||||
)
|
||||
|
||||
def test_make_it(self):
|
||||
sot = cron_trigger.CronTrigger(**FAKE)
|
||||
self.assertEqual(FAKE['id'], sot.id)
|
||||
self.assertEqual(FAKE['pattern'], sot.pattern)
|
||||
self.assertEqual(FAKE['remaining_executions'],
|
||||
sot.remaining_executions)
|
||||
self.assertEqual(FAKE['first_execution_time'],
|
||||
sot.first_execution_time)
|
||||
self.assertEqual(FAKE['next_execution_time'],
|
||||
sot.next_execution_time)
|
||||
self.assertEqual(
|
||||
FAKE['remaining_executions'], sot.remaining_executions
|
||||
)
|
||||
self.assertEqual(
|
||||
FAKE['first_execution_time'], sot.first_execution_time
|
||||
)
|
||||
self.assertEqual(FAKE['next_execution_time'], sot.next_execution_time)
|
||||
self.assertEqual(FAKE['workflow_name'], sot.workflow_name)
|
||||
self.assertEqual(FAKE['workflow_id'], sot.workflow_id)
|
||||
self.assertEqual(FAKE['workflow_input'], sot.workflow_input)
|
||||
|
@ -17,7 +17,7 @@ from openstack.workflow.v2 import execution
|
||||
FAKE_INPUT = {
|
||||
'cluster_id': '8c74607c-5a74-4490-9414-a3475b1926c2',
|
||||
'node_id': 'fba2cc5d-706f-4631-9577-3956048d13a2',
|
||||
'flavor_id': '1'
|
||||
'flavor_id': '1',
|
||||
}
|
||||
|
||||
FAKE = {
|
||||
@ -28,7 +28,6 @@ FAKE = {
|
||||
|
||||
|
||||
class TestExecution(base.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestExecution, self).setUp()
|
||||
|
||||
|
@ -23,7 +23,6 @@ EXAMPLE = {
|
||||
|
||||
|
||||
class TestVersion(base.TestCase):
|
||||
|
||||
def test_basic(self):
|
||||
sot = version.Version()
|
||||
self.assertEqual('version', sot.resource_key)
|
||||
|
@ -22,7 +22,6 @@ FAKE = {
|
||||
|
||||
|
||||
class TestWorkflow(base.TestCase):
|
||||
|
||||
def setUp(self):
|
||||
super(TestWorkflow, self).setUp()
|
||||
|
||||
|
@ -23,44 +23,36 @@ class TestWorkflowProxy(test_proxy_base.TestProxyBase):
|
||||
self.proxy = _proxy.Proxy(self.session)
|
||||
|
||||
def test_workflows(self):
|
||||
self.verify_list(self.proxy.workflows,
|
||||
workflow.Workflow)
|
||||
self.verify_list(self.proxy.workflows, workflow.Workflow)
|
||||
|
||||
def test_executions(self):
|
||||
self.verify_list(self.proxy.executions,
|
||||
execution.Execution)
|
||||
self.verify_list(self.proxy.executions, execution.Execution)
|
||||
|
||||
def test_workflow_get(self):
|
||||
self.verify_get(self.proxy.get_workflow,
|
||||
workflow.Workflow)
|
||||
self.verify_get(self.proxy.get_workflow, workflow.Workflow)
|
||||
|
||||
def test_execution_get(self):
|
||||
self.verify_get(self.proxy.get_execution,
|
||||
execution.Execution)
|
||||
self.verify_get(self.proxy.get_execution, execution.Execution)
|
||||
|
||||
def test_workflow_create(self):
|
||||
self.verify_create(self.proxy.create_workflow,
|
||||
workflow.Workflow)
|
||||
self.verify_create(self.proxy.create_workflow, workflow.Workflow)
|
||||
|
||||
def test_execution_create(self):
|
||||
self.verify_create(self.proxy.create_execution,
|
||||
execution.Execution)
|
||||
self.verify_create(self.proxy.create_execution, execution.Execution)
|
||||
|
||||
def test_workflow_delete(self):
|
||||
self.verify_delete(self.proxy.delete_workflow,
|
||||
workflow.Workflow, True)
|
||||
self.verify_delete(self.proxy.delete_workflow, workflow.Workflow, True)
|
||||
|
||||
def test_execution_delete(self):
|
||||
self.verify_delete(self.proxy.delete_execution,
|
||||
execution.Execution, True)
|
||||
self.verify_delete(
|
||||
self.proxy.delete_execution, execution.Execution, True
|
||||
)
|
||||
|
||||
def test_workflow_find(self):
|
||||
self.verify_find(self.proxy.find_workflow,
|
||||
workflow.Workflow)
|
||||
self.verify_find(self.proxy.find_workflow, workflow.Workflow)
|
||||
|
||||
def test_execution_find(self):
|
||||
self.verify_find(self.proxy.find_execution,
|
||||
execution.Execution)
|
||||
self.verify_find(self.proxy.find_execution, execution.Execution)
|
||||
|
||||
|
||||
class TestCronTriggerProxy(test_proxy_base.TestProxyBase):
|
||||
@ -69,20 +61,20 @@ class TestCronTriggerProxy(test_proxy_base.TestProxyBase):
|
||||
self.proxy = _proxy.Proxy(self.session)
|
||||
|
||||
def test_cron_triggers(self):
|
||||
self.verify_list(self.proxy.cron_triggers,
|
||||
cron_trigger.CronTrigger)
|
||||
self.verify_list(self.proxy.cron_triggers, cron_trigger.CronTrigger)
|
||||
|
||||
def test_cron_trigger_get(self):
|
||||
self.verify_get(self.proxy.get_cron_trigger,
|
||||
cron_trigger.CronTrigger)
|
||||
self.verify_get(self.proxy.get_cron_trigger, cron_trigger.CronTrigger)
|
||||
|
||||
def test_cron_trigger_create(self):
|
||||
self.verify_create(self.proxy.create_cron_trigger,
|
||||
cron_trigger.CronTrigger)
|
||||
self.verify_create(
|
||||
self.proxy.create_cron_trigger, cron_trigger.CronTrigger
|
||||
)
|
||||
|
||||
def test_cron_trigger_delete(self):
|
||||
self.verify_delete(self.proxy.delete_cron_trigger,
|
||||
cron_trigger.CronTrigger, True)
|
||||
self.verify_delete(
|
||||
self.proxy.delete_cron_trigger, cron_trigger.CronTrigger, True
|
||||
)
|
||||
|
||||
def test_cron_trigger_find(self):
|
||||
self.verify_find(
|
||||
|
@ -78,8 +78,9 @@ class Proxy(proxy.Proxy):
|
||||
|
||||
:returns: ``None``
|
||||
"""
|
||||
return self._delete(_workflow.Workflow, value,
|
||||
ignore_missing=ignore_missing)
|
||||
return self._delete(
|
||||
_workflow.Workflow, value, ignore_missing=ignore_missing
|
||||
)
|
||||
|
||||
def find_workflow(self, name_or_id, ignore_missing=True):
|
||||
"""Find a single workflow
|
||||
@ -93,8 +94,9 @@ class Proxy(proxy.Proxy):
|
||||
:returns: One :class:`~openstack.compute.v2.workflow.Extension` or
|
||||
None
|
||||
"""
|
||||
return self._find(_workflow.Workflow, name_or_id,
|
||||
ignore_missing=ignore_missing)
|
||||
return self._find(
|
||||
_workflow.Workflow, name_or_id, ignore_missing=ignore_missing
|
||||
)
|
||||
|
||||
def create_execution(self, **attrs):
|
||||
"""Create a new execution from attributes
|
||||
@ -154,8 +156,9 @@ class Proxy(proxy.Proxy):
|
||||
|
||||
:returns: ``None``
|
||||
"""
|
||||
return self._delete(_execution.Execution, value,
|
||||
ignore_missing=ignore_missing)
|
||||
return self._delete(
|
||||
_execution.Execution, value, ignore_missing=ignore_missing
|
||||
)
|
||||
|
||||
def find_execution(self, name_or_id, ignore_missing=True):
|
||||
"""Find a single execution
|
||||
@ -169,8 +172,9 @@ class Proxy(proxy.Proxy):
|
||||
:returns: One :class:`~openstack.compute.v2.execution.Execution` or
|
||||
None
|
||||
"""
|
||||
return self._find(_execution.Execution, name_or_id,
|
||||
ignore_missing=ignore_missing)
|
||||
return self._find(
|
||||
_execution.Execution, name_or_id, ignore_missing=ignore_missing
|
||||
)
|
||||
|
||||
def create_cron_trigger(self, **attrs):
|
||||
"""Create a new cron trigger from attributes
|
||||
@ -232,8 +236,9 @@ class Proxy(proxy.Proxy):
|
||||
|
||||
:returns: ``None``
|
||||
"""
|
||||
return self._delete(_cron_trigger.CronTrigger, value,
|
||||
ignore_missing=ignore_missing)
|
||||
return self._delete(
|
||||
_cron_trigger.CronTrigger, value, ignore_missing=ignore_missing
|
||||
)
|
||||
|
||||
# TODO(stephenfin): Drop 'query' parameter or apply it consistently
|
||||
def find_cron_trigger(
|
||||
|
@ -25,11 +25,26 @@ class CronTrigger(resource.Resource):
|
||||
allow_delete = True
|
||||
|
||||
_query_mapping = resource.QueryParameters(
|
||||
'marker', 'limit', 'sort_keys', 'sort_dirs', 'fields', 'name',
|
||||
'workflow_name', 'workflow_id', 'workflow_input', 'workflow_params',
|
||||
'scope', 'pattern', 'remaining_executions', 'project_id',
|
||||
'first_execution_time', 'next_execution_time', 'created_at',
|
||||
'updated_at', 'all_projects')
|
||||
'marker',
|
||||
'limit',
|
||||
'sort_keys',
|
||||
'sort_dirs',
|
||||
'fields',
|
||||
'name',
|
||||
'workflow_name',
|
||||
'workflow_id',
|
||||
'workflow_input',
|
||||
'workflow_params',
|
||||
'scope',
|
||||
'pattern',
|
||||
'remaining_executions',
|
||||
'project_id',
|
||||
'first_execution_time',
|
||||
'next_execution_time',
|
||||
'created_at',
|
||||
'updated_at',
|
||||
'all_projects',
|
||||
)
|
||||
|
||||
#: The name of this Cron Trigger
|
||||
name = resource.Body("name")
|
||||
@ -58,4 +73,5 @@ class CronTrigger(resource.Resource):
|
||||
|
||||
def create(self, session, base_path=None):
|
||||
return super(CronTrigger, self).create(
|
||||
session, prepend_key=False, base_path=base_path)
|
||||
session, prepend_key=False, base_path=base_path
|
||||
)
|
||||
|
@ -25,8 +25,14 @@ class Execution(resource.Resource):
|
||||
allow_delete = True
|
||||
|
||||
_query_mapping = resource.QueryParameters(
|
||||
'marker', 'limit', 'sort_keys', 'sort_dirs', 'fields', 'params',
|
||||
'include_output')
|
||||
'marker',
|
||||
'limit',
|
||||
'sort_keys',
|
||||
'sort_dirs',
|
||||
'fields',
|
||||
'params',
|
||||
'include_output',
|
||||
)
|
||||
|
||||
#: The name of the workflow
|
||||
workflow_name = resource.Body("workflow_name")
|
||||
@ -53,14 +59,14 @@ class Execution(resource.Resource):
|
||||
updated_at = resource.Body("updated_at")
|
||||
|
||||
def create(self, session, prepend_key=True, base_path=None):
|
||||
request = self._prepare_request(requires_id=False,
|
||||
prepend_key=prepend_key,
|
||||
base_path=base_path)
|
||||
request = self._prepare_request(
|
||||
requires_id=False, prepend_key=prepend_key, base_path=base_path
|
||||
)
|
||||
|
||||
request_body = request.body["execution"]
|
||||
response = session.post(request.url,
|
||||
json=request_body,
|
||||
headers=request.headers)
|
||||
response = session.post(
|
||||
request.url, json=request_body, headers=request.headers
|
||||
)
|
||||
|
||||
self._translate_response(response, has_body=True)
|
||||
return self
|
||||
|
@ -25,7 +25,8 @@ class Workflow(resource.Resource):
|
||||
allow_delete = True
|
||||
|
||||
_query_mapping = resource.QueryParameters(
|
||||
'marker', 'limit', 'sort_keys', 'sort_dirs', 'fields')
|
||||
'marker', 'limit', 'sort_keys', 'sort_dirs', 'fields'
|
||||
)
|
||||
|
||||
#: The name of this Workflow
|
||||
name = resource.Body("name")
|
||||
@ -47,13 +48,11 @@ class Workflow(resource.Resource):
|
||||
updated_at = resource.Body("updated_at")
|
||||
|
||||
def create(self, session, prepend_key=True, base_path=None):
|
||||
request = self._prepare_request(requires_id=False,
|
||||
prepend_key=prepend_key,
|
||||
base_path=base_path)
|
||||
request = self._prepare_request(
|
||||
requires_id=False, prepend_key=prepend_key, base_path=base_path
|
||||
)
|
||||
|
||||
headers = {
|
||||
"Content-Type": 'text/plain'
|
||||
}
|
||||
headers = {"Content-Type": 'text/plain'}
|
||||
kwargs = {
|
||||
"data": self.definition,
|
||||
}
|
||||
@ -62,9 +61,9 @@ class Workflow(resource.Resource):
|
||||
uri = request.url + scope
|
||||
|
||||
request.headers.update(headers)
|
||||
response = session.post(uri,
|
||||
json=None,
|
||||
headers=request.headers, **kwargs)
|
||||
response = session.post(
|
||||
uri, json=None, headers=request.headers, **kwargs
|
||||
)
|
||||
|
||||
self._translate_response(response, has_body=False)
|
||||
return self
|
||||
|
Loading…
x
Reference in New Issue
Block a user