From 9d79eb497fc00be01f7b1b5a9f25ca5b16442948 Mon Sep 17 00:00:00 2001 From: Tony Mack <tmack@paris.CS.Princeton.EDU> Date: Mon, 24 Oct 2011 17:18:18 -0400 Subject: [PATCH] Removed RSpecElements from elements list --- sfa/rspecs/versions/pgv2.py | 6 +----- sfa/rspecs/versions/sfav1.py | 6 +----- 2 files changed, 2 insertions(+), 10 deletions(-) diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 79fba2d9..3e995ad9 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -18,11 +18,7 @@ class PGv2(BaseVersion): 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1", } namespaces = dict(extensions.items() + [('default', namespace)]) - elements = [ - RSpecElement(RSpecElements.NETWORK, 'network', '//default:node[@component_manager_id][1]'), - RSpecElement(RSpecElements.NODE, 'node', '//default:node | //node'), - RSpecElement(RSpecElements.SLIVER, 'sliver', '//default:node/default:sliver_type | //node/sliver_type'), - ] + elements = [] def get_network(self): network = None diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index 43ea6f31..06f277a1 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -13,11 +13,7 @@ class SFAv1(BaseVersion): namespace = None extensions = {} namespaces = None - elements = [ - RSpecElement(RSpecElements.NETWORK, 'network', '//network'), - RSpecElement(RSpecElements.NODE, 'node', '//node'), - RSpecElement(RSpecElements.SLIVER, 'sliver', '//node/sliver'), - ] + elements = [] template = '<RSpec type="%s"></RSpec>' % type def get_network_elements(self): -- 2.47.0