- Clusters
+
@@ -140,7 +143,7 @@ import { useNotifs } from '@/stores/notifications'
import { useWorkers } from '@/stores/workers'
import * as datetime from "@/datetime";
-import { WorkerMgtApi, WorkerSleepSchedule, WorkerClusterChangeRequest } from '@/manager-api';
+import { WorkerMgtApi, WorkerSleepSchedule, WorkerTagChangeRequest } from "@/manager-api";
import { getAPIClient } from "@/api-client";
import { workerStatus } from "../../statusindicator";
import LinkWorkerTask from '@/components/LinkWorkerTask.vue';
@@ -165,18 +168,17 @@ export default {
notifs: useNotifs(),
copyElementText: copyElementText,
workers: useWorkers(),
- thisWorkerClusters: {}, // Mapping from UUID to 'isAssigned' boolean.
+ thisWorkerTags: {}, // Mapping from UUID to 'isAssigned' boolean.
};
},
mounted() {
// Allow testing from the JS console:
window.workerDetailsVue = this;
- this.workers.refreshClusters()
- .catch((error) => {
- const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
- this.notifs.add(`Error: ${errorMsg}`);
- });
+ this.workers.refreshTags().catch((error) => {
+ const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
+ this.notifs.add(`Error: ${errorMsg}`);
+ });
},
watch: {
workerData(newData, oldData) {
@@ -191,7 +193,7 @@ export default {
this.fetchWorkerSleepSchedule();
}
- this.updateThisWorkerClusters(newData);
+ this.updateThisWorkerTags(newData);
},
},
computed: {
@@ -210,10 +212,10 @@ export default {
workerSleepScheduleStatusLabel() {
return this.workerSleepSchedule.is_active ? 'Enabled' : 'Disabled';
},
- hasClustersAssigned() {
- const clusterIDs = this.getAssignedClusterIDs();
- return clusterIDs && clusterIDs.length > 0;
- }
+ hasTagsAssigned() {
+ const tagIDs = this.getAssignedTagIDs();
+ return tagIDs && tagIDs.length > 0;
+ },
},
methods: {
fetchWorkerSleepSchedule() {
@@ -262,46 +264,48 @@ export default {
}
this.api.deleteWorker(this.workerData.id);
},
- updateThisWorkerClusters(newWorkerData) {
- if (!newWorkerData || !newWorkerData.clusters) {
- this.thisWorkerClusters = {};
+ updateThisWorkerTags(newWorkerData) {
+ if (!newWorkerData || !newWorkerData.tags) {
+ this.thisWorkerTags = {};
return;
}
- const assignedClusters = newWorkerData.clusters.reduce(
- (accu, cluster) => { accu[cluster.id] = true; return accu; },
- {});
- this.thisWorkerClusters = assignedClusters;
+ const assignedTags = newWorkerData.tags.reduce((accu, tag) => {
+ accu[tag.id] = true;
+ return accu;
+ }, {});
+ this.thisWorkerTags = assignedTags;
},
- toggleWorkerCluster(clusterID) {
- console.log("Toggled", clusterID);
- this.thisWorkerClusters[clusterID] = !this.thisWorkerClusters[clusterID];
- console.log("New assignment:", plain(this.thisWorkerClusters))
+ toggleWorkerTag(tagID) {
+ console.log("Toggled", tagID);
+ this.thisWorkerTags[tagID] = !this.thisWorkerTags[tagID];
+ console.log("New assignment:", plain(this.thisWorkerTags));
- // Construct cluster change request.
- const clusterIDs = this.getAssignedClusterIDs();
- const changeRequest = new WorkerClusterChangeRequest(clusterIDs);
+ // Construct tag change request.
+ const tagIDs = this.getAssignedTagIDs();
+ const changeRequest = new WorkerTagChangeRequest(tagIDs);
// Send to the Manager.
- this.api.setWorkerClusters(this.workerData.id, changeRequest)
+ this.api
+ .setWorkerTags(this.workerData.id, changeRequest)
.then(() => {
- this.notifs.add('Cluster assignment updated');
+ this.notifs.add("Tag assignment updated");
})
.catch((error) => {
const errorMsg = JSON.stringify(error); // TODO: handle API errors better.
this.notifs.add(`Error: ${errorMsg}`);
});
},
- getAssignedClusterIDs() {
- const clusterIDs = [];
- for (let clusterID in this.thisWorkerClusters) {
+ getAssignedTagIDs() {
+ const tagIDs = [];
+ for (let tagID in this.thisWorkerTags) {
// Values can exist and be set to 'false'.
- const isAssigned = this.thisWorkerClusters[clusterID];
- if (isAssigned) clusterIDs.push(clusterID);
+ const isAssigned = this.thisWorkerTags[tagID];
+ if (isAssigned) tagIDs.push(tagID);
}
- return clusterIDs;
- }
- }
+ return tagIDs;
+ },
+ },
};
@@ -377,11 +381,11 @@ export default {
white-space: nowrap;
}
-.worker-clusters ul {
+.worker-tags ul {
list-style: none;
}
-.worker-clusters ul li {
+.worker-tags ul li {
margin-bottom: 0.25rem;
}
diff --git a/web/app/src/manager-api/index.js b/web/app/src/manager-api/index.js
index b25813cc..a57163ba 100644
--- a/web/app/src/manager-api/index.js
+++ b/web/app/src/manager-api/index.js
@@ -73,9 +73,6 @@ import TaskUpdate from './model/TaskUpdate';
import TaskWorker from './model/TaskWorker';
import Worker from './model/Worker';
import WorkerAllOf from './model/WorkerAllOf';
-import WorkerCluster from './model/WorkerCluster';
-import WorkerClusterChangeRequest from './model/WorkerClusterChangeRequest';
-import WorkerClusterList from './model/WorkerClusterList';
import WorkerList from './model/WorkerList';
import WorkerRegistration from './model/WorkerRegistration';
import WorkerSignOn from './model/WorkerSignOn';
@@ -85,6 +82,9 @@ import WorkerStateChanged from './model/WorkerStateChanged';
import WorkerStatus from './model/WorkerStatus';
import WorkerStatusChangeRequest from './model/WorkerStatusChangeRequest';
import WorkerSummary from './model/WorkerSummary';
+import WorkerTag from './model/WorkerTag';
+import WorkerTagChangeRequest from './model/WorkerTagChangeRequest';
+import WorkerTagList from './model/WorkerTagList';
import WorkerTask from './model/WorkerTask';
import WorkerTaskAllOf from './model/WorkerTaskAllOf';
import JobsApi from './manager/JobsApi';
@@ -492,24 +492,6 @@ export {
*/
WorkerAllOf,
- /**
- * The WorkerCluster model constructor.
- * @property {module:model/WorkerCluster}
- */
- WorkerCluster,
-
- /**
- * The WorkerClusterChangeRequest model constructor.
- * @property {module:model/WorkerClusterChangeRequest}
- */
- WorkerClusterChangeRequest,
-
- /**
- * The WorkerClusterList model constructor.
- * @property {module:model/WorkerClusterList}
- */
- WorkerClusterList,
-
/**
* The WorkerList model constructor.
* @property {module:model/WorkerList}
@@ -564,6 +546,24 @@ export {
*/
WorkerSummary,
+ /**
+ * The WorkerTag model constructor.
+ * @property {module:model/WorkerTag}
+ */
+ WorkerTag,
+
+ /**
+ * The WorkerTagChangeRequest model constructor.
+ * @property {module:model/WorkerTagChangeRequest}
+ */
+ WorkerTagChangeRequest,
+
+ /**
+ * The WorkerTagList model constructor.
+ * @property {module:model/WorkerTagList}
+ */
+ WorkerTagList,
+
/**
* The WorkerTask model constructor.
* @property {module:model/WorkerTask}
diff --git a/web/app/src/manager-api/manager/WorkerMgtApi.js b/web/app/src/manager-api/manager/WorkerMgtApi.js
index b86e7e5c..1fcc2269 100644
--- a/web/app/src/manager-api/manager/WorkerMgtApi.js
+++ b/web/app/src/manager-api/manager/WorkerMgtApi.js
@@ -15,12 +15,12 @@
import ApiClient from "../ApiClient";
import Error from '../model/Error';
import Worker from '../model/Worker';
-import WorkerCluster from '../model/WorkerCluster';
-import WorkerClusterChangeRequest from '../model/WorkerClusterChangeRequest';
-import WorkerClusterList from '../model/WorkerClusterList';
import WorkerList from '../model/WorkerList';
import WorkerSleepSchedule from '../model/WorkerSleepSchedule';
import WorkerStatusChangeRequest from '../model/WorkerStatusChangeRequest';
+import WorkerTag from '../model/WorkerTag';
+import WorkerTagChangeRequest from '../model/WorkerTagChangeRequest';
+import WorkerTagList from '../model/WorkerTagList';
/**
* WorkerMgt service.
@@ -43,15 +43,15 @@ export default class WorkerMgtApi {
/**
- * Create a new worker cluster.
- * @param {module:model/WorkerCluster} workerCluster The worker cluster.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerCluster} and HTTP response
+ * Create a new worker tag.
+ * @param {module:model/WorkerTag} workerTag The worker tag.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerTag} and HTTP response
*/
- createWorkerClusterWithHttpInfo(workerCluster) {
- let postBody = workerCluster;
- // verify the required parameter 'workerCluster' is set
- if (workerCluster === undefined || workerCluster === null) {
- throw new Error("Missing the required parameter 'workerCluster' when calling createWorkerCluster");
+ createWorkerTagWithHttpInfo(workerTag) {
+ let postBody = workerTag;
+ // verify the required parameter 'workerTag' is set
+ if (workerTag === undefined || workerTag === null) {
+ throw new Error("Missing the required parameter 'workerTag' when calling createWorkerTag");
}
let pathParams = {
@@ -66,21 +66,21 @@ export default class WorkerMgtApi {
let authNames = [];
let contentTypes = ['application/json'];
let accepts = ['application/json'];
- let returnType = WorkerCluster;
+ let returnType = WorkerTag;
return this.apiClient.callApi(
- '/api/v3/worker-mgt/clusters', 'POST',
+ '/api/v3/worker-mgt/tags', 'POST',
pathParams, queryParams, headerParams, formParams, postBody,
authNames, contentTypes, accepts, returnType, null
);
}
/**
- * Create a new worker cluster.
- * @param {module:model/WorkerCluster} workerCluster The worker cluster.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerCluster}
+ * Create a new worker tag.
+ * @param {module:model/WorkerTag} workerTag The worker tag.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerTag}
*/
- createWorkerCluster(workerCluster) {
- return this.createWorkerClusterWithHttpInfo(workerCluster)
+ createWorkerTag(workerTag) {
+ return this.createWorkerTagWithHttpInfo(workerTag)
.then(function(response_and_data) {
return response_and_data.data;
});
@@ -134,19 +134,19 @@ export default class WorkerMgtApi {
/**
- * Remove this worker cluster. This unassigns all workers from the cluster and removes it.
- * @param {String} clusterId
+ * Remove this worker tag. This unassigns all workers from the tag and removes it.
+ * @param {String} tagId
* @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
*/
- deleteWorkerClusterWithHttpInfo(clusterId) {
+ deleteWorkerTagWithHttpInfo(tagId) {
let postBody = null;
- // verify the required parameter 'clusterId' is set
- if (clusterId === undefined || clusterId === null) {
- throw new Error("Missing the required parameter 'clusterId' when calling deleteWorkerCluster");
+ // verify the required parameter 'tagId' is set
+ if (tagId === undefined || tagId === null) {
+ throw new Error("Missing the required parameter 'tagId' when calling deleteWorkerTag");
}
let pathParams = {
- 'cluster_id': clusterId
+ 'tag_id': tagId
};
let queryParams = {
};
@@ -160,19 +160,19 @@ export default class WorkerMgtApi {
let accepts = ['application/json'];
let returnType = null;
return this.apiClient.callApi(
- '/api/v3/worker-mgt/cluster/{cluster_id}', 'DELETE',
+ '/api/v3/worker-mgt/tag/{tag_id}', 'DELETE',
pathParams, queryParams, headerParams, formParams, postBody,
authNames, contentTypes, accepts, returnType, null
);
}
/**
- * Remove this worker cluster. This unassigns all workers from the cluster and removes it.
- * @param {String} clusterId
+ * Remove this worker tag. This unassigns all workers from the tag and removes it.
+ * @param {String} tagId
* @return {Promise} a {@link https://www.promisejs.org/|Promise}
*/
- deleteWorkerCluster(clusterId) {
- return this.deleteWorkerClusterWithHttpInfo(clusterId)
+ deleteWorkerTag(tagId) {
+ return this.deleteWorkerTagWithHttpInfo(tagId)
.then(function(response_and_data) {
return response_and_data.data;
});
@@ -225,91 +225,6 @@ export default class WorkerMgtApi {
}
- /**
- * Get a single worker cluster.
- * @param {String} clusterId
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerCluster} and HTTP response
- */
- fetchWorkerClusterWithHttpInfo(clusterId) {
- let postBody = null;
- // verify the required parameter 'clusterId' is set
- if (clusterId === undefined || clusterId === null) {
- throw new Error("Missing the required parameter 'clusterId' when calling fetchWorkerCluster");
- }
-
- let pathParams = {
- 'cluster_id': clusterId
- };
- let queryParams = {
- };
- let headerParams = {
- };
- let formParams = {
- };
-
- let authNames = [];
- let contentTypes = [];
- let accepts = ['application/json'];
- let returnType = WorkerCluster;
- return this.apiClient.callApi(
- '/api/v3/worker-mgt/cluster/{cluster_id}', 'GET',
- pathParams, queryParams, headerParams, formParams, postBody,
- authNames, contentTypes, accepts, returnType, null
- );
- }
-
- /**
- * Get a single worker cluster.
- * @param {String} clusterId
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerCluster}
- */
- fetchWorkerCluster(clusterId) {
- return this.fetchWorkerClusterWithHttpInfo(clusterId)
- .then(function(response_and_data) {
- return response_and_data.data;
- });
- }
-
-
- /**
- * Get list of worker clusters.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerClusterList} and HTTP response
- */
- fetchWorkerClustersWithHttpInfo() {
- let postBody = null;
-
- let pathParams = {
- };
- let queryParams = {
- };
- let headerParams = {
- };
- let formParams = {
- };
-
- let authNames = [];
- let contentTypes = [];
- let accepts = ['application/json'];
- let returnType = WorkerClusterList;
- return this.apiClient.callApi(
- '/api/v3/worker-mgt/clusters', 'GET',
- pathParams, queryParams, headerParams, formParams, postBody,
- authNames, contentTypes, accepts, returnType, null
- );
- }
-
- /**
- * Get list of worker clusters.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerClusterList}
- */
- fetchWorkerClusters() {
- return this.fetchWorkerClustersWithHttpInfo()
- .then(function(response_and_data) {
- return response_and_data.data;
- });
- }
-
-
/**
* @param {String} workerId
* @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerSleepSchedule} and HTTP response
@@ -354,6 +269,91 @@ export default class WorkerMgtApi {
}
+ /**
+ * Get a single worker tag.
+ * @param {String} tagId
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerTag} and HTTP response
+ */
+ fetchWorkerTagWithHttpInfo(tagId) {
+ let postBody = null;
+ // verify the required parameter 'tagId' is set
+ if (tagId === undefined || tagId === null) {
+ throw new Error("Missing the required parameter 'tagId' when calling fetchWorkerTag");
+ }
+
+ let pathParams = {
+ 'tag_id': tagId
+ };
+ let queryParams = {
+ };
+ let headerParams = {
+ };
+ let formParams = {
+ };
+
+ let authNames = [];
+ let contentTypes = [];
+ let accepts = ['application/json'];
+ let returnType = WorkerTag;
+ return this.apiClient.callApi(
+ '/api/v3/worker-mgt/tag/{tag_id}', 'GET',
+ pathParams, queryParams, headerParams, formParams, postBody,
+ authNames, contentTypes, accepts, returnType, null
+ );
+ }
+
+ /**
+ * Get a single worker tag.
+ * @param {String} tagId
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerTag}
+ */
+ fetchWorkerTag(tagId) {
+ return this.fetchWorkerTagWithHttpInfo(tagId)
+ .then(function(response_and_data) {
+ return response_and_data.data;
+ });
+ }
+
+
+ /**
+ * Get list of worker tags.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerTagList} and HTTP response
+ */
+ fetchWorkerTagsWithHttpInfo() {
+ let postBody = null;
+
+ let pathParams = {
+ };
+ let queryParams = {
+ };
+ let headerParams = {
+ };
+ let formParams = {
+ };
+
+ let authNames = [];
+ let contentTypes = [];
+ let accepts = ['application/json'];
+ let returnType = WorkerTagList;
+ return this.apiClient.callApi(
+ '/api/v3/worker-mgt/tags', 'GET',
+ pathParams, queryParams, headerParams, formParams, postBody,
+ authNames, contentTypes, accepts, returnType, null
+ );
+ }
+
+ /**
+ * Get list of worker tags.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with data of type {@link module:model/WorkerTagList}
+ */
+ fetchWorkerTags() {
+ return this.fetchWorkerTagsWithHttpInfo()
+ .then(function(response_and_data) {
+ return response_and_data.data;
+ });
+ }
+
+
/**
* Get list of workers.
* @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing data of type {@link module:model/WorkerList} and HTTP response
@@ -443,56 +443,6 @@ export default class WorkerMgtApi {
}
- /**
- * @param {String} workerId
- * @param {module:model/WorkerClusterChangeRequest} workerClusterChangeRequest The list of cluster IDs this worker should be a member of.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
- */
- setWorkerClustersWithHttpInfo(workerId, workerClusterChangeRequest) {
- let postBody = workerClusterChangeRequest;
- // verify the required parameter 'workerId' is set
- if (workerId === undefined || workerId === null) {
- throw new Error("Missing the required parameter 'workerId' when calling setWorkerClusters");
- }
- // verify the required parameter 'workerClusterChangeRequest' is set
- if (workerClusterChangeRequest === undefined || workerClusterChangeRequest === null) {
- throw new Error("Missing the required parameter 'workerClusterChangeRequest' when calling setWorkerClusters");
- }
-
- let pathParams = {
- 'worker_id': workerId
- };
- let queryParams = {
- };
- let headerParams = {
- };
- let formParams = {
- };
-
- let authNames = [];
- let contentTypes = ['application/json'];
- let accepts = ['application/json'];
- let returnType = null;
- return this.apiClient.callApi(
- '/api/v3/worker-mgt/workers/{worker_id}/setclusters', 'POST',
- pathParams, queryParams, headerParams, formParams, postBody,
- authNames, contentTypes, accepts, returnType, null
- );
- }
-
- /**
- * @param {String} workerId
- * @param {module:model/WorkerClusterChangeRequest} workerClusterChangeRequest The list of cluster IDs this worker should be a member of.
- * @return {Promise} a {@link https://www.promisejs.org/|Promise}
- */
- setWorkerClusters(workerId, workerClusterChangeRequest) {
- return this.setWorkerClustersWithHttpInfo(workerId, workerClusterChangeRequest)
- .then(function(response_and_data) {
- return response_and_data.data;
- });
- }
-
-
/**
* @param {String} workerId
* @param {module:model/WorkerSleepSchedule} workerSleepSchedule The new sleep schedule.
@@ -544,24 +494,23 @@ export default class WorkerMgtApi {
/**
- * Update an existing worker cluster.
- * @param {String} clusterId
- * @param {module:model/WorkerCluster} workerCluster The updated worker cluster.
+ * @param {String} workerId
+ * @param {module:model/WorkerTagChangeRequest} workerTagChangeRequest The list of worker tag IDs this worker should be a member of.
* @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
*/
- updateWorkerClusterWithHttpInfo(clusterId, workerCluster) {
- let postBody = workerCluster;
- // verify the required parameter 'clusterId' is set
- if (clusterId === undefined || clusterId === null) {
- throw new Error("Missing the required parameter 'clusterId' when calling updateWorkerCluster");
+ setWorkerTagsWithHttpInfo(workerId, workerTagChangeRequest) {
+ let postBody = workerTagChangeRequest;
+ // verify the required parameter 'workerId' is set
+ if (workerId === undefined || workerId === null) {
+ throw new Error("Missing the required parameter 'workerId' when calling setWorkerTags");
}
- // verify the required parameter 'workerCluster' is set
- if (workerCluster === undefined || workerCluster === null) {
- throw new Error("Missing the required parameter 'workerCluster' when calling updateWorkerCluster");
+ // verify the required parameter 'workerTagChangeRequest' is set
+ if (workerTagChangeRequest === undefined || workerTagChangeRequest === null) {
+ throw new Error("Missing the required parameter 'workerTagChangeRequest' when calling setWorkerTags");
}
let pathParams = {
- 'cluster_id': clusterId
+ 'worker_id': workerId
};
let queryParams = {
};
@@ -575,20 +524,71 @@ export default class WorkerMgtApi {
let accepts = ['application/json'];
let returnType = null;
return this.apiClient.callApi(
- '/api/v3/worker-mgt/cluster/{cluster_id}', 'PUT',
+ '/api/v3/worker-mgt/workers/{worker_id}/settags', 'POST',
pathParams, queryParams, headerParams, formParams, postBody,
authNames, contentTypes, accepts, returnType, null
);
}
/**
- * Update an existing worker cluster.
- * @param {String} clusterId
- * @param {module:model/WorkerCluster} workerCluster The updated worker cluster.
+ * @param {String} workerId
+ * @param {module:model/WorkerTagChangeRequest} workerTagChangeRequest The list of worker tag IDs this worker should be a member of.
* @return {Promise} a {@link https://www.promisejs.org/|Promise}
*/
- updateWorkerCluster(clusterId, workerCluster) {
- return this.updateWorkerClusterWithHttpInfo(clusterId, workerCluster)
+ setWorkerTags(workerId, workerTagChangeRequest) {
+ return this.setWorkerTagsWithHttpInfo(workerId, workerTagChangeRequest)
+ .then(function(response_and_data) {
+ return response_and_data.data;
+ });
+ }
+
+
+ /**
+ * Update an existing worker tag.
+ * @param {String} tagId
+ * @param {module:model/WorkerTag} workerTag The updated worker tag.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}, with an object containing HTTP response
+ */
+ updateWorkerTagWithHttpInfo(tagId, workerTag) {
+ let postBody = workerTag;
+ // verify the required parameter 'tagId' is set
+ if (tagId === undefined || tagId === null) {
+ throw new Error("Missing the required parameter 'tagId' when calling updateWorkerTag");
+ }
+ // verify the required parameter 'workerTag' is set
+ if (workerTag === undefined || workerTag === null) {
+ throw new Error("Missing the required parameter 'workerTag' when calling updateWorkerTag");
+ }
+
+ let pathParams = {
+ 'tag_id': tagId
+ };
+ let queryParams = {
+ };
+ let headerParams = {
+ };
+ let formParams = {
+ };
+
+ let authNames = [];
+ let contentTypes = ['application/json'];
+ let accepts = ['application/json'];
+ let returnType = null;
+ return this.apiClient.callApi(
+ '/api/v3/worker-mgt/tag/{tag_id}', 'PUT',
+ pathParams, queryParams, headerParams, formParams, postBody,
+ authNames, contentTypes, accepts, returnType, null
+ );
+ }
+
+ /**
+ * Update an existing worker tag.
+ * @param {String} tagId
+ * @param {module:model/WorkerTag} workerTag The updated worker tag.
+ * @return {Promise} a {@link https://www.promisejs.org/|Promise}
+ */
+ updateWorkerTag(tagId, workerTag) {
+ return this.updateWorkerTagWithHttpInfo(tagId, workerTag)
.then(function(response_and_data) {
return response_and_data.data;
});
diff --git a/web/app/src/manager-api/model/Job.js b/web/app/src/manager-api/model/Job.js
index 4a78ac8c..a5bab8d8 100644
--- a/web/app/src/manager-api/model/Job.js
+++ b/web/app/src/manager-api/model/Job.js
@@ -97,8 +97,8 @@ class Job {
if (data.hasOwnProperty('storage')) {
obj['storage'] = JobStorageInfo.constructFromObject(data['storage']);
}
- if (data.hasOwnProperty('worker_cluster')) {
- obj['worker_cluster'] = ApiClient.convertToType(data['worker_cluster'], 'String');
+ if (data.hasOwnProperty('worker_tag')) {
+ obj['worker_tag'] = ApiClient.convertToType(data['worker_tag'], 'String');
}
if (data.hasOwnProperty('id')) {
obj['id'] = ApiClient.convertToType(data['id'], 'String');
@@ -170,10 +170,10 @@ Job.prototype['submitter_platform'] = undefined;
Job.prototype['storage'] = undefined;
/**
- * Worker Cluster that should execute this job. When a cluster ID is given, only Workers in that cluster will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
- * @member {String} worker_cluster
+ * Worker tag that should execute this job. When a tag ID is given, only Workers in that tag will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
+ * @member {String} worker_tag
*/
-Job.prototype['worker_cluster'] = undefined;
+Job.prototype['worker_tag'] = undefined;
/**
* UUID of the Job
@@ -249,10 +249,10 @@ SubmittedJob.prototype['submitter_platform'] = undefined;
*/
SubmittedJob.prototype['storage'] = undefined;
/**
- * Worker Cluster that should execute this job. When a cluster ID is given, only Workers in that cluster will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
- * @member {String} worker_cluster
+ * Worker tag that should execute this job. When a tag ID is given, only Workers in that tag will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
+ * @member {String} worker_tag
*/
-SubmittedJob.prototype['worker_cluster'] = undefined;
+SubmittedJob.prototype['worker_tag'] = undefined;
// Implement JobAllOf interface:
/**
* UUID of the Job
diff --git a/web/app/src/manager-api/model/SubmittedJob.js b/web/app/src/manager-api/model/SubmittedJob.js
index cd3fd382..fb0d29ed 100644
--- a/web/app/src/manager-api/model/SubmittedJob.js
+++ b/web/app/src/manager-api/model/SubmittedJob.js
@@ -81,8 +81,8 @@ class SubmittedJob {
if (data.hasOwnProperty('storage')) {
obj['storage'] = JobStorageInfo.constructFromObject(data['storage']);
}
- if (data.hasOwnProperty('worker_cluster')) {
- obj['worker_cluster'] = ApiClient.convertToType(data['worker_cluster'], 'String');
+ if (data.hasOwnProperty('worker_tag')) {
+ obj['worker_tag'] = ApiClient.convertToType(data['worker_tag'], 'String');
}
}
return obj;
@@ -136,10 +136,10 @@ SubmittedJob.prototype['submitter_platform'] = undefined;
SubmittedJob.prototype['storage'] = undefined;
/**
- * Worker Cluster that should execute this job. When a cluster ID is given, only Workers in that cluster will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
- * @member {String} worker_cluster
+ * Worker tag that should execute this job. When a tag ID is given, only Workers in that tag will be scheduled to work on it. If empty or ommitted, all workers can work on this job.
+ * @member {String} worker_tag
*/
-SubmittedJob.prototype['worker_cluster'] = undefined;
+SubmittedJob.prototype['worker_tag'] = undefined;
diff --git a/web/app/src/manager-api/model/Worker.js b/web/app/src/manager-api/model/Worker.js
index 42cf3584..4c98c19d 100644
--- a/web/app/src/manager-api/model/Worker.js
+++ b/web/app/src/manager-api/model/Worker.js
@@ -13,10 +13,10 @@
import ApiClient from '../ApiClient';
import WorkerAllOf from './WorkerAllOf';
-import WorkerCluster from './WorkerCluster';
import WorkerStatus from './WorkerStatus';
import WorkerStatusChangeRequest from './WorkerStatusChangeRequest';
import WorkerSummary from './WorkerSummary';
+import WorkerTag from './WorkerTag';
import WorkerTask from './WorkerTask';
/**
@@ -102,8 +102,8 @@ class Worker {
if (data.hasOwnProperty('task')) {
obj['task'] = WorkerTask.constructFromObject(data['task']);
}
- if (data.hasOwnProperty('clusters')) {
- obj['clusters'] = ApiClient.convertToType(data['clusters'], [WorkerCluster]);
+ if (data.hasOwnProperty('tags')) {
+ obj['tags'] = ApiClient.convertToType(data['tags'], [WorkerTag]);
}
}
return obj;
@@ -167,10 +167,10 @@ Worker.prototype['supported_task_types'] = undefined;
Worker.prototype['task'] = undefined;
/**
- * Clusters of which this Worker is a member.
- * @member {Array.} clusters
+ * Tags of which this Worker is a member.
+ * @member {Array.} tags
*/
-Worker.prototype['clusters'] = undefined;
+Worker.prototype['tags'] = undefined;
// Implement WorkerSummary interface:
@@ -220,10 +220,10 @@ WorkerAllOf.prototype['supported_task_types'] = undefined;
*/
WorkerAllOf.prototype['task'] = undefined;
/**
- * Clusters of which this Worker is a member.
- * @member {Array.} clusters
+ * Tags of which this Worker is a member.
+ * @member {Array.} tags
*/
-WorkerAllOf.prototype['clusters'] = undefined;
+WorkerAllOf.prototype['tags'] = undefined;
diff --git a/web/app/src/manager-api/model/WorkerAllOf.js b/web/app/src/manager-api/model/WorkerAllOf.js
index 937c5941..414f2756 100644
--- a/web/app/src/manager-api/model/WorkerAllOf.js
+++ b/web/app/src/manager-api/model/WorkerAllOf.js
@@ -12,7 +12,7 @@
*/
import ApiClient from '../ApiClient';
-import WorkerCluster from './WorkerCluster';
+import WorkerTag from './WorkerTag';
import WorkerTask from './WorkerTask';
/**
@@ -67,8 +67,8 @@ class WorkerAllOf {
if (data.hasOwnProperty('task')) {
obj['task'] = WorkerTask.constructFromObject(data['task']);
}
- if (data.hasOwnProperty('clusters')) {
- obj['clusters'] = ApiClient.convertToType(data['clusters'], [WorkerCluster]);
+ if (data.hasOwnProperty('tags')) {
+ obj['tags'] = ApiClient.convertToType(data['tags'], [WorkerTag]);
}
}
return obj;
@@ -100,10 +100,10 @@ WorkerAllOf.prototype['supported_task_types'] = undefined;
WorkerAllOf.prototype['task'] = undefined;
/**
- * Clusters of which this Worker is a member.
- * @member {Array.} clusters
+ * Tags of which this Worker is a member.
+ * @member {Array.} tags
*/
-WorkerAllOf.prototype['clusters'] = undefined;
+WorkerAllOf.prototype['tags'] = undefined;
diff --git a/web/app/src/manager-api/model/WorkerClusterChangeRequest.js b/web/app/src/manager-api/model/WorkerClusterChangeRequest.js
deleted file mode 100644
index 9985027f..00000000
--- a/web/app/src/manager-api/model/WorkerClusterChangeRequest.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/**
- * Flamenco manager
- * Render Farm manager API
- *
- * The version of the OpenAPI document: 1.0.0
- *
- *
- * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
- * https://openapi-generator.tech
- * Do not edit the class manually.
- *
- */
-
-import ApiClient from '../ApiClient';
-
-/**
- * The WorkerClusterChangeRequest model module.
- * @module model/WorkerClusterChangeRequest
- * @version 0.0.0
- */
-class WorkerClusterChangeRequest {
- /**
- * Constructs a new WorkerClusterChangeRequest.
- * Request to change which clusters this Worker is assigned to.
- * @alias module:model/WorkerClusterChangeRequest
- * @param clusterIds {Array.}
- */
- constructor(clusterIds) {
-
- WorkerClusterChangeRequest.initialize(this, clusterIds);
- }
-
- /**
- * Initializes the fields of this object.
- * 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, clusterIds) {
- obj['cluster_ids'] = clusterIds;
- }
-
- /**
- * Constructs a WorkerClusterChangeRequest from a plain JavaScript object, optionally creating a new instance.
- * Copies all relevant properties from data to obj if supplied or a new instance if not.
- * @param {Object} data The plain JavaScript object bearing properties of interest.
- * @param {module:model/WorkerClusterChangeRequest} obj Optional instance to populate.
- * @return {module:model/WorkerClusterChangeRequest} The populated WorkerClusterChangeRequest instance.
- */
- static constructFromObject(data, obj) {
- if (data) {
- obj = obj || new WorkerClusterChangeRequest();
-
- if (data.hasOwnProperty('cluster_ids')) {
- obj['cluster_ids'] = ApiClient.convertToType(data['cluster_ids'], ['String']);
- }
- }
- return obj;
- }
-
-
-}
-
-/**
- * @member {Array.} cluster_ids
- */
-WorkerClusterChangeRequest.prototype['cluster_ids'] = undefined;
-
-
-
-
-
-
-export default WorkerClusterChangeRequest;
-
diff --git a/web/app/src/manager-api/model/WorkerCluster.js b/web/app/src/manager-api/model/WorkerTag.js
similarity index 61%
rename from web/app/src/manager-api/model/WorkerCluster.js
rename to web/app/src/manager-api/model/WorkerTag.js
index f01ebb46..fd457d98 100644
--- a/web/app/src/manager-api/model/WorkerCluster.js
+++ b/web/app/src/manager-api/model/WorkerTag.js
@@ -14,20 +14,20 @@
import ApiClient from '../ApiClient';
/**
- * The WorkerCluster model module.
- * @module model/WorkerCluster
+ * The WorkerTag model module.
+ * @module model/WorkerTag
* @version 0.0.0
*/
-class WorkerCluster {
+class WorkerTag {
/**
- * Constructs a new WorkerCluster.
- * Cluster of workers. A job can optionally specify which cluster it should be limited to. Workers can be part of multiple clusters simultaneously.
- * @alias module:model/WorkerCluster
+ * Constructs a new WorkerTag.
+ * Tag of workers. A job can optionally specify which tag it should be limited to. Workers can be part of multiple tags simultaneously.
+ * @alias module:model/WorkerTag
* @param name {String}
*/
constructor(name) {
- WorkerCluster.initialize(this, name);
+ WorkerTag.initialize(this, name);
}
/**
@@ -40,15 +40,15 @@ class WorkerCluster {
}
/**
- * Constructs a WorkerCluster from a plain JavaScript object, optionally creating a new instance.
+ * Constructs a WorkerTag from a plain JavaScript object, optionally creating a new instance.
* Copies all relevant properties from data to obj if supplied or a new instance if not.
* @param {Object} data The plain JavaScript object bearing properties of interest.
- * @param {module:model/WorkerCluster} obj Optional instance to populate.
- * @return {module:model/WorkerCluster} The populated WorkerCluster instance.
+ * @param {module:model/WorkerTag} obj Optional instance to populate.
+ * @return {module:model/WorkerTag} The populated WorkerTag instance.
*/
static constructFromObject(data, obj) {
if (data) {
- obj = obj || new WorkerCluster();
+ obj = obj || new WorkerTag();
if (data.hasOwnProperty('id')) {
obj['id'] = ApiClient.convertToType(data['id'], 'String');
@@ -67,25 +67,25 @@ class WorkerCluster {
}
/**
- * UUID of the cluster. Can be ommitted when creating a new cluster, in which case a random UUID will be assigned.
+ * UUID of the tag. Can be ommitted when creating a new tag, in which case a random UUID will be assigned.
* @member {String} id
*/
-WorkerCluster.prototype['id'] = undefined;
+WorkerTag.prototype['id'] = undefined;
/**
* @member {String} name
*/
-WorkerCluster.prototype['name'] = undefined;
+WorkerTag.prototype['name'] = undefined;
/**
* @member {String} description
*/
-WorkerCluster.prototype['description'] = undefined;
+WorkerTag.prototype['description'] = undefined;
-export default WorkerCluster;
+export default WorkerTag;
diff --git a/web/app/src/manager-api/model/WorkerTagChangeRequest.js b/web/app/src/manager-api/model/WorkerTagChangeRequest.js
new file mode 100644
index 00000000..c44cc6e4
--- /dev/null
+++ b/web/app/src/manager-api/model/WorkerTagChangeRequest.js
@@ -0,0 +1,74 @@
+/**
+ * Flamenco manager
+ * Render Farm manager API
+ *
+ * The version of the OpenAPI document: 1.0.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ *
+ */
+
+import ApiClient from '../ApiClient';
+
+/**
+ * The WorkerTagChangeRequest model module.
+ * @module model/WorkerTagChangeRequest
+ * @version 0.0.0
+ */
+class WorkerTagChangeRequest {
+ /**
+ * Constructs a new WorkerTagChangeRequest.
+ * Request to change which tags this Worker is assigned to.
+ * @alias module:model/WorkerTagChangeRequest
+ * @param tagIds {Array.}
+ */
+ constructor(tagIds) {
+
+ WorkerTagChangeRequest.initialize(this, tagIds);
+ }
+
+ /**
+ * Initializes the fields of this object.
+ * 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, tagIds) {
+ obj['tag_ids'] = tagIds;
+ }
+
+ /**
+ * Constructs a WorkerTagChangeRequest from a plain JavaScript object, optionally creating a new instance.
+ * Copies all relevant properties from data to obj if supplied or a new instance if not.
+ * @param {Object} data The plain JavaScript object bearing properties of interest.
+ * @param {module:model/WorkerTagChangeRequest} obj Optional instance to populate.
+ * @return {module:model/WorkerTagChangeRequest} The populated WorkerTagChangeRequest instance.
+ */
+ static constructFromObject(data, obj) {
+ if (data) {
+ obj = obj || new WorkerTagChangeRequest();
+
+ if (data.hasOwnProperty('tag_ids')) {
+ obj['tag_ids'] = ApiClient.convertToType(data['tag_ids'], ['String']);
+ }
+ }
+ return obj;
+ }
+
+
+}
+
+/**
+ * @member {Array.} tag_ids
+ */
+WorkerTagChangeRequest.prototype['tag_ids'] = undefined;
+
+
+
+
+
+
+export default WorkerTagChangeRequest;
+
diff --git a/web/app/src/manager-api/model/WorkerClusterList.js b/web/app/src/manager-api/model/WorkerTagList.js
similarity index 51%
rename from web/app/src/manager-api/model/WorkerClusterList.js
rename to web/app/src/manager-api/model/WorkerTagList.js
index 174eef29..d731c1e3 100644
--- a/web/app/src/manager-api/model/WorkerClusterList.js
+++ b/web/app/src/manager-api/model/WorkerTagList.js
@@ -12,21 +12,21 @@
*/
import ApiClient from '../ApiClient';
-import WorkerCluster from './WorkerCluster';
+import WorkerTag from './WorkerTag';
/**
- * The WorkerClusterList model module.
- * @module model/WorkerClusterList
+ * The WorkerTagList model module.
+ * @module model/WorkerTagList
* @version 0.0.0
*/
-class WorkerClusterList {
+class WorkerTagList {
/**
- * Constructs a new WorkerClusterList.
- * @alias module:model/WorkerClusterList
+ * Constructs a new WorkerTagList.
+ * @alias module:model/WorkerTagList
*/
constructor() {
- WorkerClusterList.initialize(this);
+ WorkerTagList.initialize(this);
}
/**
@@ -38,18 +38,18 @@ class WorkerClusterList {
}
/**
- * Constructs a WorkerClusterList from a plain JavaScript object, optionally creating a new instance.
+ * Constructs a WorkerTagList from a plain JavaScript object, optionally creating a new instance.
* Copies all relevant properties from data to obj if supplied or a new instance if not.
* @param {Object} data The plain JavaScript object bearing properties of interest.
- * @param {module:model/WorkerClusterList} obj Optional instance to populate.
- * @return {module:model/WorkerClusterList} The populated WorkerClusterList instance.
+ * @param {module:model/WorkerTagList} obj Optional instance to populate.
+ * @return {module:model/WorkerTagList} The populated WorkerTagList instance.
*/
static constructFromObject(data, obj) {
if (data) {
- obj = obj || new WorkerClusterList();
+ obj = obj || new WorkerTagList();
- if (data.hasOwnProperty('clusters')) {
- obj['clusters'] = ApiClient.convertToType(data['clusters'], [WorkerCluster]);
+ if (data.hasOwnProperty('tags')) {
+ obj['tags'] = ApiClient.convertToType(data['tags'], [WorkerTag]);
}
}
return obj;
@@ -59,14 +59,14 @@ class WorkerClusterList {
}
/**
- * @member {Array.} clusters
+ * @member {Array.} tags
*/
-WorkerClusterList.prototype['clusters'] = undefined;
+WorkerTagList.prototype['tags'] = undefined;
-export default WorkerClusterList;
+export default WorkerTagList;
diff --git a/web/app/src/stores/workers.js b/web/app/src/stores/workers.js
index 5e3e82d0..cc64bda8 100644
--- a/web/app/src/stores/workers.js
+++ b/web/app/src/stores/workers.js
@@ -15,16 +15,16 @@ export const useWorkers = defineStore('workers', {
*/
activeWorkerID: "",
- /** @type {API.WorkerCluster[]} */
- clusters: [],
+ /** @type {API.WorkerTag[]} */
+ tags: [],
- /* Mapping from cluster UUID to API.WorkerCluster. */
- clustersByID: {},
+ /* Mapping from tag UUID to API.WorkerTag. */
+ tagsByID: {},
}),
actions: {
setActiveWorkerID(workerID) {
this.$patch({
- activeWorker: {id: workerID, settings: {}, metadata: {}},
+ activeWorker: { id: workerID, settings: {}, metadata: {} },
activeWorkerID: workerID,
});
},
@@ -47,22 +47,21 @@ export const useWorkers = defineStore('workers', {
});
},
/**
- * Fetch the available worker clusters from the Manager.
+ * Fetch the available worker tags from the Manager.
*
* @returns a promise.
*/
- refreshClusters() {
+ refreshTags() {
const api = new WorkerMgtApi(getAPIClient());
- return api.fetchWorkerClusters()
- .then((resp) => {
- this.clusters = resp.clusters;
+ return api.fetchWorkerTags().then((resp) => {
+ this.tags = resp.tags;
- let clustersByID = {};
- for (let cluster of this.clusters) {
- clustersByID[cluster.id] = cluster;
- }
- this.clustersByID = clustersByID;
- })
+ let tagsByID = {};
+ for (let tag of this.tags) {
+ tagsByID[tag.id] = tag;
+ }
+ this.tagsByID = tagsByID;
+ });
},
},
-})
+});