From: Tony Mack Date: Sun, 30 Oct 2011 15:19:49 +0000 (-0400) Subject: finish get_topo_rspec() X-Git-Tag: sfa-1.1-3~106 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=8fefaa407b6b21851cec1dd70da3982e066a8b4c;hp=3c7563cc3487b6f6557881503ed3fb4403a3ef05;p=sfa.git finish get_topo_rspec() --- diff --git a/sfa/plc/vlink.py b/sfa/plc/vlink.py index 73ebae79..42a497e8 100644 --- a/sfa/plc/vlink.py +++ b/sfa/plc/vlink.py @@ -101,12 +101,15 @@ class VLink: @staticmethod - def get_topo_rspec(link): + def get_topo_rspec(link, ipaddr): 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) + return (link['interface2']['id'], ipaddr, bw, my_ip, remote_ip, net) + + @staticmethod + def topo_rspec_to_link(topo_rspec): + pass