diff --git a/src/python/dm/common/utility/linuxUtility.py b/src/python/dm/common/utility/linuxUtility.py index b76ecab30e75c4e25b448154aa6ee0157edba2f4..5eab107e78f52c978f54653eaa3cdb700c20e8b4 100755 --- a/src/python/dm/common/utility/linuxUtility.py +++ b/src/python/dm/common/utility/linuxUtility.py @@ -50,7 +50,7 @@ class LinuxUtility: def setGroupUsers(cls, groupName, usernameList): """ Set list of users for a given group. """ logger = cls.getLogger() - logger.debug('Setting group %s users to: %s' % (groupName, username)) + logger.debug('Setting group %s users to: %s' % (groupName, usernameList)) cmd = '%s -M "%s" %s' % (cls.GPASSWD_CMD, ','.join(usernameList), groupName) cls.executeSudoCommand(cmd) diff --git a/src/python/dm/ds_web_service/api/experimentRestApi.py b/src/python/dm/ds_web_service/api/experimentRestApi.py index 155a679e8d1b7c96789a2a1b8545e42dd2f1ce6e..e27fe46af138ed80cd6a1a439c5624dcbe2b9f71 100755 --- a/src/python/dm/ds_web_service/api/experimentRestApi.py +++ b/src/python/dm/ds_web_service/api/experimentRestApi.py @@ -51,6 +51,15 @@ class ExperimentRestApi(DsRestApi): responseDict = self.sendSessionRequest(url=url, method='PUT') return Experiment(responseDict) + @DsRestApi.execute + def updateExperiment(self, name): + url = '%s/experiments/update' % (self.getContextRoot()) + if name is None or not len(name): + raise InvalidRequest('Experiment name must be provided.') + url += '?name=%s' % Encoder.encode(name) + responseDict = self.sendSessionRequest(url=url, method='PUT') + return Experiment(responseDict) + @DsRestApi.execute def stopExperiment(self, name): url = '%s/experiments/stop' % (self.getContextRoot()) diff --git a/src/python/dm/ds_web_service/cli/updateExperimentCli.py b/src/python/dm/ds_web_service/cli/updateExperimentCli.py new file mode 100755 index 0000000000000000000000000000000000000000..e162d69fb1a9f913e84385053bc1fb9721efb7e8 --- /dev/null +++ b/src/python/dm/ds_web_service/cli/updateExperimentCli.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +from dm.ds_web_service.api.experimentRestApi import ExperimentRestApi +from dm.common.exceptions.invalidRequest import InvalidRequest +from dsWebServiceSessionCli import DsWebServiceSessionCli + +class UpdateExperimentCli(DsWebServiceSessionCli): + def __init__(self): + DsWebServiceSessionCli.__init__(self) + self.addOption('', '--experiment', dest='experimentName', help='Experiment name.') + + def checkArgs(self): + if self.options.experimentName is None: + raise InvalidRequest('Experiment name must be provided.') + + def getExperimentName(self): + return self.options.experimentName + + def runCommand(self): + self.parseArgs(usage=""" + dm-update-experiment --experiment=EXPERIMENTNAME + +Description: + Updates experiment group users. + """) + self.checkArgs() + api = ExperimentRestApi(self.getLoginUsername(), self.getLoginPassword(), self.getServiceHost(), self.getServicePort(), self.getServiceProtocol()) + experiment = api.updateExperiment(self.getExperimentName()) + print experiment.getDisplayString(self.getDisplayKeys(), self.getDisplayFormat()) + +####################################################################### +# Run command. +if __name__ == '__main__': + cli = UpdateExperimentCli() + cli.run() + diff --git a/src/python/dm/ds_web_service/service/experimentRouteDescriptor.py b/src/python/dm/ds_web_service/service/experimentRouteDescriptor.py index 18a27d81e52618f7e4baeec654d72baed0f47110..b599c4a6db76533d8da394eab3d96dd371e798c4 100755 --- a/src/python/dm/ds_web_service/service/experimentRouteDescriptor.py +++ b/src/python/dm/ds_web_service/service/experimentRouteDescriptor.py @@ -73,6 +73,15 @@ class ExperimentRouteDescriptor: 'method' : ['PUT'] }, + # Update experiment + { + 'name' : 'updateExperiment', + 'path' : '%s/experiments/update' % contextRoot, + 'controller' : experimentSessionController, + 'action' : 'updateExperiment', + 'method' : ['PUT'] + }, + # Stop experiment { 'name' : 'stopExperiment', diff --git a/src/python/dm/ds_web_service/service/experimentSessionController.py b/src/python/dm/ds_web_service/service/experimentSessionController.py index a1d664ab53dac1c8fe31d83f7c384b3bf645c3b6..5192b3f7dda0444f22e1de0301270a11444f9491 100755 --- a/src/python/dm/ds_web_service/service/experimentSessionController.py +++ b/src/python/dm/ds_web_service/service/experimentSessionController.py @@ -79,6 +79,18 @@ class ExperimentSessionController(DmSessionController): self.logger.debug('Returning: %s' % response) return response + @cherrypy.expose + @DmSessionController.require(DmSessionController.isAdministrator()) + @DmSessionController.execute + def updateExperiment(self, **kwargs): + name = kwargs.get('name') + if name is None or not len(name): + raise InvalidRequest('Missing experiment name.') + name = Encoder.decode(name) + response = self.experimentSessionControllerImpl.updateExperiment(name).getFullJsonRep() + self.logger.debug('Returning: %s' % response) + return response + @cherrypy.expose @DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.execute diff --git a/src/python/dm/ds_web_service/service/impl/experimentManager.py b/src/python/dm/ds_web_service/service/impl/experimentManager.py index 1649e744ee3cab5542ee47cb4988879ea7bb97c3..55ada3808e3fbb2b979a95c3e0c2ee2e9b2da46e 100755 --- a/src/python/dm/ds_web_service/service/impl/experimentManager.py +++ b/src/python/dm/ds_web_service/service/impl/experimentManager.py @@ -97,9 +97,15 @@ class ExperimentManager(Singleton): # Add users to group experimentUsers = experiment.get('experimentUsernameList', []) self.logger.debug('Found experiment users: %s', experimentUsers) - for username in experimentUsers: - self.platformUtility.addUserToGroup(username, experimentName) + self.platformUtility.setGroupUsers(experimentName, experimentUsers) + #for username in experimentUsers: + # self.platformUtility.addUserToGroup(username, experimentName) + def updateExperimentGroupUsers(self, experiment): + experimentName = experiment.get('name') + experimentUsers = experiment.get('experimentUsernameList', []) + self.platformUtility.setGroupUsers(experimentName, experimentUsers) + @ThreadingUtility.synchronize def createExperimentDataDirectory(self, experiment): experimentName = experiment.get('name') diff --git a/src/python/dm/ds_web_service/service/impl/experimentSessionControllerImpl.py b/src/python/dm/ds_web_service/service/impl/experimentSessionControllerImpl.py index 561b4d31a7049c3334c11de8a136c877b646e86b..7958faa7493b4c9d37b86520ddd220428bcd6291 100755 --- a/src/python/dm/ds_web_service/service/impl/experimentSessionControllerImpl.py +++ b/src/python/dm/ds_web_service/service/impl/experimentSessionControllerImpl.py @@ -49,6 +49,13 @@ class ExperimentSessionControllerImpl(DmObjectManager): ExperimentManager.getInstance().createExperimentDataDirectory(experiment) return experiment + def updateExperiment(self, name): + experiment = self.experimentDbApi.getExperimentWithUsers(name) + if experiment.get('startDate') is None: + raise InvalidRequest('Experiment %s has not been started.' % name) + ExperimentManager.getInstance().updateExperimentGroupUsers(experiment) + return experiment + def stopExperiment(self, name): experiment = self.experimentDbApi.getExperimentByName(name) if experiment.get('endDate') is None: