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

diff --git a/setup.py b/setup.py
index 61c087e..c28e38d 100755 (executable)
--- 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/registries.xml',
                               'config/default_config.xml',
                               'config/sfi_config',

+                              'config/topology',

                               'sfa/managers/pl/pl.rng',
                               'sfa/trust/credential.xsd',
                               'sfa/trust/top.xsd',
                               '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 4cbeff7..4c398f9 100644 (file)
--- 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.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
 
 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
 
             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
                 link = Link()
                 if not site_id1 in self.sites or site_id2 not in self.sites:
                     continue