X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;ds=sidebyside;f=sfa%2Fplc%2Fvlink.py;h=73ebae7959509f818df609d029b2ea557cb9b980;hb=ffa9a0fe65b4a593a2486747a375422f49d35988;hp=f942cacfee1ecb6cdc29219a92a52f4126cacbf4;hpb=b28b70593bb5ac1d3017910736b64d8f3140a90f;p=sfa.git

diff --git a/sfa/plc/vlink.py b/sfa/plc/vlink.py
index f942cacf..73ebae79 100644
--- a/sfa/plc/vlink.py
+++ b/sfa/plc/vlink.py
@@ -1,3 +1,5 @@
+
+from sfa.util.xrn import Xrn
 # Taken from bwlimit.py
 #
 # See tc_util.c and http://physics.nist.gov/cuu/Units/binary.html. Be
@@ -27,6 +29,7 @@ suffixes = {
     "tbps": 8000000000000
 }
 
+
 def get_tc_rate(s):
     """
     Parses an integer or a tc rate string (e.g., 1.5mbit) into bits/second
@@ -57,30 +60,53 @@ def format_tc_rate(rate):
     else:
         return "%.0fbit" % rate
 
-def get_virt_ip(self, remote):
-        link = self.get_link_id(remote)
-        iface = self.get_iface_id(remote)
-        first = link >> 6
-        second = ((link & 0x3f)<<2) + iface
-        return "192.168.%d.%d" % (first, second)
+class VLink:
+    @staticmethod
+    def get_link_id(if1, if2):
+        if if1['id'] < if2['id']:
+            link = (if1['id']<<7) + if2['id']
+        else:
+            link = (if2['id']<<7) + if1['id']
+        return link
 
-def get_virt_net(self, remote):
-    link = self.get_link_id(remote)
-    first = link >> 6
-    second = (link & 0x3f)<<2
-    return "192.168.%d.%d/30" % (first, second)
+    @staticmethod
+    def get_iface_id(if1, if2):
+        if if1['id'] < if2['id']:
+            iface = 1
+        else:
+            iface = 2
+        return iface
 
-def get_topo_rspec(self, link):
-    if link.end1 == self:
-        remote = link.end2
-    elif link.end2 == self:
-        remote = link.end1
-    else:
-        raise Error("Link does not connect to Node")
+    @staticmethod
+    def get_virt_ip(if1, if2):
+        link_id = get_link_id(if1, if2)
+        iface_id = get_iface_id(if1, if2)
+        first = link_id >> 6
+        second = ((link_id & 0x3f)<<2) + iface_id
+        return "192.168.%d.%s" % (frist, second)
+
+    @staticmethod
+    def get_virt_net(link):
+        link_id = self.get_link_id(link)
+        first = link_id >> 6
+        second = (link_id & 0x3f)<<2
+        return "192.168.%d.%d/30" % (first, second)
+
+    @staticmethod
+    def get_interface_id(interface):
+        if_name = Xrn(interface=interface['component_id']).get_leaf()
+        node, dev = if_name.split(":")
+        node_id = int(node.replace("pc", ""))
+        return node_id
 
-    my_ip = self.get_virt_ip(remote)
-    remote_ip = remote.get_virt_ip(self)
-    net = self.get_virt_net(remote)
-    bw = format_tc_rate(link.bps)
-    ipaddr = remote.get_primary_iface().ipv4
-    return (remote.id, ipaddr, bw, my_ip, remote_ip, net) 
+        
+    @staticmethod
+    def get_topo_rspec(link):
+        link['interface1']['id'] = VLink.get_interface_id(link['interface1'])
+        link['interface2']['id'] = VLink.get_interface_id(link['interface2'])
+        my_ip = VLink.get_virt_ip(link['interface1'], link['interface2'])
+        remote_ip = VLink.get_virt_ip(link['interface2'], link['interface1'])
+        net = VLink.get_virt_net(link)
+        bw = format_tc_rate(long(link['capacity']))
+        ipaddr = remote.get_primary_iface().ipv4
+        return (link['interface2']['id'], ipaddr, bw, my_ip, remote_ip, net)