From 71f92cadac063b4e860a7bf7e7f287ee292bc426 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 30 Oct 2011 13:35:35 -0400 Subject: [PATCH] fix various bugs --- sfa/plc/vlink.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/sfa/plc/vlink.py b/sfa/plc/vlink.py index 42a497e8..625963d0 100644 --- 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 # @@ -79,24 +79,24 @@ class VLink: @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 - return "192.168.%d.%s" % (frist, second) + return "192.168.%d.%s" % (first, second) @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): - if_name = Xrn(interface=interface['component_id']).get_leaf() + if_name = Xrn(interface['component_id']).get_leaf() node, dev = if_name.split(":") - node_id = int(node.replace("pc", "")) + node_id = int(node.replace("node", "")) return node_id -- 2.43.0