git://git.onelab.eu
/
sfa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0249aa4
)
fix various bugs
author
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sun, 30 Oct 2011 17:35:35 +0000
(13:35 -0400)
committer
Tony Mack
<tmack@paris.CS.Princeton.EDU>
Sun, 30 Oct 2011 17:35:35 +0000
(13:35 -0400)
sfa/plc/vlink.py
patch
|
blob
|
history
diff --git
a/sfa/plc/vlink.py
b/sfa/plc/vlink.py
index
42a497e
..
625963d
100644
(file)
--- a/
sfa/plc/vlink.py
+++ b/
sfa/plc/vlink.py
@@
-1,4
+1,4
@@
-
+import re
from sfa.util.xrn import Xrn
# Taken from bwlimit.py
#
from sfa.util.xrn import Xrn
# Taken from bwlimit.py
#
@@
-79,24
+79,24
@@
class VLink:
@staticmethod
def get_virt_ip(if1, if2):
@staticmethod
def get_virt_ip(if1, if2):
- link_id = get_link_id(if1, if2)
- iface_id = get_iface_id(if1, if2)
+ link_id =
VLink.
get_link_id(if1, if2)
+ iface_id =
VLink.
get_iface_id(if1, if2)
first = link_id >> 6
second = ((link_id & 0x3f)<<2) + iface_id
first = link_id >> 6
second = ((link_id & 0x3f)<<2) + iface_id
- return "192.168.%d.%s" % (f
ri
st, second)
+ return "192.168.%d.%s" % (f
ir
st, second)
@staticmethod
def get_virt_net(link):
@staticmethod
def get_virt_net(link):
- link_id =
self.get_link_id(link
)
+ link_id =
VLink.get_link_id(link['interface1'], link['interface2']
)
first = link_id >> 6
second = (link_id & 0x3f)<<2
return "192.168.%d.%d/30" % (first, second)
@staticmethod
def get_interface_id(interface):
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()
+ if_name = Xrn(interface['component_id']).get_leaf()
node, dev = if_name.split(":")
node, dev = if_name.split(":")
- node_id = int(node.replace("
pc
", ""))
+ node_id = int(node.replace("
node
", ""))
return node_id
return node_id