refactored start upload method

bin/dm-start-upload → 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 $@
 
 

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)

src/python/dm/daq_web_service/cli/startUploadCli.py → 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()
 

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']
             },
 

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
 

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: