Skip to content
Snippets Groups Projects
Commit a9ac494f authored by sveseli's avatar sveseli
Browse files

merge updated cat and daq service interfaces from auth framework code

parent 934d2603
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/python/dm/__init__.py
+ 1
− 1
View file @ a9ac494f
__version__ = "0.15 (2016.10.26)" __version__ = "0.16 (2017.01.05)"
src/python/dm/cat_web_service/service/datasetSessionController.py
+ 8
− 8
View file @ a9ac494f
...@@ -13,7 +13,7 @@ class DatasetSessionController(DmSessionController): ...@@ -13,7 +13,7 @@ class DatasetSessionController(DmSessionController):
self.datasetSessionControllerImpl = DatasetSessionControllerImpl() self.datasetSessionControllerImpl = DatasetSessionControllerImpl()
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def addExperimentDataset(self, experimentName, datasetName, **kwargs): def addExperimentDataset(self, experimentName, datasetName, **kwargs):
if not experimentName: if not experimentName:
...@@ -31,7 +31,7 @@ class DatasetSessionController(DmSessionController): ...@@ -31,7 +31,7 @@ class DatasetSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def updateExperimentDataset(self, experimentName, datasetName, **kwargs): def updateExperimentDataset(self, experimentName, datasetName, **kwargs):
if not experimentName: if not experimentName:
...@@ -49,7 +49,7 @@ class DatasetSessionController(DmSessionController): ...@@ -49,7 +49,7 @@ class DatasetSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def updateDatasetById(self, id, **kwargs): def updateDatasetById(self, id, **kwargs):
if not id: if not id:
...@@ -63,7 +63,7 @@ class DatasetSessionController(DmSessionController): ...@@ -63,7 +63,7 @@ class DatasetSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getDatasets(self, **kwargs): def getDatasets(self, **kwargs):
encodedQueryDict = kwargs.get('queryDict') encodedQueryDict = kwargs.get('queryDict')
...@@ -73,7 +73,7 @@ class DatasetSessionController(DmSessionController): ...@@ -73,7 +73,7 @@ class DatasetSessionController(DmSessionController):
return self.listToJson(self.datasetSessionControllerImpl.getDatasets(queryDict=queryDict)) return self.listToJson(self.datasetSessionControllerImpl.getDatasets(queryDict=queryDict))
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentDatasets(self, experimentName, **kwargs): def getExperimentDatasets(self, experimentName, **kwargs):
if not experimentName: if not experimentName:
...@@ -85,7 +85,7 @@ class DatasetSessionController(DmSessionController): ...@@ -85,7 +85,7 @@ class DatasetSessionController(DmSessionController):
return self.listToJson(self.datasetSessionControllerImpl.getExperimentDatasets(experimentName, queryDict=queryDict)) return self.listToJson(self.datasetSessionControllerImpl.getExperimentDatasets(experimentName, queryDict=queryDict))
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getDatasetById(self, id, **kwargs): def getDatasetById(self, id, **kwargs):
if not id: if not id:
...@@ -95,7 +95,7 @@ class DatasetSessionController(DmSessionController): ...@@ -95,7 +95,7 @@ class DatasetSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentDataset(self, experimentName, datasetName, **kwargs): def getExperimentDataset(self, experimentName, datasetName, **kwargs):
if not experimentName: if not experimentName:
...@@ -107,7 +107,7 @@ class DatasetSessionController(DmSessionController): ...@@ -107,7 +107,7 @@ class DatasetSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentDatasetFiles(self, experimentName, datasetName, **kwargs): def getExperimentDatasetFiles(self, experimentName, datasetName, **kwargs):
if not experimentName: if not experimentName:
......
src/python/dm/cat_web_service/service/fileSessionController.py
+ 6
− 6
View file @ a9ac494f
...@@ -13,7 +13,7 @@ class FileSessionController(DmSessionController): ...@@ -13,7 +13,7 @@ class FileSessionController(DmSessionController):
self.fileSessionControllerImpl = FileSessionControllerImpl() self.fileSessionControllerImpl = FileSessionControllerImpl()
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def addExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs): def addExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs):
if not experimentName: if not experimentName:
...@@ -32,7 +32,7 @@ class FileSessionController(DmSessionController): ...@@ -32,7 +32,7 @@ class FileSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def updateExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs): def updateExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs):
if not experimentName: if not experimentName:
...@@ -51,7 +51,7 @@ class FileSessionController(DmSessionController): ...@@ -51,7 +51,7 @@ class FileSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def updateExperimentFileById(self, expermentName, id, **kwargs): def updateExperimentFileById(self, expermentName, id, **kwargs):
if not experimentName: if not experimentName:
...@@ -68,7 +68,7 @@ class FileSessionController(DmSessionController): ...@@ -68,7 +68,7 @@ class FileSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentFiles(self, experimentName, **kwargs): def getExperimentFiles(self, experimentName, **kwargs):
if not experimentName: if not experimentName:
...@@ -80,7 +80,7 @@ class FileSessionController(DmSessionController): ...@@ -80,7 +80,7 @@ class FileSessionController(DmSessionController):
return self.listToJson(self.fileSessionControllerImpl.getExperimentFiles(experimentName, queryDict=queryDict)) return self.listToJson(self.fileSessionControllerImpl.getExperimentFiles(experimentName, queryDict=queryDict))
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentFileById(self, experimentName, id, **kwargs): def getExperimentFileById(self, experimentName, id, **kwargs):
if not experimentName: if not experimentName:
...@@ -92,7 +92,7 @@ class FileSessionController(DmSessionController): ...@@ -92,7 +92,7 @@ class FileSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs): def getExperimentFile(self, experimentName, encodedExperimentFilePath, **kwargs):
if not experimentName: if not experimentName:
......
src/python/dm/daq_web_service/service/daqWebService.py
+ 1
− 1
View file @ a9ac494f
...@@ -14,7 +14,7 @@ from dm.daq_web_service.service.impl.fileSystemObserver import FileSystemObserve ...@@ -14,7 +14,7 @@ from dm.daq_web_service.service.impl.fileSystemObserver import FileSystemObserve
from daqWebServiceRouteMapper import DaqWebServiceRouteMapper from daqWebServiceRouteMapper import DaqWebServiceRouteMapper
class DaqWebService(DmRestWebServiceBase): class DaqWebService(DmRestWebServiceBase):
def __init__(self): def __init__(self):
DmRestWebServiceBase.__init__(self, DaqWebServiceRouteMapper) DmRestWebServiceBase.__init__(self, DaqWebServiceRouteMapper)
......
src/python/dm/daq_web_service/service/experimentSessionController.py
+ 13
− 12
View file @ a9ac494f
...@@ -8,6 +8,7 @@ from dm.common.constants import dmProcessingMode ...@@ -8,6 +8,7 @@ from dm.common.constants import dmProcessingMode
from dm.common.constants import dmProcessingStatus from dm.common.constants import dmProcessingStatus
from dm.common.service.dmSessionController import DmSessionController from dm.common.service.dmSessionController import DmSessionController
from dm.common.exceptions.invalidRequest import InvalidRequest from dm.common.exceptions.invalidRequest import InvalidRequest
from dm.common.exceptions.authorizationError import AuthorizationError
from dm.common.utility.encoder import Encoder from dm.common.utility.encoder import Encoder
from dm.common.utility.dictUtility import DictUtility from dm.common.utility.dictUtility import DictUtility
...@@ -21,7 +22,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -21,7 +22,7 @@ class ExperimentSessionController(DmSessionController):
self.experimentSessionControllerImpl = ExperimentSessionControllerImpl() self.experimentSessionControllerImpl = ExperimentSessionControllerImpl()
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def startDaq(self, experimentName, dataDirectory, **kwargs): def startDaq(self, experimentName, dataDirectory, **kwargs):
if not experimentName: if not experimentName:
...@@ -37,12 +38,13 @@ class ExperimentSessionController(DmSessionController): ...@@ -37,12 +38,13 @@ class ExperimentSessionController(DmSessionController):
encodedDaqInfo = kwargs.get('daqInfo') encodedDaqInfo = kwargs.get('daqInfo')
if encodedDaqInfo is not None: if encodedDaqInfo is not None:
daqInfo = json.loads(Encoder.decode(encodedDaqInfo)) daqInfo = json.loads(Encoder.decode(encodedDaqInfo))
response = self.experimentSessionControllerImpl.startDaq(experimentName, dataDirectory, daqInfo).getFullJsonRep() response = self.experimentSessionControllerImpl.startDaq(experimentName, dataDirectory, daqInfo).getFullJsonRep()
self.logger.debug('Returning: %s' % response) self.logger.debug('Started DAQ: %s' % response)
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def stopDaq(self, experimentName, dataDirectory, **kwargs): def stopDaq(self, experimentName, dataDirectory, **kwargs):
if not experimentName: if not experimentName:
...@@ -52,19 +54,18 @@ class ExperimentSessionController(DmSessionController): ...@@ -52,19 +54,18 @@ class ExperimentSessionController(DmSessionController):
raise InvalidRequest('Missing data directory.') raise InvalidRequest('Missing data directory.')
dataDirectory = Encoder.decode(dataDirectory) dataDirectory = Encoder.decode(dataDirectory)
response = self.experimentSessionControllerImpl.stopDaq(experimentName, dataDirectory).getFullJsonRep() response = self.experimentSessionControllerImpl.stopDaq(experimentName, dataDirectory).getFullJsonRep()
self.logger.debug('Returning: %s' % response) self.logger.debug('Stopped DAQ: %s' % response)
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getDaqInfo(self, id, **kwargs): def getDaqInfo(self, id, **kwargs):
response = self.experimentSessionControllerImpl.getDaqInfo(id).getFullJsonRep() response = self.experimentSessionControllerImpl.getDaqInfo(id).getFullJsonRep()
self.logger.debug('Returning: %s' % response)
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def listDaqs(self, status=dmProcessingStatus.DM_PROCESSING_STATUS_ANY, **kwargs): def listDaqs(self, status=dmProcessingStatus.DM_PROCESSING_STATUS_ANY, **kwargs):
if not status: if not status:
...@@ -74,7 +75,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -74,7 +75,7 @@ class ExperimentSessionController(DmSessionController):
return self.listToJson(self.experimentSessionControllerImpl.listDaqs(status)) return self.listToJson(self.experimentSessionControllerImpl.listDaqs(status))
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def upload(self, experimentName, dataDirectory, **kwargs): def upload(self, experimentName, dataDirectory, **kwargs):
if not experimentName: if not experimentName:
...@@ -101,7 +102,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -101,7 +102,7 @@ class ExperimentSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getUploadInfo(self, id, **kwargs): def getUploadInfo(self, id, **kwargs):
response = self.experimentSessionControllerImpl.getUploadInfo(id).getFullJsonRep() response = self.experimentSessionControllerImpl.getUploadInfo(id).getFullJsonRep()
...@@ -109,7 +110,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -109,7 +110,7 @@ class ExperimentSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def listUploads(self, status=dmProcessingStatus.DM_PROCESSING_STATUS_ANY, **kwargs): def listUploads(self, status=dmProcessingStatus.DM_PROCESSING_STATUS_ANY, **kwargs):
if not status: if not status:
...@@ -119,7 +120,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -119,7 +120,7 @@ class ExperimentSessionController(DmSessionController):
return self.listToJson(self.experimentSessionControllerImpl.listUploads(status)) return self.listToJson(self.experimentSessionControllerImpl.listUploads(status))
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def stopUpload(self, id, **kwargs): def stopUpload(self, id, **kwargs):
response = self.experimentSessionControllerImpl.stopUpload(id).getFullJsonRep() response = self.experimentSessionControllerImpl.stopUpload(id).getFullJsonRep()
...@@ -127,7 +128,7 @@ class ExperimentSessionController(DmSessionController): ...@@ -127,7 +128,7 @@ class ExperimentSessionController(DmSessionController):
return response return response
@cherrypy.expose @cherrypy.expose
@DmSessionController.require(DmSessionController.isAdministrator()) @DmSessionController.require(DmSessionController.canManageStation())
@DmSessionController.execute @DmSessionController.execute
def getProcessingPlugins(self, **kwargs): def getProcessingPlugins(self, **kwargs):
return self.listToJson(self.experimentSessionControllerImpl.getProcessingPlugins()) return self.listToJson(self.experimentSessionControllerImpl.getProcessingPlugins())
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment