X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fpgv2.py;h=3f808514e8d4d1c66442ab48d5a92b20edb7c91a;hb=e6ac76af8cdf65194b5f3e8c500218fdeaa9ee3d;hp=5f5ae70322e5acf66c621999f111cbd8c4260b2a;hpb=79050c97d1c028550215094f0b7c8bcaae875d0d;p=sfa.git
diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index 5f5ae703..3f808514 100644
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -7,6 +7,16 @@ from sfa.rspecs.rspec_version import BaseVersion
from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
class PGv2(BaseVersion):
+ type = 'ProtoGENI'
+ content_type = 'ad'
+ version = '2'
+ schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd'
+ namespace = 'http://www.protogeni.net/resources/rspec/2'
+ extensions = {
+ 'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
+ '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'),
@@ -143,10 +153,12 @@ class PGv2(BaseVersion):
# all nodes hould already be present in the rspec. Remove all
# nodes that done have slivers
- slivers = self._process_slivers(slivers)
slivers_dict = {}
for sliver in slivers:
- slivers_dict[sliver['hostname']] = sliver
+ if isinstance(sliver, basestring):
+ slivers_dict[sliver] = {'hostname': sliver}
+ elif isinstance(sliver, dict):
+ slivers_dict[sliver['hostname']] = sliver
nodes = self.get_node_elements()
for node in nodes:
@@ -207,41 +219,20 @@ class PGv2(BaseVersion):
class PGv2Ad(PGv2):
enabled = True
- type = 'ProtoGENI'
content_type = 'ad'
- version = '2'
schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd'
- namespace = 'http://www.protogeni.net/resources/rspec/2'
- extensions = {
- 'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
- 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
- }
template = ''
class PGv2Request(PGv2):
enabled = True
- type = 'ProtoGENI'
content_type = 'request'
- version = '2'
schema = 'http://www.protogeni.net/resources/rspec/2/request.xsd'
- namespace = 'http://www.protogeni.net/resources/rspec/2'
- extensions = {
- 'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
- 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
- }
template = ''
class PGv2Manifest(PGv2):
enabled = True
- type = 'ProtoGENI'
content_type = 'manifest'
- version = '2'
schema = 'http://www.protogeni.net/resources/rspec/2/manifest.xsd'
- namespace = 'http://www.protogeni.net/resources/rspec/2'
- extensions = {
- 'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
- 'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
- }
template = ''