Changes in configuration

[u/mrichter/AliRoot.git] / SHUTTLE / schema / shuttle.schema

diff --git a/SHUTTLE/schema/shuttle.schema b/SHUTTLE/schema/shuttle.schema
index d16b755c2c79a0446b0fb4892659a13300d64d41..5753c9facf06b45956c22457f1c3d16fac9ba196 100644 (file)
--- a/SHUTTLE/schema/shuttle.schema
+++ b/SHUTTLE/schema/shuttle.schema
@@ -30,24 +30,25 @@ objectclass ( DCS_CONFIG
 
 objectidentifier FXS_CONFIG SHUTTLE_BASE:3
 
-attributetype ( FXS_CONFIG:1  NAME 'system'     DESC 'System name (DAQ, DCS, HLT)'  EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:2  NAME 'dbHost'     DESC 'FXS MySQL DB host'            EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:3  NAME 'dbPort'     DESC 'FXS MySQL DB port'                                      SUP ipServicePort SINGLE-VALUE )
-attributetype ( FXS_CONFIG:4  NAME 'dbUser'     DESC 'FXS MySQL DB user'            EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:5  NAME 'dbPasswd'    DESC 'FXS MySQL DB passwd'         EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:6  NAME 'dbName'     DESC 'FXS MySQL DB name'            EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:7  NAME 'dbTable'    DESC 'FXS MySQL DB table'           EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:8  NAME 'fxsHost'    DESC 'FXS host'                     EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:9  NAME 'fxsPort'    DESC 'FXS port'                                               SUP ipServicePort SINGLE-VALUE )
-attributetype ( FXS_CONFIG:10 NAME 'fxsUser'    DESC 'FXS user'                     EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
-attributetype ( FXS_CONFIG:11 NAME 'fxsPasswd'   DESC 'FXS Password'                EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:1  NAME 'system'            DESC 'System name (DAQ, DCS, HLT)'  EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:2  NAME 'dbHost'            DESC 'FXS MySQL DB host'             EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:3  NAME 'dbPort'            DESC 'FXS MySQL DB port'                                       SUP ipServicePort SINGLE-VALUE )
+attributetype ( FXS_CONFIG:4  NAME 'dbUser'            DESC 'FXS MySQL DB user'             EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:5  NAME 'dbName'            DESC 'FXS MySQL DB name'             EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:6  NAME 'dbTable'           DESC 'FXS MySQL DB table'            EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:7  NAME 'fxsHost'           DESC 'FXS host'                      EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:8  NAME 'fxsPort'           DESC 'FXS port'                                                SUP ipServicePort SINGLE-VALUE )
+attributetype ( FXS_CONFIG:9  NAME 'fxsUser'           DESC 'FXS user'              EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:10 NAME 'fxsPasswd'         DESC 'FXS Password'                  EQUALITY caseIgnoreMatch  SUP name SINGLE-VALUE )
+attributetype ( FXS_CONFIG:11 NAME 'fxsAdmin'          DESC 'FXS admin(s) email address' EQUALITY caseIgnoreIA5Match SUP mail )
+attributetype ( FXS_CONFIG:12 NAME 'fxsBaseFolder'     DESC 'FXS Base Folder'               EQUALITY caseIgnoreMatch SUP name SINGLE-VALUE )
 
 objectclass ( FXS_CONFIG
         NAME 'fxsConfig'
         DESC 'ALICE: Configuration of the Shuttle for access to the File Exchange Servers'
         SUP top
-        MUST (system $ dbHost $ dbUser $ dbPasswd $ dbName $ dbTable $ fxsHost $ fxsUser )
-        MAY ( dbPort $ fxsPasswd $ fxsPort) )
+        MUST (system $ dbHost $ dbUser $ dbName $ dbTable $ fxsHost $ fxsUser $ fxsBaseFolder)
+        MAY ( dbPort $ fxsPasswd $ fxsPort $ fxsAdmin) )
 
 
 objectidentifier GLOBAL_CONFIG SHUTTLE_BASE:4
@@ -55,26 +56,34 @@ objectidentifier GLOBAL_CONFIG SHUTTLE_BASE:4
 attributetype ( GLOBAL_CONFIG:1  NAME 'daqLbHost'      DESC 'DAQ Logbook host'             EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:2  NAME 'daqLbPort'      DESC 'DAQ Logbook port'                                                SUP ipServicePort SINGLE-VALUE )
 attributetype ( GLOBAL_CONFIG:3  NAME 'daqLbUser'      DESC 'DAQ Logbook user'             EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:4  NAME 'daqLbPasswd'    DESC 'DAQ Logbook passwd'           EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:5  NAME 'daqLbDB'               DESC 'DAQ Logbook DB'               EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:6  NAME 'daqLbTable'     DESC 'DAQ Logbook table'            EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:7  NAME 'shuttleLbTable' DESC 'SHUTTLE Logbook table'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:8  NAME 'runTypeLbTable' DESC 'RunType Logbook table'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:9  NAME 'ppmaxRetries'   DESC 'retries before pp fail'      EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:10 NAME 'ppTimeOut'      DESC 'seconds before pp abort'     EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:11 NAME 'ppMaxMem'       DESC 'max pp mem consumption (KB)'  EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:12 NAME 'monitorHost'    DESC 'monitoring server host'       EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:13 NAME 'monitorTable'   DESC 'monitoring table name'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:14 NAME 'triggerWait'    DESC 'max time waiting for next trigger before starting a new collection'   
+attributetype ( GLOBAL_CONFIG:4  NAME 'daqLbDB'               DESC 'DAQ Logbook DB'               EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:5  NAME 'daqLbTable'     DESC 'DAQ Logbook table'            EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:6  NAME 'shuttleLbTable' DESC 'SHUTTLE Logbook table'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:7  NAME 'runTypeLbTable' DESC 'RunType Logbook table'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:8  NAME 'ppmaxRetries'   DESC 'retries before pp fail'      EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:9  NAME 'ppTimeOut'      DESC 'seconds before pp abort'     EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:10 NAME 'ppMaxMem'       DESC 'max pp mem consumption (KB)'  EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:11 NAME 'monitorHost'    DESC 'monitoring server host'       EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:12 NAME 'monitorTable'   DESC 'monitoring table name'        EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:13 NAME 'triggerWait'    DESC 'max time waiting for next trigger before starting a new collection'   
                                                                                           EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
-attributetype ( GLOBAL_CONFIG:15 NAME 'mode'           DESC 'production mode (test, prod)' EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:14 NAME 'mode'           DESC 'production mode (test, prod)' EQUALITY caseIgnoreMatch    SUP name SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:15 NAME 'shuttleAdmin'    DESC 'SHUTTLE administrator(s) email address' EQUALITY caseIgnoreIA5Match SUP mail )
+attributetype ( GLOBAL_CONFIG:16 NAME 'amandaAdmin'    DESC 'Amanda admin(s) email address' EQUALITY caseIgnoreIA5Match SUP mail )
+
+attributetype ( GLOBAL_CONFIG:17 NAME 'sendMail'       DESC 'Send email flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:18 NAME 'keepDCSMap'     DESC 'keep DCS map flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:19 NAME 'keepTempFolder'         DESC 'keep temp folder flag (1/0)'  EQUALITY integerMatch       SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:20 NAME 'dcsTimeOut'      DESC 'seconds before dcs abort'           EQUALITY integerMatch    SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:21 NAME 'nDCSretries'     DESC 'number of dcs retries before abort'      EQUALITY integerMatch    SUP uidNumber SINGLE-VALUE )
+attributetype ( GLOBAL_CONFIG:22 NAME 'passwdFilePath' DESC 'PWD File Path'                 EQUALITY caseIgnoreMatch SUP name SINGLE-VALUE )
 
 objectclass ( GLOBAL_CONFIG
         NAME 'globalConfig'
         DESC 'ALICE: settings for DAQ logbook access'
         SUP top
-        MUST (name $ daqLbHost $ daqLbUser $ daqLbPasswd $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem $ monitorHost $ monitorTable)
-        MAY ( daqLbPort $ triggerWait $ mode) )
+        MUST (name $ passwdFilePath $ daqLbHost $ daqLbUser $ daqLbDB $ daqLbTable $ shuttleLbTable $ runTypeLbTable $ ppMaxRetries $ ppTimeOut $ ppMaxMem $ dcsTimeOut $ nDCSretries $ monitorHost $ monitorTable)
+        MAY ( daqLbPort $ triggerWait $ mode $ keepDCSMap $ keepTempFolder $ shuttleAdmin $ amandaAdmin $ sendMail) )
 
 
 objectidentifier INSTANCE_CONFIG SHUTTLE_BASE:5