diff --git a/addon/flamenco/manager/__init__.py b/addon/flamenco/manager/__init__.py index 7b988185..37ff34c0 100644 --- a/addon/flamenco/manager/__init__.py +++ b/addon/flamenco/manager/__init__.py @@ -10,7 +10,7 @@ """ -__version__ = "f020582b" +__version__ = "55676b00" # 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 caa0ba4f..3f410a0f 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/f020582b (Blender add-on)' + self.user_agent = 'Flamenco/55676b00 (Blender add-on)' def __enter__(self): return self diff --git a/addon/flamenco/manager/configuration.py b/addon/flamenco/manager/configuration.py index a128654b..05978a57 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: f020582b".\ + "SDK Package Version: 55676b00".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self): diff --git a/addon/flamenco/manager/docs/RegisteredWorker.md b/addon/flamenco/manager/docs/RegisteredWorker.md index 08ad012a..4f8644b5 100644 --- a/addon/flamenco/manager/docs/RegisteredWorker.md +++ b/addon/flamenco/manager/docs/RegisteredWorker.md @@ -5,7 +5,7 @@ Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **uuid** | **str** | | -**nickname** | **str** | | +**name** | **str** | | **address** | **str** | | **status** | [**WorkerStatus**](WorkerStatus.md) | | **platform** | **str** | | diff --git a/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md b/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md index 7d7fbef4..077f86ff 100644 --- a/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md +++ b/addon/flamenco/manager/docs/SocketIOWorkerUpdate.md @@ -6,7 +6,7 @@ Subset of a Worker, sent over SocketIO when a worker changes. Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **id** | **str** | UUID of the Worker | -**nickname** | **str** | Name of the worker | +**name** | **str** | Name of the worker | **updated** | **datetime** | Timestamp of last update | **status** | [**WorkerStatus**](WorkerStatus.md) | | **version** | **str** | | diff --git a/addon/flamenco/manager/docs/Worker.md b/addon/flamenco/manager/docs/Worker.md index 8cce9127..ed21749e 100644 --- a/addon/flamenco/manager/docs/Worker.md +++ b/addon/flamenco/manager/docs/Worker.md @@ -6,7 +6,7 @@ All information about a Worker Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **id** | **str** | | -**nickname** | **str** | | +**name** | **str** | | **status** | [**WorkerStatus**](WorkerStatus.md) | | **version** | **str** | Version of Flamenco this Worker is running | **ip_address** | **str** | IP address of the Worker | diff --git a/addon/flamenco/manager/docs/WorkerApi.md b/addon/flamenco/manager/docs/WorkerApi.md index a6e0637d..bbe3731e 100644 --- a/addon/flamenco/manager/docs/WorkerApi.md +++ b/addon/flamenco/manager/docs/WorkerApi.md @@ -125,7 +125,7 @@ with flamenco.manager.ApiClient() as api_client: supported_task_types=[ "supported_task_types_example", ], - nickname="nickname_example", + name="name_example", ) # WorkerRegistration | Worker to register # example passing only required values which don't have defaults set @@ -356,7 +356,7 @@ with flamenco.manager.ApiClient(configuration) as api_client: # Create an instance of the API class api_instance = worker_api.WorkerApi(api_client) worker_sign_on = WorkerSignOn( - nickname="nickname_example", + name="name_example", supported_task_types=[ "supported_task_types_example", ], diff --git a/addon/flamenco/manager/docs/WorkerRegistration.md b/addon/flamenco/manager/docs/WorkerRegistration.md index a98c8228..ad145d8c 100644 --- a/addon/flamenco/manager/docs/WorkerRegistration.md +++ b/addon/flamenco/manager/docs/WorkerRegistration.md @@ -7,7 +7,7 @@ Name | Type | Description | Notes **secret** | **str** | | **platform** | **str** | | **supported_task_types** | **[str]** | | -**nickname** | **str** | | +**name** | **str** | | **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/WorkerSignOn.md b/addon/flamenco/manager/docs/WorkerSignOn.md index 888c6da4..66d06596 100644 --- a/addon/flamenco/manager/docs/WorkerSignOn.md +++ b/addon/flamenco/manager/docs/WorkerSignOn.md @@ -4,7 +4,7 @@ ## Properties Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- -**nickname** | **str** | | +**name** | **str** | | **supported_task_types** | **[str]** | | **software_version** | **str** | | **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 1e296970..b490e3e6 100644 --- a/addon/flamenco/manager/docs/WorkerSummary.md +++ b/addon/flamenco/manager/docs/WorkerSummary.md @@ -6,7 +6,7 @@ Basic information about a Worker. Name | Type | Description | Notes ------------ | ------------- | ------------- | ------------- **id** | **str** | | -**nickname** | **str** | | +**name** | **str** | | **status** | [**WorkerStatus**](WorkerStatus.md) | | **version** | **str** | Version of Flamenco this Worker is running | **status_change** | [**WorkerStatusChangeRequest**](WorkerStatusChangeRequest.md) | | [optional] diff --git a/addon/flamenco/manager/model/registered_worker.py b/addon/flamenco/manager/model/registered_worker.py index 4624e8ab..3ee58e55 100644 --- a/addon/flamenco/manager/model/registered_worker.py +++ b/addon/flamenco/manager/model/registered_worker.py @@ -88,7 +88,7 @@ class RegisteredWorker(ModelNormal): lazy_import() return { 'uuid': (str,), # noqa: E501 - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 'address': (str,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'platform': (str,), # noqa: E501 @@ -103,7 +103,7 @@ class RegisteredWorker(ModelNormal): attribute_map = { 'uuid': 'uuid', # noqa: E501 - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 'address': 'address', # noqa: E501 'status': 'status', # noqa: E501 'platform': 'platform', # noqa: E501 @@ -118,12 +118,12 @@ class RegisteredWorker(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, uuid, nickname, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, uuid, name, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 """RegisteredWorker - a model defined in OpenAPI Args: uuid (str): - nickname (str): + name (str): address (str): status (WorkerStatus): platform (str): @@ -189,7 +189,7 @@ class RegisteredWorker(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.uuid = uuid - self.nickname = nickname + self.name = name self.address = address self.status = status self.platform = platform @@ -215,12 +215,12 @@ class RegisteredWorker(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, uuid, nickname, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 + def __init__(self, uuid, name, address, status, platform, software, supported_task_types, *args, **kwargs): # noqa: E501 """RegisteredWorker - a model defined in OpenAPI Args: uuid (str): - nickname (str): + name (str): address (str): status (WorkerStatus): platform (str): @@ -284,7 +284,7 @@ class RegisteredWorker(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.uuid = uuid - self.nickname = nickname + self.name = name self.address = address self.status = status self.platform = platform diff --git a/addon/flamenco/manager/model/socket_io_worker_update.py b/addon/flamenco/manager/model/socket_io_worker_update.py index 4926308c..bc7edddb 100644 --- a/addon/flamenco/manager/model/socket_io_worker_update.py +++ b/addon/flamenco/manager/model/socket_io_worker_update.py @@ -90,7 +90,7 @@ class SocketIOWorkerUpdate(ModelNormal): lazy_import() return { 'id': (str,), # noqa: E501 - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 'updated': (datetime,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'version': (str,), # noqa: E501 @@ -105,7 +105,7 @@ class SocketIOWorkerUpdate(ModelNormal): attribute_map = { 'id': 'id', # noqa: E501 - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 'updated': 'updated', # noqa: E501 'status': 'status', # noqa: E501 'version': 'version', # noqa: E501 @@ -120,12 +120,12 @@ class SocketIOWorkerUpdate(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, id, nickname, updated, status, version, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, id, name, updated, status, version, *args, **kwargs): # noqa: E501 """SocketIOWorkerUpdate - a model defined in OpenAPI Args: id (str): UUID of the Worker - nickname (str): Name of the worker + name (str): Name of the worker updated (datetime): Timestamp of last update status (WorkerStatus): version (str): @@ -191,7 +191,7 @@ class SocketIOWorkerUpdate(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.id = id - self.nickname = nickname + self.name = name self.updated = updated self.status = status self.version = version @@ -215,12 +215,12 @@ class SocketIOWorkerUpdate(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, id, nickname, updated, status, version, *args, **kwargs): # noqa: E501 + def __init__(self, id, name, updated, status, version, *args, **kwargs): # noqa: E501 """SocketIOWorkerUpdate - a model defined in OpenAPI Args: id (str): UUID of the Worker - nickname (str): Name of the worker + name (str): Name of the worker updated (datetime): Timestamp of last update status (WorkerStatus): version (str): @@ -284,7 +284,7 @@ class SocketIOWorkerUpdate(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.id = id - self.nickname = nickname + self.name = name self.updated = updated self.status = status self.version = version diff --git a/addon/flamenco/manager/model/worker.py b/addon/flamenco/manager/model/worker.py index d1cedfe8..a3059ed8 100644 --- a/addon/flamenco/manager/model/worker.py +++ b/addon/flamenco/manager/model/worker.py @@ -94,7 +94,7 @@ class Worker(ModelComposed): lazy_import() return { 'id': (str,), # noqa: E501 - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'version': (str,), # noqa: E501 'ip_address': (str,), # noqa: E501 @@ -110,7 +110,7 @@ class Worker(ModelComposed): attribute_map = { 'id': 'id', # noqa: E501 - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 'status': 'status', # noqa: E501 'version': 'version', # noqa: E501 'ip_address': 'ip_address', # noqa: E501 @@ -129,7 +129,7 @@ class Worker(ModelComposed): Keyword Args: id (str): - nickname (str): + name (str): status (WorkerStatus): version (str): Version of Flamenco this Worker is running ip_address (str): IP address of the Worker @@ -236,7 +236,7 @@ class Worker(ModelComposed): Keyword Args: id (str): - nickname (str): + name (str): status (WorkerStatus): version (str): Version of Flamenco this Worker is running ip_address (str): IP address of the Worker diff --git a/addon/flamenco/manager/model/worker_registration.py b/addon/flamenco/manager/model/worker_registration.py index bb641c40..677f8da7 100644 --- a/addon/flamenco/manager/model/worker_registration.py +++ b/addon/flamenco/manager/model/worker_registration.py @@ -84,7 +84,7 @@ class WorkerRegistration(ModelNormal): 'secret': (str,), # noqa: E501 'platform': (str,), # noqa: E501 'supported_task_types': ([str],), # noqa: E501 - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 } @cached_property @@ -96,7 +96,7 @@ class WorkerRegistration(ModelNormal): 'secret': 'secret', # noqa: E501 'platform': 'platform', # noqa: E501 'supported_task_types': 'supported_task_types', # noqa: E501 - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 } read_only_vars = { @@ -106,14 +106,14 @@ class WorkerRegistration(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, secret, platform, supported_task_types, nickname, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, secret, platform, supported_task_types, name, *args, **kwargs): # noqa: E501 """WorkerRegistration - a model defined in OpenAPI Args: secret (str): platform (str): supported_task_types ([str]): - nickname (str): + name (str): Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -176,7 +176,7 @@ class WorkerRegistration(ModelNormal): self.secret = secret self.platform = platform self.supported_task_types = supported_task_types - self.nickname = nickname + self.name = name for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ self._configuration is not None and \ @@ -197,14 +197,14 @@ class WorkerRegistration(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, secret, platform, supported_task_types, nickname, *args, **kwargs): # noqa: E501 + def __init__(self, secret, platform, supported_task_types, name, *args, **kwargs): # noqa: E501 """WorkerRegistration - a model defined in OpenAPI Args: secret (str): platform (str): supported_task_types ([str]): - nickname (str): + name (str): Keyword Args: _check_type (bool): if True, values for parameters in openapi_types @@ -265,7 +265,7 @@ class WorkerRegistration(ModelNormal): self.secret = secret self.platform = platform self.supported_task_types = supported_task_types - self.nickname = nickname + self.name = name for var_name, var_value in kwargs.items(): if var_name not in self.attribute_map and \ self._configuration is not None and \ diff --git a/addon/flamenco/manager/model/worker_sign_on.py b/addon/flamenco/manager/model/worker_sign_on.py index 72b82594..021c0c89 100644 --- a/addon/flamenco/manager/model/worker_sign_on.py +++ b/addon/flamenco/manager/model/worker_sign_on.py @@ -81,7 +81,7 @@ class WorkerSignOn(ModelNormal): and the value is attribute type. """ return { - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 'supported_task_types': ([str],), # noqa: E501 'software_version': (str,), # noqa: E501 } @@ -92,7 +92,7 @@ class WorkerSignOn(ModelNormal): attribute_map = { - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 'supported_task_types': 'supported_task_types', # noqa: E501 'software_version': 'software_version', # noqa: E501 } @@ -104,11 +104,11 @@ class WorkerSignOn(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, nickname, supported_task_types, software_version, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, name, supported_task_types, software_version, *args, **kwargs): # noqa: E501 """WorkerSignOn - a model defined in OpenAPI Args: - nickname (str): + name (str): supported_task_types ([str]): software_version (str): @@ -170,7 +170,7 @@ class WorkerSignOn(ModelNormal): self._configuration = _configuration self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - self.nickname = nickname + self.name = name self.supported_task_types = supported_task_types self.software_version = software_version for var_name, var_value in kwargs.items(): @@ -193,11 +193,11 @@ class WorkerSignOn(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, nickname, supported_task_types, software_version, *args, **kwargs): # noqa: E501 + def __init__(self, name, supported_task_types, software_version, *args, **kwargs): # noqa: E501 """WorkerSignOn - a model defined in OpenAPI Args: - nickname (str): + name (str): supported_task_types ([str]): software_version (str): @@ -257,7 +257,7 @@ class WorkerSignOn(ModelNormal): self._configuration = _configuration self._visited_composed_classes = _visited_composed_classes + (self.__class__,) - self.nickname = nickname + self.name = name self.supported_task_types = supported_task_types self.software_version = software_version for var_name, var_value in kwargs.items(): diff --git a/addon/flamenco/manager/model/worker_summary.py b/addon/flamenco/manager/model/worker_summary.py index 59839080..bffc7d67 100644 --- a/addon/flamenco/manager/model/worker_summary.py +++ b/addon/flamenco/manager/model/worker_summary.py @@ -90,7 +90,7 @@ class WorkerSummary(ModelNormal): lazy_import() return { 'id': (str,), # noqa: E501 - 'nickname': (str,), # noqa: E501 + 'name': (str,), # noqa: E501 'status': (WorkerStatus,), # noqa: E501 'version': (str,), # noqa: E501 'status_change': (WorkerStatusChangeRequest,), # noqa: E501 @@ -103,7 +103,7 @@ class WorkerSummary(ModelNormal): attribute_map = { 'id': 'id', # noqa: E501 - 'nickname': 'nickname', # noqa: E501 + 'name': 'name', # noqa: E501 'status': 'status', # noqa: E501 'version': 'version', # noqa: E501 'status_change': 'status_change', # noqa: E501 @@ -116,12 +116,12 @@ class WorkerSummary(ModelNormal): @classmethod @convert_js_args_to_python_args - def _from_openapi_data(cls, id, nickname, status, version, *args, **kwargs): # noqa: E501 + def _from_openapi_data(cls, id, name, status, version, *args, **kwargs): # noqa: E501 """WorkerSummary - a model defined in OpenAPI Args: id (str): - nickname (str): + name (str): status (WorkerStatus): version (str): Version of Flamenco this Worker is running @@ -185,7 +185,7 @@ class WorkerSummary(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.id = id - self.nickname = nickname + self.name = name self.status = status self.version = version for var_name, var_value in kwargs.items(): @@ -208,12 +208,12 @@ class WorkerSummary(ModelNormal): ]) @convert_js_args_to_python_args - def __init__(self, id, nickname, status, version, *args, **kwargs): # noqa: E501 + def __init__(self, id, name, status, version, *args, **kwargs): # noqa: E501 """WorkerSummary - a model defined in OpenAPI Args: id (str): - nickname (str): + name (str): status (WorkerStatus): version (str): Version of Flamenco this Worker is running @@ -275,7 +275,7 @@ class WorkerSummary(ModelNormal): self._visited_composed_classes = _visited_composed_classes + (self.__class__,) self.id = id - self.nickname = nickname + self.name = name self.status = status self.version = version for var_name, var_value in kwargs.items(): diff --git a/addon/flamenco/manager_README.md b/addon/flamenco/manager_README.md index 3f0a7f14..abae7432 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: f020582b +- Package version: 55676b00 - 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 38ae5dad..d4c4b7b6 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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", + "/wAAAP//yTkr37mXAAA=", } // 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 43fbeea6..4700a64f 100644 --- a/pkg/api/openapi_types.gen.go +++ b/pkg/api/openapi_types.gen.go @@ -318,7 +318,7 @@ type MayKeepRunning struct { // RegisteredWorker defines model for RegisteredWorker. type RegisteredWorker struct { Address string `json:"address"` - Nickname string `json:"nickname"` + Name string `json:"name"` Platform string `json:"platform"` Software string `json:"software"` Status WorkerStatus `json:"status"` @@ -455,7 +455,7 @@ type SocketIOWorkerUpdate struct { Id string `json:"id"` // Name of the worker - Nickname string `json:"nickname"` + Name string `json:"name"` PreviousStatus *WorkerStatus `json:"previous_status,omitempty"` Status WorkerStatus `json:"status"` @@ -556,7 +556,7 @@ type WorkerList struct { // WorkerRegistration defines model for WorkerRegistration. type WorkerRegistration struct { - Nickname string `json:"nickname"` + Name string `json:"name"` Platform string `json:"platform"` Secret string `json:"secret"` SupportedTaskTypes []string `json:"supported_task_types"` @@ -564,7 +564,7 @@ type WorkerRegistration struct { // WorkerSignOn defines model for WorkerSignOn. type WorkerSignOn struct { - Nickname string `json:"nickname"` + Name string `json:"name"` SoftwareVersion string `json:"software_version"` SupportedTaskTypes []string `json:"supported_task_types"` } @@ -591,9 +591,9 @@ type WorkerStatusChangeRequest struct { // Basic information about a Worker. type WorkerSummary struct { - Id string `json:"id"` - Nickname string `json:"nickname"` - Status WorkerStatus `json:"status"` + Id string `json:"id"` + Name string `json:"name"` + Status WorkerStatus `json:"status"` // Request for a Worker to change its status to `status`. StatusChange *WorkerStatusChangeRequest `json:"status_change,omitempty"` diff --git a/web/app/src/manager-api/ApiClient.js b/web/app/src/manager-api/ApiClient.js index 70b189ee..27b88a2e 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/f020582b / webbrowser' + 'User-Agent': 'Flamenco/55676b00 / webbrowser' }; /** diff --git a/web/app/src/manager-api/model/RegisteredWorker.js b/web/app/src/manager-api/model/RegisteredWorker.js index 13fcb3ff..918de4fd 100644 --- a/web/app/src/manager-api/model/RegisteredWorker.js +++ b/web/app/src/manager-api/model/RegisteredWorker.js @@ -24,16 +24,16 @@ class RegisteredWorker { * Constructs a new RegisteredWorker. * @alias module:model/RegisteredWorker * @param uuid {String} - * @param nickname {String} + * @param name {String} * @param address {String} * @param status {module:model/WorkerStatus} * @param platform {String} * @param software {String} * @param supportedTaskTypes {Array.} */ - constructor(uuid, nickname, address, status, platform, software, supportedTaskTypes) { + constructor(uuid, name, address, status, platform, software, supportedTaskTypes) { - RegisteredWorker.initialize(this, uuid, nickname, address, status, platform, software, supportedTaskTypes); + RegisteredWorker.initialize(this, uuid, name, address, status, platform, software, supportedTaskTypes); } /** @@ -41,9 +41,9 @@ class RegisteredWorker { * 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, uuid, nickname, address, status, platform, software, supportedTaskTypes) { + static initialize(obj, uuid, name, address, status, platform, software, supportedTaskTypes) { obj['uuid'] = uuid; - obj['nickname'] = nickname; + obj['name'] = name; obj['address'] = address; obj['status'] = status; obj['platform'] = platform; @@ -65,8 +65,8 @@ class RegisteredWorker { if (data.hasOwnProperty('uuid')) { obj['uuid'] = ApiClient.convertToType(data['uuid'], 'String'); } - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } if (data.hasOwnProperty('address')) { obj['address'] = ApiClient.convertToType(data['address'], 'String'); @@ -96,9 +96,9 @@ class RegisteredWorker { RegisteredWorker.prototype['uuid'] = undefined; /** - * @member {String} nickname + * @member {String} name */ -RegisteredWorker.prototype['nickname'] = undefined; +RegisteredWorker.prototype['name'] = undefined; /** * @member {String} address diff --git a/web/app/src/manager-api/model/SocketIOWorkerUpdate.js b/web/app/src/manager-api/model/SocketIOWorkerUpdate.js index 9d43d88a..e97353dd 100644 --- a/web/app/src/manager-api/model/SocketIOWorkerUpdate.js +++ b/web/app/src/manager-api/model/SocketIOWorkerUpdate.js @@ -26,14 +26,14 @@ class SocketIOWorkerUpdate { * Subset of a Worker, sent over SocketIO when a worker changes. * @alias module:model/SocketIOWorkerUpdate * @param id {String} UUID of the Worker - * @param nickname {String} Name of the worker + * @param name {String} Name of the worker * @param updated {Date} Timestamp of last update * @param status {module:model/WorkerStatus} * @param version {String} */ - constructor(id, nickname, updated, status, version) { + constructor(id, name, updated, status, version) { - SocketIOWorkerUpdate.initialize(this, id, nickname, updated, status, version); + SocketIOWorkerUpdate.initialize(this, id, name, updated, status, version); } /** @@ -41,9 +41,9 @@ class SocketIOWorkerUpdate { * 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, id, nickname, updated, status, version) { + static initialize(obj, id, name, updated, status, version) { obj['id'] = id; - obj['nickname'] = nickname; + obj['name'] = name; obj['updated'] = updated; obj['status'] = status; obj['version'] = version; @@ -63,8 +63,8 @@ class SocketIOWorkerUpdate { if (data.hasOwnProperty('id')) { obj['id'] = ApiClient.convertToType(data['id'], 'String'); } - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } if (data.hasOwnProperty('updated')) { obj['updated'] = ApiClient.convertToType(data['updated'], 'Date'); @@ -96,9 +96,9 @@ SocketIOWorkerUpdate.prototype['id'] = undefined; /** * Name of the worker - * @member {String} nickname + * @member {String} name */ -SocketIOWorkerUpdate.prototype['nickname'] = undefined; +SocketIOWorkerUpdate.prototype['name'] = undefined; /** * Timestamp of last update diff --git a/web/app/src/manager-api/model/Worker.js b/web/app/src/manager-api/model/Worker.js index 2b5ad8d6..9aef10c5 100644 --- a/web/app/src/manager-api/model/Worker.js +++ b/web/app/src/manager-api/model/Worker.js @@ -30,16 +30,16 @@ class Worker { * @implements module:model/WorkerSummary * @implements module:model/WorkerAllOf * @param id {String} - * @param nickname {String} + * @param name {String} * @param status {module:model/WorkerStatus} * @param version {String} Version of Flamenco this Worker is running * @param ipAddress {String} IP address of the Worker * @param platform {String} Operating system of the Worker * @param supportedTaskTypes {Array.} */ - constructor(id, nickname, status, version, ipAddress, platform, supportedTaskTypes) { - WorkerSummary.initialize(this, id, nickname, status, version);WorkerAllOf.initialize(this, ipAddress, platform, supportedTaskTypes); - Worker.initialize(this, id, nickname, status, version, ipAddress, platform, supportedTaskTypes); + constructor(id, name, status, version, ipAddress, platform, supportedTaskTypes) { + WorkerSummary.initialize(this, id, name, status, version);WorkerAllOf.initialize(this, ipAddress, platform, supportedTaskTypes); + Worker.initialize(this, id, name, status, version, ipAddress, platform, supportedTaskTypes); } /** @@ -47,9 +47,9 @@ class Worker { * 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, id, nickname, status, version, ipAddress, platform, supportedTaskTypes) { + static initialize(obj, id, name, status, version, ipAddress, platform, supportedTaskTypes) { obj['id'] = id; - obj['nickname'] = nickname; + obj['name'] = name; obj['status'] = status; obj['version'] = version; obj['ip_address'] = ipAddress; @@ -73,8 +73,8 @@ class Worker { if (data.hasOwnProperty('id')) { obj['id'] = ApiClient.convertToType(data['id'], 'String'); } - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } if (data.hasOwnProperty('status')) { obj['status'] = WorkerStatus.constructFromObject(data['status']); @@ -107,9 +107,9 @@ class Worker { Worker.prototype['id'] = undefined; /** - * @member {String} nickname + * @member {String} name */ -Worker.prototype['nickname'] = undefined; +Worker.prototype['name'] = undefined; /** * @member {module:model/WorkerStatus} status @@ -151,9 +151,9 @@ Worker.prototype['supported_task_types'] = undefined; */ WorkerSummary.prototype['id'] = undefined; /** - * @member {String} nickname + * @member {String} name */ -WorkerSummary.prototype['nickname'] = undefined; +WorkerSummary.prototype['name'] = undefined; /** * @member {module:model/WorkerStatus} status */ diff --git a/web/app/src/manager-api/model/WorkerRegistration.js b/web/app/src/manager-api/model/WorkerRegistration.js index b62eacd5..f5f7ffaa 100644 --- a/web/app/src/manager-api/model/WorkerRegistration.js +++ b/web/app/src/manager-api/model/WorkerRegistration.js @@ -25,11 +25,11 @@ class WorkerRegistration { * @param secret {String} * @param platform {String} * @param supportedTaskTypes {Array.} - * @param nickname {String} + * @param name {String} */ - constructor(secret, platform, supportedTaskTypes, nickname) { + constructor(secret, platform, supportedTaskTypes, name) { - WorkerRegistration.initialize(this, secret, platform, supportedTaskTypes, nickname); + WorkerRegistration.initialize(this, secret, platform, supportedTaskTypes, name); } /** @@ -37,11 +37,11 @@ class WorkerRegistration { * 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, secret, platform, supportedTaskTypes, nickname) { + static initialize(obj, secret, platform, supportedTaskTypes, name) { obj['secret'] = secret; obj['platform'] = platform; obj['supported_task_types'] = supportedTaskTypes; - obj['nickname'] = nickname; + obj['name'] = name; } /** @@ -64,8 +64,8 @@ class WorkerRegistration { if (data.hasOwnProperty('supported_task_types')) { obj['supported_task_types'] = ApiClient.convertToType(data['supported_task_types'], ['String']); } - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } } return obj; @@ -90,9 +90,9 @@ WorkerRegistration.prototype['platform'] = undefined; WorkerRegistration.prototype['supported_task_types'] = undefined; /** - * @member {String} nickname + * @member {String} name */ -WorkerRegistration.prototype['nickname'] = undefined; +WorkerRegistration.prototype['name'] = undefined; diff --git a/web/app/src/manager-api/model/WorkerSignOn.js b/web/app/src/manager-api/model/WorkerSignOn.js index d8e5cf91..e2d6ae1e 100644 --- a/web/app/src/manager-api/model/WorkerSignOn.js +++ b/web/app/src/manager-api/model/WorkerSignOn.js @@ -22,13 +22,13 @@ class WorkerSignOn { /** * Constructs a new WorkerSignOn. * @alias module:model/WorkerSignOn - * @param nickname {String} + * @param name {String} * @param supportedTaskTypes {Array.} * @param softwareVersion {String} */ - constructor(nickname, supportedTaskTypes, softwareVersion) { + constructor(name, supportedTaskTypes, softwareVersion) { - WorkerSignOn.initialize(this, nickname, supportedTaskTypes, softwareVersion); + WorkerSignOn.initialize(this, name, supportedTaskTypes, softwareVersion); } /** @@ -36,8 +36,8 @@ class WorkerSignOn { * 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, nickname, supportedTaskTypes, softwareVersion) { - obj['nickname'] = nickname; + static initialize(obj, name, supportedTaskTypes, softwareVersion) { + obj['name'] = name; obj['supported_task_types'] = supportedTaskTypes; obj['software_version'] = softwareVersion; } @@ -53,8 +53,8 @@ class WorkerSignOn { if (data) { obj = obj || new WorkerSignOn(); - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } if (data.hasOwnProperty('supported_task_types')) { obj['supported_task_types'] = ApiClient.convertToType(data['supported_task_types'], ['String']); @@ -70,9 +70,9 @@ class WorkerSignOn { } /** - * @member {String} nickname + * @member {String} name */ -WorkerSignOn.prototype['nickname'] = undefined; +WorkerSignOn.prototype['name'] = undefined; /** * @member {Array.} supported_task_types diff --git a/web/app/src/manager-api/model/WorkerSummary.js b/web/app/src/manager-api/model/WorkerSummary.js index 6f3d217c..0a2717e7 100644 --- a/web/app/src/manager-api/model/WorkerSummary.js +++ b/web/app/src/manager-api/model/WorkerSummary.js @@ -26,13 +26,13 @@ class WorkerSummary { * Basic information about a Worker. * @alias module:model/WorkerSummary * @param id {String} - * @param nickname {String} + * @param name {String} * @param status {module:model/WorkerStatus} * @param version {String} Version of Flamenco this Worker is running */ - constructor(id, nickname, status, version) { + constructor(id, name, status, version) { - WorkerSummary.initialize(this, id, nickname, status, version); + WorkerSummary.initialize(this, id, name, status, version); } /** @@ -40,9 +40,9 @@ class WorkerSummary { * 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, id, nickname, status, version) { + static initialize(obj, id, name, status, version) { obj['id'] = id; - obj['nickname'] = nickname; + obj['name'] = name; obj['status'] = status; obj['version'] = version; } @@ -61,8 +61,8 @@ class WorkerSummary { if (data.hasOwnProperty('id')) { obj['id'] = ApiClient.convertToType(data['id'], 'String'); } - if (data.hasOwnProperty('nickname')) { - obj['nickname'] = ApiClient.convertToType(data['nickname'], 'String'); + if (data.hasOwnProperty('name')) { + obj['name'] = ApiClient.convertToType(data['name'], 'String'); } if (data.hasOwnProperty('status')) { obj['status'] = WorkerStatus.constructFromObject(data['status']); @@ -86,9 +86,9 @@ class WorkerSummary { WorkerSummary.prototype['id'] = undefined; /** - * @member {String} nickname + * @member {String} name */ -WorkerSummary.prototype['nickname'] = undefined; +WorkerSummary.prototype['name'] = undefined; /** * @member {module:model/WorkerStatus} status