From 387224b6673a3f256ff9ff4fc1e2e0b6beda9897 Mon Sep 17 00:00:00 2001 From: Loic Baron Date: Thu, 31 Jul 2014 11:41:39 +0200 Subject: [PATCH] ofelia rspecs: default parameter for filter is None --- sfa/rspecs/elements/versions/ofeliav1datapath.py | 5 ++--- sfa/rspecs/elements/versions/ofeliav1link.py | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/sfa/rspecs/elements/versions/ofeliav1datapath.py b/sfa/rspecs/elements/versions/ofeliav1datapath.py index a1849735..01390c0b 100644 --- a/sfa/rspecs/elements/versions/ofeliav1datapath.py +++ b/sfa/rspecs/elements/versions/ofeliav1datapath.py @@ -22,7 +22,7 @@ class Ofeliav1Datapath: @staticmethod def get_datapaths(xml, filter=None): - if filter is None: filter={} + if filter is None: filter = {} #xpath = '//datapath%s | //default:datapath%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) xpath = '//datapath%s | //openflow:datapath%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) datapath_elems = xml.xpath(xpath) @@ -145,8 +145,7 @@ class Ofeliav1Datapath: # node.element.remove(sliver.element) # # @staticmethod -# def get_nodes(xml, filter=None): -# if filter is None: filter={} +# def get_nodes(xml, filter={}): # xpath = '//node%s | //default:node%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) # node_elems = xml.xpath(xpath) # return SFAv1Node.get_node_objs(node_elems) diff --git a/sfa/rspecs/elements/versions/ofeliav1link.py b/sfa/rspecs/elements/versions/ofeliav1link.py index 83a20969..3a32f217 100644 --- a/sfa/rspecs/elements/versions/ofeliav1link.py +++ b/sfa/rspecs/elements/versions/ofeliav1link.py @@ -9,7 +9,7 @@ class Ofeliav1Link: @staticmethod def get_links(xml, filter=None): - if filter is None: filter={} + if filter is None: filter = {} xpath = '//link%s | //openflow:link%s' % (XpathFilter.xpath(filter), XpathFilter.xpath(filter)) link_elems = xml.xpath(xpath) return Ofeliav1Link.get_link_objs(link_elems) -- 2.43.0