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
fix authority registration
[sfa.git]
/
sfa
/
util
/
config.py
diff --git
a/sfa/util/config.py
b/sfa/util/config.py
index
2261dda
..
eaf2aea
100644
(file)
--- a/
sfa/util/config.py
+++ b/
sfa/util/config.py
@@
-76,27
+76,12
@@
class Config:
return (aggr_mgr_ip,aggr_mgr_port)
return (aggr_mgr_ip,aggr_mgr_port)
- def get_aggregate_type(self):
- if (hasattr(self,'SFA_AGGREGATE_TYPE')):
- return self.SFA_AGGREGATE_TYPE
- else:
- return "pl"
-
def get_interface_hrn(self):
if (hasattr(self,'SFA_INTERFACE_HRN')):
return self.SFA_INTERFACE_HRN
else:
return "plc"
def get_interface_hrn(self):
if (hasattr(self,'SFA_INTERFACE_HRN')):
return self.SFA_INTERFACE_HRN
else:
return "plc"
- def get_plc_dbinfo(self):
- return {
- 'dbname' : self.SFA_DB_NAME,
- 'address' : self.SFA_DB_HOST,
- 'port' : self.SFA_DB_PORT,
- 'user' : self.SFA_DB_USER,
- 'password' : self.SFA_DB_PASSWORD
- }
-
# TODO: find a better place to put this method
def get_max_aggrMgr_info(self):
am_apiclient_path = '/usr/local/MAXGENI_AM_APIClient'
# TODO: find a better place to put this method
def get_max_aggrMgr_info(self):
am_apiclient_path = '/usr/local/MAXGENI_AM_APIClient'