X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fpgv3.py;h=a4413c16f65dc5e8b166f52a28fb0ec089d2d405;hb=refs%2Ftags%2Fsfa-3.0-2-bonfire-r1-2;hp=6bedec6ace9896da95b2ae35c673775c0893ef27;hpb=0d88de5aaee6820835f2d9770aab6c7392f14e21;p=sfa.git
diff --git a/sfa/rspecs/versions/pgv3.py b/sfa/rspecs/versions/pgv3.py
index 6bedec6a..a4413c16 100644
--- a/sfa/rspecs/versions/pgv3.py
+++ b/sfa/rspecs/versions/pgv3.py
@@ -1,4 +1,5 @@
from sfa.rspecs.versions.pgv2 import PGv2
+from sfa.rspecs.elements.v3.node import Node
class GENIv3(PGv2):
type = 'GENI'
@@ -9,6 +10,7 @@ class GENIv3(PGv2):
extensions = {
'flack': "http://www.protogeni.net/resources/rspec/ext/flack/1",
'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
+ 'plos': "http://www.planet-lab.org/resources/sfa/ext/plos/1",
}
namespaces = dict(extensions.items() + [('default', namespace)])
elements = []
@@ -18,17 +20,43 @@ class GENIv3Ad(GENIv3):
enabled = True
content_type = 'ad'
schema = 'http://www.geni.net/resources/rspec/3/ad.xsd'
- template = ''
+ template = """
+
+
+
+
+
+ Boot the node
+
+ VMs begin powered down or inactive. They
+ must be explicitly booted before use.
+
+
+ The node is up and ready to use.
+
+
+ The node has failed and requires administrator
+ intervention before it can be used. Please contact support
+ for assistance.
+
+
+"""
class GENIv3Request(GENIv3):
enabled = True
content_type = 'request'
schema = 'http://www.geni.net/resources/rspec/3/request.xsd'
- template = ''
+ template = ''
class GENIv2Manifest(GENIv3):
enabled = True
content_type = 'manifest'
schema = 'http://www.geni.net/resources/rspec/3/manifest.xsd'
- template = ''
-
+ template = ''
+
+
+ def add_nodes(self, nodes, check_for_dupes=False):
+ return Node.add_nodes(self.xml, nodes)
+
+ def get_nodes(self, filter=None):
+ return Node.get_nodes(self.xml, filter)