merge common code from auth framework branch

src/python/dm/common/utility/configurationManager.py

@@ -73,6 +73,12 @@ DEFAULT_DM_SSL_KEY_FILE = None
 # Login (user|password) file
 DEFAULT_DM_LOGIN_FILE = None
 
+# Station name
+DEFAULT_DM_STATION_NAME = None
+
+# Allowed experiment types
+DEFAULT_DM_ALLOWED_EXPERIMENT_TYPES = None
+
 class ConfigurationManager(UserDict.UserDict):
     """ 
     Singleton class used for keeping system configuration data. The class
@@ -155,6 +161,10 @@ class ConfigurationManager(UserDict.UserDict):
 
         self['defaultLoginFile'] = DEFAULT_DM_LOGIN_FILE
 
+        self['defaultStationName'] = DEFAULT_DM_STATION_NAME
+
+        self['defaultAllowedExperimentTypes'] = DEFAULT_DM_ALLOWED_EXPERIMENT_TYPES
+
         # Settings that might come from environment variables.
         self.__setFromEnvVar('logFile', 'DM_LOG_FILE')
         self.__setFromEnvVar('consoleLogLevel', 'DM_CONSOLE_LOG_LEVEL')
@@ -190,6 +200,9 @@ class ConfigurationManager(UserDict.UserDict):
         self.__setFromEnvVar('dbPasswordFile', 'DM_DB_PASSWORD_FILE')
         self.__setFromEnvVar('loginFile', 'DM_LOGIN_FILE')
 
+        self.__setFromEnvVar('stationName', 'DM_STATION_NAME')
+        self.__setFromEnvVar('allowedExperimentTypes', 'DM_ALLOWED_EXPERIMENT_TYPES')
+
         # Settings that might come from file.
         self.__setFromVarFile('dbPassword', self.getDbPasswordFile())
 
@@ -810,6 +823,30 @@ class ConfigurationManager(UserDict.UserDict):
     def hasLoginFile(self):
         return self.has_key('loginFile')
 
+    def getDefaultStationName(self):
+        return self['defaultStationName']
+
+    def getStationName(self, default='__dm_default__'):
+        return self.__getKeyValue('stationName', default) 
+
+    def setStationName(self, f):
+        self['stationName'] = f
+
+    def hasStationName(self):
+        return self.has_key('stationName')
+
+    def getDefaultAllowedExperimentTypes(self):
+        return self['defaultAllowedExperimentTypes']
+
+    def getAllowedExperimentTypes(self, default='__dm_default__'):
+        return self.__getKeyValue('allowedExperimentTypes', default) 
+
+    def setAllowedExperimentTypes(self, f):
+        self['allowedExperimentTypes'] = f
+
+    def hasAllowedExperimentTypes(self):
+        return self.has_key('allowedExperimentTypes')
+
 #######################################################################
 # Testing.