X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fplc%2Faggregate.py;h=77784cb6afdf5ba678786192115de33b6d844308;hb=7e98e838172ffb4b70199705c032b74ef3901691;hp=7603b5afaa926bcfd76ba5e851ef5b4379b6cfcc;hpb=149531f3b85223198abfbf70f50d45dd328cf81f;p=sfa.git

diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py
index 7603b5af..77784cb6 100644
--- a/sfa/plc/aggregate.py
+++ b/sfa/plc/aggregate.py
@@ -1,12 +1,12 @@
 #!/usr/bin/python
-from sfa.util.xrn import *
-from sfa.util.plxrn import *
-#from sfa.rspecs.sfa_rspec import SfaRSpec
-#from sfa.rspecs.pg_rspec  import PGRSpec
-#from sfa.rspecs.rspec_version import RSpecVersion
+from sfa.util.xrn import hrn_to_urn, urn_to_hrn
+from sfa.util.plxrn import PlXrn, hostname_to_urn, hrn_to_pl_slicename
 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.rspecs.version_manager import VersionManager
-from sfa.util.bw_limit import get_tc_rate
+from sfa.plc.vlink import get_tc_rate
 
 class Aggregate:
 
@@ -54,7 +54,39 @@ class Aggregate:
 
     def prepare_links(self, force=False):
         if not self.links or force:
-            pass
+            if not self.api.config.SFA_AGGREGATE_TYPE.lower() == 'vini':
+                return
+
+            for (site_id1, site_id2) in PhysicalLinks:
+                link = Link()
+                if not site_id1 in self.sites or site_id2 not in self.sites:
+                    continue
+                site1 = self.sites[site_id1]
+                site2 = self.sites[site_id2]
+                # get hrns
+                site1_hrn = self.api.hrn + '.' + site1['login_base']
+                site2_hrn = self.api.hrn + '.' + site2['login_base']
+                # get the first node
+                node1 = self.nodes[site1['node_ids'][0]]
+                node2 = self.nodes[site2['node_ids'][0]]
+
+                # set interfaces
+                # just get first interface of the first node
+                if1_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node1['node_id']))
+                if2_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node2['node_id']))
+
+                if1 = Interface({'component_id': if1_xrn.urn} )
+                if2 = Interface({'component_id': if2_xrn.urn} )
+
+                # set link
+                link = Link({'capacity': '1000000', 'latency': '0', 'packet_loss': '0', 'type': 'ipv4'})
+                link['interface1'] = if1
+                link['interface2'] = if2
+                link['component_name'] = "%s:%s" % (site1['login_base'], site2['login_base'])
+                link['component_id'] = PlXrn(auth=self.api.hrn, interface=link['component_name']).get_urn()
+                link['component_manager_id'] =  hrn_to_urn(self.api.hrn, 'authority+am')
+                self.links[link['component_name']] = link
+
 
     def prepare_node_tags(self, force=False):
         if not self.node_tags or force: