From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Thu, 20 Oct 2011 21:05:14 +0000 (-0400)
Subject: renaming
X-Git-Tag: sfa-1.1-1~78
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=795ed43b5fa9ee49af6168437953beef0a295257

renaming
---

diff --git a/sfa/util/bwlimit.py b/sfa/util/vlink.py
similarity index 65%
rename from sfa/util/bwlimit.py
rename to sfa/util/vlink.py
index 62d3cca5..f942cacf 100644
--- a/sfa/util/bwlimit.py
+++ b/sfa/util/vlink.py
@@ -56,3 +56,31 @@ def format_tc_rate(rate):
         return "%.0fkbit" % (rate / 1000.)
     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)
+
+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)
+
+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")
+
+    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)