From 8833c2a7c1feec0669cc27fcfdd844ff911f1d53 Mon Sep 17 00:00:00 2001 From: Greg Denton Date: Tue, 5 Feb 2019 16:41:18 -0800 Subject: [PATCH] switching service dialog update to use service wrapper and allowing cuesubmit to use the set service. (#189) --- cuegui/cuegui/ServiceDialog.py | 21 +++++++++++---------- cuesubmit/cuesubmit/Submission.py | 2 ++ 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/cuegui/cuegui/ServiceDialog.py b/cuegui/cuegui/ServiceDialog.py index 3212bd4b1..e74f47c7c 100644 --- a/cuegui/cuegui/ServiceDialog.py +++ b/cuegui/cuegui/ServiceDialog.py @@ -136,15 +136,16 @@ def save(self): QtWidgets.QMessageBox.critical(self, "Error", "The service name must alphanumeric.") return - data = opencue.api.service_pb2.Service() - data.name = str(self.name.text()) - data.threadable = self.threadable.isChecked() - data.min_cores = self.min_cores.value() - data.max_cores = self.max_cores.value() - data.min_memory = self.min_memory.value() * 1024 - data.min_gpu = self.min_gpu.value() * 1024 - - data.tags.extend(self._tags_w.get_tags()) + data = opencue.wrappers.service.Service() + data.data.id = self.__service.id + data.setName(str(self.name.text())) + data.setThreadable(self.threadable.isChecked()) + data.setMinCores(self.min_cores.value()) + data.setMaxCores(self.max_cores.value()) + data.setMinMemory(self.min_memory.value() * 1024) + data.setMinGpu(self.min_gpu.value() * 1024) + data.setTags(self._tags_w.get_tags()) + self.saved.emit(data) @@ -221,7 +222,7 @@ def saved(self, data): else: opencue.api.createService(data) else: - self.__selected.update(data) + data.update() self.refresh() self.__new_service = False diff --git a/cuesubmit/cuesubmit/Submission.py b/cuesubmit/cuesubmit/Submission.py index 554e23532..0c0d2f3db 100644 --- a/cuesubmit/cuesubmit/Submission.py +++ b/cuesubmit/cuesubmit/Submission.py @@ -57,6 +57,8 @@ def buildLayer(layerData, command): """ layer = Shell(layerData.name, command=command.split(), chunk=layerData.chunk, threads=float(layerData.cores), range=str(layerData.layerRange)) + if layerData.services: + layer.set_service(layerData.services[0]) if layerData.dependType and layerData.dependsOn: if layerData.dependType == 'Layer': layer.depend_all(layerData.dependsOn)