git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Ignore meaningless white space in RSpec
[sfa.git]
/
sfa
/
util
/
config.py
diff --git
a/sfa/util/config.py
b/sfa/util/config.py
index
02ad5d3
..
923df4f
100644
(file)
--- a/
sfa/util/config.py
+++ b/
sfa/util/config.py
@@
-1,17
+1,17
@@
##
##
-#
Geniwrapper
Configuration Info
+#
SFA
Configuration Info
#
#
-# This module holds configuration parameters for
geniwrapper
. There are two
+# This module holds configuration parameters for
SFA
. There are two
# main pieces of information that are used: the database connection and
# the PLCAPI connection
##
##
# main pieces of information that are used: the database connection and
# the PLCAPI connection
##
##
-#
Geniwrapper
uses a MYSQL database to store records. This database may be
+#
SFA
uses a MYSQL database to store records. This database may be
# co-located with the PLC database, or it may be a separate database. The
# following parameters define the connection to the database.
#
# co-located with the PLC database, or it may be a separate database. The
# following parameters define the connection to the database.
#
-# Note that
Geniwrapper
does not access any of the PLC databases directly via
+# Note that
SFA
does not access any of the PLC databases directly via
# a mysql connection; All PLC databases are accessed via PLCAPI.
### $Id$
# a mysql connection; All PLC databases are accessed via PLCAPI.
### $Id$
@@
-28,7
+28,7
@@
class Config:
fast but no type conversions.
"""
fast but no type conversions.
"""
- def __init__(self, config_file = "/etc/sfa/sfa_config"):
+ def __init__(self, config_file = "/etc/sfa/sfa_config
.py
"):
self.config_file = None
self.config_path = None
self.data_path = None
self.config_file = None
self.config_path = None
self.data_path = None
@@
-54,6
+54,9
@@
class Config:
# default to /var/lib/sfa not specified in config
self.SFA_CONFIG_DIR="/etc/sfa"
# default to /var/lib/sfa not specified in config
self.SFA_CONFIG_DIR="/etc/sfa"
+ if not hasattr(self, 'SFA_REGISTRY_LEVEL1_AUTH'):
+ self.SFA_REGISTRY_LEVEL1_AUTH=None
+
# define interface types
# this will determine which manager to use
if not hasattr(self, 'SFA_REGISTRY_TYPE'):
# define interface types
# this will determine which manager to use
if not hasattr(self, 'SFA_REGISTRY_TYPE'):
@@
-70,7
+73,9
@@
class Config:
# create the data directory if it doesnt exist
if not os.path.isdir(self.SFA_DATA_DIR):
# create the data directory if it doesnt exist
if not os.path.isdir(self.SFA_DATA_DIR):
- os.mkdir(self.SFA_DATA_DIR)
+ try:
+ os.mkdir(self.SFA_DATA_DIR)
+ except: pass
except IOError, e:
raise IOError, "Could not find the configuration file: %s" % config_file
except IOError, e:
raise IOError, "Could not find the configuration file: %s" % config_file
@@
-89,9
+94,9
@@
class Config:
return (aggr_mgr_ip,aggr_mgr_port)
return (aggr_mgr_ip,aggr_mgr_port)
- def get_aggregate_
rspec_
type(self):
- if (hasattr(self,'SFA_AGGREGATE_
RSPEC_
TYPE')):
- return self.SFA_AGGREGATE_
RSPEC_
TYPE
+ def get_aggregate_type(self):
+ if (hasattr(self,'SFA_AGGREGATE_TYPE')):
+ return self.SFA_AGGREGATE_TYPE
else:
return "pl"
else:
return "pl"
@@
-105,12
+110,12
@@
class Config:
}
##
}
##
- #
Geniwrapper
uses a PLCAPI connection to perform operations on the registry,
+ #
SFA
uses a PLCAPI connection to perform operations on the registry,
# such as creating and deleting slices. This connection requires an account
# on the PLC server with full administrator access.
#
# The Url parameter controls whether the connection uses PLCAPI directly (i.e.
# such as creating and deleting slices. This connection requires an account
# on the PLC server with full administrator access.
#
# The Url parameter controls whether the connection uses PLCAPI directly (i.e.
- #
Geniwrapper
is located on the same machine as PLC), or uses a XMLRPC connection
+ #
SFA
is located on the same machine as PLC), or uses a XMLRPC connection
# to the PLC machine. If you wish to use the API directly, then remove the Url
# field from the dictionary.
# to the PLC machine. If you wish to use the API directly, then remove the Url
# field from the dictionary.