adding DCS, HLT FES to the configuration

diff --git a/SHUTTLE/schema/shuttle.schema b/SHUTTLE/schema/shuttle.schema
index dc389b964b95e74637fc16d10da3cea047665545..ae864c2480c2b3e5b0d01e0d8a7eeb331a63e60a 100644 (file)
--- a/SHUTTLE/schema/shuttle.schema
+++ b/SHUTTLE/schema/shuttle.schema
@@ -6,31 +6,47 @@ attributetype ( DETECTOR_CONFIG:1 NAME 'det'         DESC 'Detector name'
 attributetype ( DETECTOR_CONFIG:2 NAME 'DCSHost'     DESC ''                      EQUALITY caseIgnoreMatch    SUP name )
 attributetype ( DETECTOR_CONFIG:3 NAME 'DCSPort'     DESC ''                                                  SUP ipServicePort )
 attributetype ( DETECTOR_CONFIG:4 NAME 'DCSalias'    DESC ''                      EQUALITY caseIgnoreMatch    SUP name )
-attributetype ( DETECTOR_CONFIG:5 NAME 'DAQFileIDs'  DESC 'IDs of files to get from DAQ' EQUALITY caseIgnoreMatch    SUP name )
 
 objectclass ( DETECTOR_CONFIG
         NAME 'AliShuttleDetector'
         DESC 'ALICE: Shuttle configuration object.'
         SUP top
         MUST (det)
-        MAY  (DCSHost $ DCSPort $ DCSalias $ DAQFileIDs) )
+        MAY  (DCSHost $ DCSPort $ DCSalias) )
 
 
-objectidentifier GLOBAL_CONFIG SHUTTLE_BASE:2
+objectidentifier SYS_CONFIG SHUTTLE_BASE:2
+
+attributetype ( SYS_CONFIG:1 NAME 'system'          DESC 'System name (DAQ, DCS, HLT)'    EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:2 NAME 'LogbookHost'      DESC ''   EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:3 NAME 'LogbookUser'      DESC ''   EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:4 NAME 'LogbookPassword'  DESC ''   EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:5 NAME 'FSHost'          DESC ''    EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:6 NAME 'FSUser'          DESC ''    EQUALITY caseIgnoreMatch    SUP name )
+attributetype ( SYS_CONFIG:7 NAME 'FSPassword'       DESC ''   EQUALITY caseIgnoreMatch    SUP name )
+
+objectclass ( SYS_CONFIG
+        NAME 'AliShuttleSYSConfig'
+        DESC 'ALICE: Configuration of the Shuttle for access to online network'
+        SUP top
+        MUST (system $ LogbookHost $ LogbookUser $ LogbookPassword $ FSHost $ FSUser ) 
+        MAY ( FSPassword ) )
+
+
+objectidentifier GLOBAL_CONFIG SHUTTLE_BASE:3
 
 attributetype ( GLOBAL_CONFIG:1 NAME 'DAQLogbookHost'      DESC ''    EQUALITY caseIgnoreMatch    SUP name )
 attributetype ( GLOBAL_CONFIG:2 NAME 'DAQLogbookUser'      DESC ''    EQUALITY caseIgnoreMatch    SUP name )
 attributetype ( GLOBAL_CONFIG:3 NAME 'DAQLogbookPassword'  DESC ''    EQUALITY caseIgnoreMatch    SUP name )
-attributetype ( GLOBAL_CONFIG:4 NAME 'DAQFileSystemHost'   DESC ''    EQUALITY caseIgnoreMatch    SUP name )
 
 objectclass ( GLOBAL_CONFIG
         NAME 'AliShuttleGlobalConfig'
-        DESC 'ALICE: Global configuration of the Shuttle'
+        DESC 'ALICE: Access to DAQ logbook settings'
         SUP top
-        MUST (name $ DAQLogbookHost $ DAQLogbookUser $ DAQLogbookPassword $ DAQFileSystemHost) )
+        MUST (name $ DAQLogbookHost $ DAQLogbookUser $ DAQLogbookPassword) )
 
 
-objectidentifier INSTANCE_CONFIG SHUTTLE_BASE:3
+objectidentifier INSTANCE_CONFIG SHUTTLE_BASE:4
 
 attributetype ( INSTANCE_CONFIG:1 NAME 'ShuttleHost' DESC 'Host that is running the Shuttle'  EQUALITY caseIgnoreMatch    SUP name )
 attributetype ( INSTANCE_CONFIG:2 NAME 'detectors'   DESC 'Detector list'                     EQUALITY caseIgnoreMatch    SUP name )