From 8506910c01e6b2bb0ac58c83e1d40223c84f3171 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 4 Oct 2011 14:59:23 -0400 Subject: [PATCH] fix AttributeErrors --- sfa/rspecs/versions/pgv2.py | 2 +- sfa/rspecs/versions/sfav1.py | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 8286fa4b..27401d7b 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -223,7 +223,7 @@ class PGv2(BaseVersion): # remove unncecessary elements, attributes if self.type in ['request', 'manifest']: # remove 'available' element from remaining node elements - self.remove_element('//default:available | //available') + self.xml.remove_element('//default:available | //available') class PGv2Ad(PGv2): enabled = True diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index d3b1c542..4712d955 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -286,27 +286,27 @@ class SFAv1(BaseVersion): network_tag = self.xml.xpath("//network[@name='%s']" % network) if isinstance(network_tag, list): network_tag = network_tag[0] - defaults = self.add_element('sliver_defaults', attrs={}, parent=network_tag) + defaults = self.xml.add_element('sliver_defaults', attrs={}, parent=network_tag) elif isinstance(defaults, list): defaults = defaults[0] - self.add_attribute(defaults, name, value) + self.xml.add_attribute(defaults, name, value) def add_sliver_attribute(self, hostname, name, value, network=None): node = self.get_node_element(hostname, network) sliver = node.find("sliver") - self.add_attribute(sliver, name, value) + self.xml.add_attribute(sliver, name, value) def remove_default_sliver_attribute(self, name, value, network=None): if network: defaults = self.xml.xpath("//network[@name='%s']/sliver_defaults" % network) else: defaults = self.xml.xpath("//sliver_defaults" % network) - self.remove_attribute(defaults, name, value) + self.xml.remove_attribute(defaults, name, value) def remove_sliver_attribute(self, hostname, name, value, network=None): node = self.get_node_element(hostname, network) sliver = node.find("sliver") - self.remove_attribute(sliver, name, value) + self.xml.remove_attribute(sliver, name, value) def add_vlink(self, fromhost, tohost, kbps, network=None): fromnode = self.get_node_element(fromhost, network) @@ -318,7 +318,7 @@ class SFAv1(BaseVersion): fromid = fromnode.get("id") toid = tonode.get("id") vlink.set("endpoints", "%s %s" % (fromid, toid)) - self.add_attribute(vlink, "kbps", kbps) + self.xml.add_attribute(vlink, "kbps", kbps) def remove_vlink(self, endpoints, network=None): -- 2.43.0