From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Wed, 2 Nov 2011 12:23:28 +0000 (-0400)
Subject: use sfa.util.topology insetad of sfa.managers.vini.topology
X-Git-Tag: sfa-1.1-2~10
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=1181217738eca1984f30e2a01f37ee362a7159c0;p=sfa.git

use sfa.util.topology insetad of sfa.managers.vini.topology
---

diff --git a/setup.py b/setup.py
index 61c087ef..c28e38da 100755
--- a/setup.py
+++ b/setup.py
@@ -60,6 +60,7 @@ data_files = [('/etc/sfa/', [ 'config/aggregates.xml',
                               'config/registries.xml',
                               'config/default_config.xml',
                               'config/sfi_config',
+                              'config/topology',
                               'sfa/managers/pl/pl.rng',
                               'sfa/trust/credential.xsd',
                               'sfa/trust/top.xsd',
diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 4cbeff70..4c398f99 100644
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -6,7 +6,7 @@ from sfa.rspecs.rspec import RSpec
 from sfa.rspecs.elements.link import Link
 from sfa.rspecs.elements.interface import Interface
 
-from sfa.managers.vini.topology import PhysicalLinks
+from sfa.util.topology import Topology
 from sfa.rspecs.version_manager import VersionManager
 from sfa.plc.vlink import get_tc_rate
 
@@ -71,7 +71,8 @@ class Aggregate:
             if not self.api.config.SFA_AGGREGATE_TYPE.lower() == 'vini':
                 return
 
-            for (site_id1, site_id2) in PhysicalLinks:
+            topology = Topology() 
+            for (site_id1, site_id2) in topology:
                 link = Link()
                 if not site_id1 in self.sites or site_id2 not in self.sites:
                     continue