From 3dc90bacaf8a63921b50d713e0546a68b047af3d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Sun, 30 Oct 2011 11:43:52 -0400 Subject: [PATCH] id ipaddress attribute to interface tag --- sfa/plc/aggregate.py | 7 +++++-- sfa/rspecs/elements/versions/pgv2Link.py | 1 - sfa/rspecs/versions/sfav1.py | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/sfa/plc/aggregate.py b/sfa/plc/aggregate.py index 8b1d2219..35123092 100644 --- a/sfa/plc/aggregate.py +++ b/sfa/plc/aggregate.py @@ -74,10 +74,12 @@ class Aggregate: # set interfaces # just get first interface of the first node if1_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node1['node_id'])) + if1_ipv4 = self.interfaces[node1['interface_ids'][0]]['ip'] if2_xrn = PlXrn(auth=self.api.hrn, interface='node%s:eth0' % (node2['node_id'])) + if2_ipv4 = self.interfaces[node2['interface_ids'][0]]['ip'] - if1 = Interface({'component_id': if1_xrn.urn} ) - if2 = Interface({'component_id': if2_xrn.urn} ) + if1 = Interface({'component_id': if1_xrn.urn, 'ipv4': if1_ipv4} ) + if2 = Interface({'component_id': if2_xrn.urn, 'ipv4': if2_ipv4} ) # set link link = Link({'capacity': '1000000', 'latency': '0', 'packet_loss': '0', 'type': 'ipv4'}) @@ -135,6 +137,7 @@ class Aggregate: slices = self.api.plshell.GetSlices(self.api.plauth, slice_name) if slices: slice = slices[0] + self.prepare(slice=slice) else: self.prepare() diff --git a/sfa/rspecs/elements/versions/pgv2Link.py b/sfa/rspecs/elements/versions/pgv2Link.py index e39ef35d..851fd6ea 100644 --- a/sfa/rspecs/elements/versions/pgv2Link.py +++ b/sfa/rspecs/elements/versions/pgv2Link.py @@ -38,7 +38,6 @@ class PGv2Link: latency=link['latency'], packet_loss=link['packet_loss']) if 'type' in link and link['type']: type_elem = etree.SubElement(link_elem, 'link_type', name=link['type']) - @staticmethod def get_links(xml): links = [] diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index f938463f..8f2c603f 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -218,7 +218,8 @@ class SFAv1(BaseVersion): if 'bwlimit' in interface and interface['bwlimit']: bwlimit = etree.SubElement(node_tag, 'bw_limit', units='kbps').text = str(interface['bwlimit']/1000) comp_id = PlXrn(auth=network, interface='node%s:eth%s' % (node['node_id'], i)).get_urn() - interface_tag = etree.SubElement(node_tag, 'interface', component_id=comp_id) + ipaddr = interface['ip'] + interface_tag = etree.SubElement(node_tag, 'interface', component_id=comp_id, ipv4=ipaddr) i+=1 if 'bw_unallocated' in node: bw_unallocated = etree.SubElement(node_tag, 'bw_unallocated', units='kbps').text = str(node['bw_unallocated']/1000) -- 2.43.0