diff --git a/bin/dm-start-upload b/bin/dm-upload similarity index 79% rename from bin/dm-start-upload rename to bin/dm-upload index 982fde120c9886b5e20341743480f711fb3ca0a3..909be4e6be4f99af82c2b11a0bf830d57f5d1115 100755 --- a/bin/dm-start-upload +++ b/bin/dm-upload @@ -12,6 +12,6 @@ if [ -z $DM_ROOT_DIR ]; then source $setupFile > /dev/null fi -$DM_ROOT_DIR/src/python/dm/daq_web_service/cli/startUploadCli.py $@ +$DM_ROOT_DIR/src/python/dm/daq_web_service/cli/uploadCli.py $@ diff --git a/src/python/dm/daq_web_service/api/experimentRestApi.py b/src/python/dm/daq_web_service/api/experimentRestApi.py index 07222dfdf8b260398fb9c8cdd48a1e24170e137e..6f0e9abace9bb95a9c6ee126532a1a873b367d0c 100755 --- a/src/python/dm/daq_web_service/api/experimentRestApi.py +++ b/src/python/dm/daq_web_service/api/experimentRestApi.py @@ -35,8 +35,8 @@ class ExperimentRestApi(DaqRestApi): return Experiment(responseDict) @DaqRestApi.execute - def startUpload(self, name, dataDirectory): - url = '%s/experiments/startUpload' % (self.getContextRoot()) + def upload(self, name, dataDirectory): + url = '%s/experiments/upload' % (self.getContextRoot()) if name is None or not len(name): raise InvalidRequest('Experiment name must be provided.') url += '?name=%s' % Encoder.encode(name) diff --git a/src/python/dm/daq_web_service/cli/startUploadCli.py b/src/python/dm/daq_web_service/cli/uploadCli.py similarity index 86% rename from src/python/dm/daq_web_service/cli/startUploadCli.py rename to src/python/dm/daq_web_service/cli/uploadCli.py index ad11e36d2f54c951fb3166ab4e56210cf1a16974..539cdac7cdc6a9052000056ec9b6f6c5493b2339 100755 --- a/src/python/dm/daq_web_service/cli/startUploadCli.py +++ b/src/python/dm/daq_web_service/cli/uploadCli.py @@ -4,7 +4,7 @@ from daqWebServiceSessionCli import DaqWebServiceSessionCli from dm.daq_web_service.api.experimentRestApi import ExperimentRestApi from dm.common.exceptions.invalidRequest import InvalidRequest -class StartUploadCli(DaqWebServiceSessionCli): +class UploadCli(DaqWebServiceSessionCli): def __init__(self): DaqWebServiceSessionCli.__init__(self) self.addOption('', '--experiment', dest='experimentName', help='Experiment name.') @@ -24,19 +24,19 @@ class StartUploadCli(DaqWebServiceSessionCli): def runCommand(self): self.parseArgs(usage=""" - dm-start-upload --name=EXPERIMENTNAME --data-directory=DATADIRECTORY + dm-upload --name=EXPERIMENTNAME --data-directory=DATADIRECTORY Description: Schedules data upload for a given experiment. """) self.checkArgs() api = ExperimentRestApi(self.getLoginUsername(), self.getLoginPassword(), self.getServiceHost(), self.getServicePort(), self.getServiceProtocol()) - experiment = api.startUpload(self.getExperimentName(), self.getDataDirectory()) + experiment = api.upload(self.getExperimentName(), self.getDataDirectory()) print experiment.getDisplayString(self.getDisplayKeys(), self.getDisplayFormat()) ####################################################################### # Run command. if __name__ == '__main__': - cli = StartUploadCli() + cli = UploadCli() cli.run() diff --git a/src/python/dm/daq_web_service/service/experimentRouteDescriptor.py b/src/python/dm/daq_web_service/service/experimentRouteDescriptor.py index 982d0f50fb50929804ad5f3dbf95ea2eee2cce00..d4bbd9d0bab3393e2a2c01e6b96ed5c5ea88705c 100755 --- a/src/python/dm/daq_web_service/service/experimentRouteDescriptor.py +++ b/src/python/dm/daq_web_service/service/experimentRouteDescriptor.py @@ -37,12 +37,12 @@ class ExperimentRouteDescriptor: 'method' : ['POST'] }, - # Start experiment data upload + # Upload experiment data { - 'name' : 'startUpload', - 'path' : '%s/experiments/startUpload' % contextRoot, + 'name' : 'upload', + 'path' : '%s/experiments/upload' % contextRoot, 'controller' : experimentSessionController, - 'action' : 'startUpload', + 'action' : 'upload', 'method' : ['POST'] }, diff --git a/src/python/dm/daq_web_service/service/experimentSessionController.py b/src/python/dm/daq_web_service/service/experimentSessionController.py index 652da9c2bbd6fd1e9b675950ac949652e1226709..25751d1b36f9bd82b0a2d3f354c820f670f5a8ec 100755 --- a/src/python/dm/daq_web_service/service/experimentSessionController.py +++ b/src/python/dm/daq_web_service/service/experimentSessionController.py @@ -46,7 +46,7 @@ class ExperimentSessionController(DmSessionController): @cherrypy.expose @DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.execute - def startUpload(self, **kwargs): + def upload(self, **kwargs): name = kwargs.get('name') if name is None or not len(name): raise InvalidRequest('Missing experiment name.') @@ -55,7 +55,7 @@ class ExperimentSessionController(DmSessionController): if dataDirectory is None or not len(dataDirectory): raise InvalidRequest('Missing experiment data directory.') dataDirectory = Encoder.decode(dataDirectory) - response = self.experimentSessionControllerImpl.startUpload(name, dataDirectory).getFullJsonRep() + response = self.experimentSessionControllerImpl.upload(name, dataDirectory).getFullJsonRep() self.logger.debug('Returning: %s' % response) return response diff --git a/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py b/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py index 83242c0a56796feb0a4c80eb82dbf60226bac76b..f4febc39d649cd08229f0342eb9828597ea9d48b 100755 --- a/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py +++ b/src/python/dm/daq_web_service/service/impl/experimentSessionControllerImpl.py @@ -44,7 +44,7 @@ class ExperimentSessionControllerImpl(DmObjectManager): FileSystemObserver.getInstance().stopObservingPath(dataDirectory, experiment) return experiment - def startUpload(self, name, dataDirectory): + def upload(self, name, dataDirectory): experiment = self.dsExperimentApi.getExperimentByName(name) storageDirectory = experiment.get('storageDirectory') if storageDirectory is None: