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
rough cleanup of the slicemanager business
[sfa.git]
/
sfa
/
planetlab
/
topology.py
diff --git
a/sfa/planetlab/topology.py
b/sfa/planetlab/topology.py
index
c05b198
..
8add242
100644
(file)
--- a/
sfa/planetlab/topology.py
+++ b/
sfa/planetlab/topology.py
@@
-1,20
+1,21
@@
##
# SFA Topology Info
#
##
# SFA Topology Info
#
-# This module holds topology configuration for SFA. It is implemnted as a
+# This module holds topology configuration for SFA. It is implemnted as a
# list of site_id tuples
import os.path
import traceback
from sfa.util.sfalogging import logger
# list of site_id tuples
import os.path
import traceback
from sfa.util.sfalogging import logger
+
class Topology(set):
"""
Parse the topology configuration file.
"""
class Topology(set):
"""
Parse the topology configuration file.
"""
- def __init__(self, config_file
=
"/etc/sfa/topology"):
- set.__init__(self)
+ def __init__(self, config_file
=
"/etc/sfa/topology"):
+ set.__init__(self)
try:
# load the links
f = open(config_file, 'r')
try:
# load the links
f = open(config_file, 'r')
@@
-24,7
+25,8
@@
class Topology(set):
line = line[0:ignore]
tup = line.split()
if len(tup) > 1:
line = line[0:ignore]
tup = line.split()
if len(tup) > 1:
- self.add((tup[0], tup[1]))
+ self.add((tup[0], tup[1]))
except Exception as e:
except Exception as e:
- logger.log_exc("Could not find or load the configuration file: %s" % config_file)
+ logger.log_exc(
+ "Could not find or load the configuration file: %s" % config_file)
raise
raise