From 9ca14cd4713a9e03a288e5bff3211997a2a526b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sybren=20A=2E=20St=C3=BCvel?= Date: Thu, 2 Jun 2022 12:16:51 +0200 Subject: [PATCH] OAPI: regenerate code --- addon/flamenco/manager/__init__.py | 2 +- addon/flamenco/manager/api_client.py | 2 +- addon/flamenco/manager/configuration.py | 2 +- .../manager/docs/SocketIOWorkerUpdate.md | 3 +- addon/flamenco/manager/docs/Worker.md | 3 +- addon/flamenco/manager/docs/WorkerMgtApi.md | 2 +- .../manager/docs/WorkerStatusChangeRequest.md | 4 +- addon/flamenco/manager/docs/WorkerSummary.md | 3 +- .../manager/model/socket_io_worker_update.py | 14 +- addon/flamenco/manager/model/worker.py | 14 +- .../model/worker_status_change_request.py | 16 +- .../flamenco/manager/model/worker_summary.py | 14 +- addon/flamenco/manager_README.md | 2 +- pkg/api/openapi_spec.gen.go | 266 +++++++++--------- pkg/api/openapi_types.gen.go | 30 +- web/app/src/manager-api/ApiClient.js | 2 +- .../manager-api/model/SocketIOWorkerUpdate.js | 18 +- web/app/src/manager-api/model/Worker.js | 25 +- .../model/WorkerStatusChangeRequest.js | 20 +- .../src/manager-api/model/WorkerSummary.js | 17 +- 20 files changed, 212 insertions(+), 247 deletions(-) diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index c9bdad84..5debabcc 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "cfb17b17" +__version__ = "0d50a7ea" # import ApiClient from flamenco.manager.api_client import ApiClient diff --git a/addon/flamenco/manager/api_client.py b/addon/flamenco/manager/api_client.py index b09b804d..6434ce42 100644 --- a/addon/flamenco/manager/api_client.py +++ b/addon/flamenco/manager/api_client.py @@ -76,7 +76,7 @@ class ApiClient(object): self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'Flamenco/cfb17b17 (Blender add-on)' + self.user_agent = 'Flamenco/0d50a7ea (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index 0a18e499..d1b16797 100644 --- a/addon/flamenco/manager/configuration.py +++ b/addon/flamenco/manager/configuration.py @@ -404,7 +404,7 @@ conf = flamenco.manager.Configuration( "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 1.0.0\n"\ - "SDK Package Version: cfb17b17".\ + "SDK Package Version: 0d50a7ea".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md b/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md index 12e42e50..7d7fbef4 100644 --- a/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md +++ b/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md @@ -11,8 +11,7 @@ Name | Type | Description | Notes **status** | [**WorkerStatus**](WorkerStatus.md) | | **version** | **str** | | **previous_status** | [**WorkerStatus**](WorkerStatus.md) | | [optional] -**status_requested** | [**WorkerStatus**](WorkerStatus.md) | | [optional] -**lazy_status_request** | **bool** | Whether the worker is allowed to finish its current task before the status change is enforced. Mandatory when `status_requested` is set. | [optional] +**status_change** | [**WorkerStatusChangeRequest**](WorkerStatusChangeRequest.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/addon/flamenco/manager/docs/Worker.md b/addon/flamenco/manager/docs/Worker.md index 4b879265..8cce9127 100644 --- a/addon/flamenco/manager/docs/Worker.md +++ b/addon/flamenco/manager/docs/Worker.md @@ -12,8 +12,7 @@ Name | Type | Description | Notes **ip_address** | **str** | IP address of the Worker | **platform** | **str** | Operating system of the Worker | **supported_task_types** | **[str]** | | -**status_requested** | [**WorkerStatus**](WorkerStatus.md) | | [optional] -**lazy_status_request** | **bool** | | [optional] +**status_change** | [**WorkerStatusChangeRequest**](WorkerStatusChangeRequest.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/addon/flamenco/manager/docs/WorkerMgtApi.md b/addon/flamenco/manager/docs/WorkerMgtApi.md index 4bb6a0a9..d63eb5b0 100644 --- a/addon/flamenco/manager/docs/WorkerMgtApi.md +++ b/addon/flamenco/manager/docs/WorkerMgtApi.md @@ -163,7 +163,7 @@ with flamenco.manager.ApiClient() as api_client: api_instance = worker_mgt_api.WorkerMgtApi(api_client) worker_id = "worker_id_example" # str | worker_status_change_request = WorkerStatusChangeRequest( - status_requested=WorkerStatus("starting"), + status=WorkerStatus("starting"), is_lazy=True, ) # WorkerStatusChangeRequest | The status change to request. diff --git a/addon/flamenco/manager/docs/WorkerStatusChangeRequest.md b/addon/flamenco/manager/docs/WorkerStatusChangeRequest.md index 7439d3bc..9f01a610 100644 --- a/addon/flamenco/manager/docs/WorkerStatusChangeRequest.md +++ b/addon/flamenco/manager/docs/WorkerStatusChangeRequest.md @@ -1,11 +1,11 @@ # WorkerStatusChangeRequest -Request for a Worker to change its status. +Request for a Worker to change its status to `status`. ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**status_requested** | [**WorkerStatus**](WorkerStatus.md) | | +**status** | [**WorkerStatus**](WorkerStatus.md) | | **is_lazy** | **bool** | Whether the status change should happen immediately, or after the worker's current task is finished. | **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] diff --git a/addon/flamenco/manager/docs/WorkerSummary.md b/addon/flamenco/manager/docs/WorkerSummary.md index d09b7728..1e296970 100644 --- a/addon/flamenco/manager/docs/WorkerSummary.md +++ b/addon/flamenco/manager/docs/WorkerSummary.md @@ -9,8 +9,7 @@ Name | Type | Description | Notes **nickname** | **str** | | **status** | [**WorkerStatus**](WorkerStatus.md) | | **version** | **str** | Version of Flamenco this Worker is running | -**status_requested** | [**WorkerStatus**](WorkerStatus.md) | | [optional] -**lazy_status_request** | **bool** | | [optional] +**status_change** | [**WorkerStatusChangeRequest**](WorkerStatusChangeRequest.md) | | [optional] **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional] [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md) diff --git a/addon/flamenco/manager/model/socket_io_worker_update.py b/addon/flamenco/manager/model/socket_io_worker_update.py index a129f95e..4926308c 100644 --- a/addon/flamenco/manager/model/socket_io_worker_update.py +++ b/addon/flamenco/manager/model/socket_io_worker_update.py @@ -31,7 +31,9 @@ from flamenco.manager.exceptions import ApiAttributeError def lazy_import(): from flamenco.manager.model.worker_status import WorkerStatus + from flamenco.manager.model.worker_status_change_request import WorkerStatusChangeRequest globals()['WorkerStatus'] = WorkerStatus + globals()['WorkerStatusChangeRequest'] = WorkerStatusChangeRequest class SocketIOWorkerUpdate(ModelNormal): @@ -93,8 +95,7 @@ class SocketIOWorkerUpdate(ModelNormal): 'status': (WorkerStatus,), # noqa: E501 'version': (str,), # noqa: E501 'previous_status': (WorkerStatus,), # noqa: E501 - 'status_requested': (WorkerStatus,), # noqa: E501 - 'lazy_status_request': (bool,), # noqa: E501 + 'status_change': (WorkerStatusChangeRequest,), # noqa: E501 } @cached_property @@ -109,8 +110,7 @@ class SocketIOWorkerUpdate(ModelNormal): 'status': 'status', # noqa: E501 'version': 'version', # noqa: E501 'previous_status': 'previous_status', # noqa: E501 - 'status_requested': 'status_requested', # noqa: E501 - 'lazy_status_request': 'lazy_status_request', # noqa: E501 + 'status_change': 'status_change', # noqa: E501 } read_only_vars = { @@ -162,8 +162,7 @@ class SocketIOWorkerUpdate(ModelNormal): through its discriminator because we passed in _visited_composed_classes = (Animal,) previous_status (WorkerStatus): [optional] # noqa: E501 - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): Whether the worker is allowed to finish its current task before the status change is enforced. Mandatory when `status_requested` is set. . [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -258,8 +257,7 @@ class SocketIOWorkerUpdate(ModelNormal): through its discriminator because we passed in _visited_composed_classes = (Animal,) previous_status (WorkerStatus): [optional] # noqa: E501 - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): Whether the worker is allowed to finish its current task before the status change is enforced. Mandatory when `status_requested` is set. . [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/addon/flamenco/manager/model/worker.py b/addon/flamenco/manager/model/worker.py index 63ed3b74..d1cedfe8 100644 --- a/addon/flamenco/manager/model/worker.py +++ b/addon/flamenco/manager/model/worker.py @@ -32,9 +32,11 @@ from flamenco.manager.exceptions import ApiAttributeError def lazy_import(): from flamenco.manager.model.worker_all_of import WorkerAllOf from flamenco.manager.model.worker_status import WorkerStatus + from flamenco.manager.model.worker_status_change_request import WorkerStatusChangeRequest from flamenco.manager.model.worker_summary import WorkerSummary globals()['WorkerAllOf'] = WorkerAllOf globals()['WorkerStatus'] = WorkerStatus + globals()['WorkerStatusChangeRequest'] = WorkerStatusChangeRequest globals()['WorkerSummary'] = WorkerSummary @@ -98,8 +100,7 @@ class Worker(ModelComposed): 'ip_address': (str,), # noqa: E501 'platform': (str,), # noqa: E501 'supported_task_types': ([str],), # noqa: E501 - 'status_requested': (WorkerStatus,), # noqa: E501 - 'lazy_status_request': (bool,), # noqa: E501 + 'status_change': (WorkerStatusChangeRequest,), # noqa: E501 } @cached_property @@ -115,8 +116,7 @@ class Worker(ModelComposed): 'ip_address': 'ip_address', # noqa: E501 'platform': 'platform', # noqa: E501 'supported_task_types': 'supported_task_types', # noqa: E501 - 'status_requested': 'status_requested', # noqa: E501 - 'lazy_status_request': 'lazy_status_request', # noqa: E501 + 'status_change': 'status_change', # noqa: E501 } read_only_vars = { @@ -165,8 +165,7 @@ class Worker(ModelComposed): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -273,8 +272,7 @@ class Worker(ModelComposed): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/addon/flamenco/manager/model/worker_status_change_request.py b/addon/flamenco/manager/model/worker_status_change_request.py index d3495f0e..2908469b 100644 --- a/addon/flamenco/manager/model/worker_status_change_request.py +++ b/addon/flamenco/manager/model/worker_status_change_request.py @@ -87,7 +87,7 @@ class WorkerStatusChangeRequest(ModelNormal): """ lazy_import() return { - 'status_requested': (WorkerStatus,), # noqa: E501 + 'status': (WorkerStatus,), # noqa: E501 'is_lazy': (bool,), # noqa: E501 } @@ -97,7 +97,7 @@ class WorkerStatusChangeRequest(ModelNormal): attribute_map = { - 'status_requested': 'status_requested', # noqa: E501 + 'status': 'status', # noqa: E501 'is_lazy': 'is_lazy', # noqa: E501 } @@ -108,11 +108,11 @@ class WorkerStatusChangeRequest(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, status_requested, is_lazy, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, status, is_lazy, *args, **kwargs): # noqa: E501 """WorkerStatusChangeRequest - a model defined in OpenAPI Args: - status_requested (WorkerStatus): + status (WorkerStatus): is_lazy (bool): Whether the status change should happen immediately, or after the worker's current task is finished. Keyword Args: @@ -173,7 +173,7 @@ class WorkerStatusChangeRequest(ModelNormal): self._configuration = _configuration self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - self.status_requested = status_requested + self.status = status self.is_lazy = is_lazy for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ @@ -195,11 +195,11 @@ class WorkerStatusChangeRequest(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, status_requested, is_lazy, *args, **kwargs): # noqa: E501 + def __init__(self, status, is_lazy, *args, **kwargs): # noqa: E501 """WorkerStatusChangeRequest - a model defined in OpenAPI Args: - status_requested (WorkerStatus): + status (WorkerStatus): is_lazy (bool): Whether the status change should happen immediately, or after the worker's current task is finished. Keyword Args: @@ -258,7 +258,7 @@ class WorkerStatusChangeRequest(ModelNormal): self._configuration = _configuration self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - self.status_requested = status_requested + self.status = status self.is_lazy = is_lazy for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ diff --git a/addon/flamenco/manager/model/worker_summary.py b/addon/flamenco/manager/model/worker_summary.py index e97cf5cd..59839080 100644 --- a/addon/flamenco/manager/model/worker_summary.py +++ b/addon/flamenco/manager/model/worker_summary.py @@ -31,7 +31,9 @@ from flamenco.manager.exceptions import ApiAttributeError def lazy_import(): from flamenco.manager.model.worker_status import WorkerStatus + from flamenco.manager.model.worker_status_change_request import WorkerStatusChangeRequest globals()['WorkerStatus'] = WorkerStatus + globals()['WorkerStatusChangeRequest'] = WorkerStatusChangeRequest class WorkerSummary(ModelNormal): @@ -91,8 +93,7 @@ class WorkerSummary(ModelNormal): 'nickname': (str,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'version': (str,), # noqa: E501 - 'status_requested': (WorkerStatus,), # noqa: E501 - 'lazy_status_request': (bool,), # noqa: E501 + 'status_change': (WorkerStatusChangeRequest,), # noqa: E501 } @cached_property @@ -105,8 +106,7 @@ class WorkerSummary(ModelNormal): 'nickname': 'nickname', # noqa: E501 'status': 'status', # noqa: E501 'version': 'version', # noqa: E501 - 'status_requested': 'status_requested', # noqa: E501 - 'lazy_status_request': 'lazy_status_request', # noqa: E501 + 'status_change': 'status_change', # noqa: E501 } read_only_vars = { @@ -156,8 +156,7 @@ class WorkerSummary(ModelNormal): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) @@ -249,8 +248,7 @@ class WorkerSummary(ModelNormal): Animal class but this time we won't travel through its discriminator because we passed in _visited_composed_classes = (Animal,) - status_requested (WorkerStatus): [optional] # noqa: E501 - lazy_status_request (bool): [optional] # noqa: E501 + status_change (WorkerStatusChangeRequest): [optional] # noqa: E501 """ _check_type = kwargs.pop('_check_type', True) diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index bd8873eb..59ac4d37 100644 --- a/addon/flamenco/manager_README.md +++ b/addon/flamenco/manager_README.md @@ -4,7 +4,7 @@ Render Farm manager API The `flamenco.manager` package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 -- Package version: cfb17b17 +- Package version: 0d50a7ea - Build package: org.openapitools.codegen.languages.PythonClientCodegen For more information, please visit [https://flamenco.io/](https://flamenco.io/) diff --git a/pkg/api/openapi_spec.gen.go b/pkg/api/openapi_spec.gen.go index c9a27eaf..091ad451 100644 --- a/pkg/api/openapi_spec.gen.go +++ b/pkg/api/openapi_spec.gen.go @@ -18,139 +18,139 @@ import ( // Base64 encoded, gzipped, json marshaled Swagger object var swaggerSpec = []string{ - "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", + "///G1A7QeJcAAA==", } // GetSwagger returns the content of the embedded swagger specification file diff --git a/pkg/api/openapi_types.gen.go b/pkg/api/openapi_types.gen.go index be08a133..ee6a3b53 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -456,14 +456,13 @@ type SocketIOWorkerUpdate struct { // UUID of the Worker Id string `json:"id"` - // Whether the worker is allowed to finish its current task before the status change is enforced. Mandatory when `status_requested` is set. - LazyStatusRequest *bool `json:"lazy_status_request,omitempty"` - // Name of the worker - Nickname string `json:"nickname"` - PreviousStatus *WorkerStatus `json:"previous_status,omitempty"` - Status WorkerStatus `json:"status"` - StatusRequested *WorkerStatus `json:"status_requested,omitempty"` + Nickname string `json:"nickname"` + PreviousStatus *WorkerStatus `json:"previous_status,omitempty"` + Status WorkerStatus `json:"status"` + + // Request for a Worker to change its status to `status`. + StatusChange *WorkerStatusChangeRequest `json:"status_change,omitempty"` // Timestamp of last update Updated time.Time `json:"updated"` @@ -582,20 +581,21 @@ type WorkerStateChanged struct { // WorkerStatus defines model for WorkerStatus. type WorkerStatus string -// Request for a Worker to change its status. +// Request for a Worker to change its status to `status`. type WorkerStatusChangeRequest struct { // Whether the status change should happen immediately, or after the worker's current task is finished. - IsLazy bool `json:"is_lazy"` - StatusRequested WorkerStatus `json:"status_requested"` + IsLazy bool `json:"is_lazy"` + Status WorkerStatus `json:"status"` } // Basic information about a Worker. type WorkerSummary struct { - Id string `json:"id"` - LazyStatusRequest *bool `json:"lazy_status_request,omitempty"` - Nickname string `json:"nickname"` - Status WorkerStatus `json:"status"` - StatusRequested *WorkerStatus `json:"status_requested,omitempty"` + Id string `json:"id"` + Nickname string `json:"nickname"` + Status WorkerStatus `json:"status"` + + // Request for a Worker to change its status to `status`. + StatusChange *WorkerStatusChangeRequest `json:"status_change,omitempty"` // Version of Flamenco this Worker is running Version string `json:"version"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 3f2e30f1..9237dfad 100644 --- a/web/app/src/manager-api/ApiClient.js +++ b/web/app/src/manager-api/ApiClient.js @@ -55,7 +55,7 @@ class ApiClient { * @default {} */ this.defaultHeaders = { - 'User-Agent': 'Flamenco/cfb17b17 / webbrowser' + 'User-Agent': 'Flamenco/0d50a7ea / webbrowser' }; /** diff --git a/web/app/src/manager-api/model/SocketIOWorkerUpdate.js b/web/app/src/manager-api/model/SocketIOWorkerUpdate.js index 93c8b9fb..9d43d88a 100644 --- a/web/app/src/manager-api/model/SocketIOWorkerUpdate.js +++ b/web/app/src/manager-api/model/SocketIOWorkerUpdate.js @@ -13,6 +13,7 @@ import ApiClient from '../ApiClient'; import WorkerStatus from './WorkerStatus'; +import WorkerStatusChangeRequest from './WorkerStatusChangeRequest'; /** * The SocketIOWorkerUpdate model module. @@ -74,11 +75,8 @@ class SocketIOWorkerUpdate { if (data.hasOwnProperty('previous_status')) { obj['previous_status'] = WorkerStatus.constructFromObject(data['previous_status']); } - if (data.hasOwnProperty('status_requested')) { - obj['status_requested'] = WorkerStatus.constructFromObject(data['status_requested']); - } - if (data.hasOwnProperty('lazy_status_request')) { - obj['lazy_status_request'] = ApiClient.convertToType(data['lazy_status_request'], 'Boolean'); + if (data.hasOwnProperty('status_change')) { + obj['status_change'] = WorkerStatusChangeRequest.constructFromObject(data['status_change']); } if (data.hasOwnProperty('version')) { obj['version'] = ApiClient.convertToType(data['version'], 'String'); @@ -119,15 +117,9 @@ SocketIOWorkerUpdate.prototype['status'] = undefined; SocketIOWorkerUpdate.prototype['previous_status'] = undefined; /** - * @member {module:model/WorkerStatus} status_requested + * @member {module:model/WorkerStatusChangeRequest} status_change */ -SocketIOWorkerUpdate.prototype['status_requested'] = undefined; - -/** - * Whether the worker is allowed to finish its current task before the status change is enforced. Mandatory when `status_requested` is set. - * @member {Boolean} lazy_status_request - */ -SocketIOWorkerUpdate.prototype['lazy_status_request'] = undefined; +SocketIOWorkerUpdate.prototype['status_change'] = undefined; /** * @member {String} version diff --git a/web/app/src/manager-api/model/Worker.js b/web/app/src/manager-api/model/Worker.js index 960fafd0..2b5ad8d6 100644 --- a/web/app/src/manager-api/model/Worker.js +++ b/web/app/src/manager-api/model/Worker.js @@ -14,6 +14,7 @@ import ApiClient from '../ApiClient'; import WorkerAllOf from './WorkerAllOf'; import WorkerStatus from './WorkerStatus'; +import WorkerStatusChangeRequest from './WorkerStatusChangeRequest'; import WorkerSummary from './WorkerSummary'; /** @@ -78,11 +79,8 @@ class Worker { if (data.hasOwnProperty('status')) { obj['status'] = WorkerStatus.constructFromObject(data['status']); } - if (data.hasOwnProperty('status_requested')) { - obj['status_requested'] = WorkerStatus.constructFromObject(data['status_requested']); - } - if (data.hasOwnProperty('lazy_status_request')) { - obj['lazy_status_request'] = ApiClient.convertToType(data['lazy_status_request'], 'Boolean'); + if (data.hasOwnProperty('status_change')) { + obj['status_change'] = WorkerStatusChangeRequest.constructFromObject(data['status_change']); } if (data.hasOwnProperty('version')) { obj['version'] = ApiClient.convertToType(data['version'], 'String'); @@ -119,14 +117,9 @@ Worker.prototype['nickname'] = undefined; Worker.prototype['status'] = undefined; /** - * @member {module:model/WorkerStatus} status_requested + * @member {module:model/WorkerStatusChangeRequest} status_change */ -Worker.prototype['status_requested'] = undefined; - -/** - * @member {Boolean} lazy_status_request - */ -Worker.prototype['lazy_status_request'] = undefined; +Worker.prototype['status_change'] = undefined; /** * Version of Flamenco this Worker is running @@ -166,13 +159,9 @@ WorkerSummary.prototype['nickname'] = undefined; */ WorkerSummary.prototype['status'] = undefined; /** - * @member {module:model/WorkerStatus} status_requested + * @member {module:model/WorkerStatusChangeRequest} status_change */ -WorkerSummary.prototype['status_requested'] = undefined; -/** - * @member {Boolean} lazy_status_request - */ -WorkerSummary.prototype['lazy_status_request'] = undefined; +WorkerSummary.prototype['status_change'] = undefined; /** * Version of Flamenco this Worker is running * @member {String} version diff --git a/web/app/src/manager-api/model/WorkerStatusChangeRequest.js b/web/app/src/manager-api/model/WorkerStatusChangeRequest.js index 673abdca..c734012c 100644 --- a/web/app/src/manager-api/model/WorkerStatusChangeRequest.js +++ b/web/app/src/manager-api/model/WorkerStatusChangeRequest.js @@ -22,14 +22,14 @@ import WorkerStatus from './WorkerStatus'; class WorkerStatusChangeRequest { /** * Constructs a new WorkerStatusChangeRequest. - * Request for a Worker to change its status. + * Request for a Worker to change its status to `status`. * @alias module:model/WorkerStatusChangeRequest - * @param statusRequested {module:model/WorkerStatus} + * @param status {module:model/WorkerStatus} * @param isLazy {Boolean} Whether the status change should happen immediately, or after the worker's current task is finished. */ - constructor(statusRequested, isLazy) { + constructor(status, isLazy) { - WorkerStatusChangeRequest.initialize(this, statusRequested, isLazy); + WorkerStatusChangeRequest.initialize(this, status, isLazy); } /** @@ -37,8 +37,8 @@ class WorkerStatusChangeRequest { * This method is used by the constructors of any subclasses, in order to implement multiple inheritance (mix-ins). * Only for internal use. */ - static initialize(obj, statusRequested, isLazy) { - obj['status_requested'] = statusRequested; + static initialize(obj, status, isLazy) { + obj['status'] = status; obj['is_lazy'] = isLazy; } @@ -53,8 +53,8 @@ class WorkerStatusChangeRequest { if (data) { obj = obj || new WorkerStatusChangeRequest(); - if (data.hasOwnProperty('status_requested')) { - obj['status_requested'] = WorkerStatus.constructFromObject(data['status_requested']); + if (data.hasOwnProperty('status')) { + obj['status'] = WorkerStatus.constructFromObject(data['status']); } if (data.hasOwnProperty('is_lazy')) { obj['is_lazy'] = ApiClient.convertToType(data['is_lazy'], 'Boolean'); @@ -67,9 +67,9 @@ class WorkerStatusChangeRequest { } /** - * @member {module:model/WorkerStatus} status_requested + * @member {module:model/WorkerStatus} status */ -WorkerStatusChangeRequest.prototype['status_requested'] = undefined; +WorkerStatusChangeRequest.prototype['status'] = undefined; /** * Whether the status change should happen immediately, or after the worker's current task is finished. diff --git a/web/app/src/manager-api/model/WorkerSummary.js b/web/app/src/manager-api/model/WorkerSummary.js index 4afa8fab..6f3d217c 100644 --- a/web/app/src/manager-api/model/WorkerSummary.js +++ b/web/app/src/manager-api/model/WorkerSummary.js @@ -13,6 +13,7 @@ import ApiClient from '../ApiClient'; import WorkerStatus from './WorkerStatus'; +import WorkerStatusChangeRequest from './WorkerStatusChangeRequest'; /** * The WorkerSummary model module. @@ -66,11 +67,8 @@ class WorkerSummary { if (data.hasOwnProperty('status')) { obj['status'] = WorkerStatus.constructFromObject(data['status']); } - if (data.hasOwnProperty('status_requested')) { - obj['status_requested'] = WorkerStatus.constructFromObject(data['status_requested']); - } - if (data.hasOwnProperty('lazy_status_request')) { - obj['lazy_status_request'] = ApiClient.convertToType(data['lazy_status_request'], 'Boolean'); + if (data.hasOwnProperty('status_change')) { + obj['status_change'] = WorkerStatusChangeRequest.constructFromObject(data['status_change']); } if (data.hasOwnProperty('version')) { obj['version'] = ApiClient.convertToType(data['version'], 'String'); @@ -98,14 +96,9 @@ WorkerSummary.prototype['nickname'] = undefined; WorkerSummary.prototype['status'] = undefined; /** - * @member {module:model/WorkerStatus} status_requested + * @member {module:model/WorkerStatusChangeRequest} status_change */ -WorkerSummary.prototype['status_requested'] = undefined; - -/** - * @member {Boolean} lazy_status_request - */ -WorkerSummary.prototype['lazy_status_request'] = undefined; +WorkerSummary.prototype['status_change'] = undefined; /** * Version of Flamenco this Worker is running