git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rspecs pgv3 enhirits everything from pgv2
[sfa.git]
/
sfa
/
rspecs
/
versions
/
pgv3.py
diff --git
a/sfa/rspecs/versions/pgv3.py
b/sfa/rspecs/versions/pgv3.py
index
0de84bb
..
6d6a449
100644
(file)
--- a/
sfa/rspecs/versions/pgv3.py
+++ b/
sfa/rspecs/versions/pgv3.py
@@
-1,5
+1,4
@@
from sfa.rspecs.versions.pgv2 import PGv2
from sfa.rspecs.versions.pgv2 import PGv2
-from sfa.rspecs.elements.v3.node import Node
class GENIv3(PGv2):
type = 'GENI'
class GENIv3(PGv2):
type = 'GENI'
@@
-25,7
+24,7
@@
class GENIv3Ad(GENIv3):
<opstate:sliver_type name="plab-vserver" />
<opstate:sliver_type name="plos-pc" />
<opstate:state name="geni_notready">
<opstate:sliver_type name="plab-vserver" />
<opstate:sliver_type name="plos-pc" />
<opstate:state name="geni_notready">
- <opstate:action name="geni_start" next="geni_
configuring
">
+ <opstate:action name="geni_start" next="geni_
ready
">
<opstate:description>Boot the node</opstate:description>
</opstate:action>
<opstate:description>VMs begin powered down or inactive. They
<opstate:description>Boot the node</opstate:description>
</opstate:action>
<opstate:description>VMs begin powered down or inactive. They
@@
-53,10
+52,3
@@
class GENIv2Manifest(GENIv3):
content_type = 'manifest'
schema = 'http://www.geni.net/resources/rspec/3/manifest.xsd'
template = '<rspec type="manifest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.geni.net/resources/rspec/3" xmlns:plos="http://www.planet-lab.org/resources/sfa/ext/plos/1" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xmlns:ssh-user="http://www.geni.net/resources/rspec/ext/user/1" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/manifest.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd http://www.planet-lab.org/resources/sfa/ext/plos/1 http://www.planet-lab.org/resources/sfa/ext/plos/1/plos.xsd http://www.geni.net/resources/rspec/ext/user/1 http://www.geni.net/resources/rspec/ext/user/1/manifest.xsd"/>'
content_type = 'manifest'
schema = 'http://www.geni.net/resources/rspec/3/manifest.xsd'
template = '<rspec type="manifest" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.geni.net/resources/rspec/3" xmlns:plos="http://www.planet-lab.org/resources/sfa/ext/plos/1" xmlns:flack="http://www.protogeni.net/resources/rspec/ext/flack/1" xmlns:planetlab="http://www.planet-lab.org/resources/sfa/ext/planetlab/1" xmlns:ssh-user="http://www.geni.net/resources/rspec/ext/user/1" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/manifest.xsd http://www.planet-lab.org/resources/sfa/ext/planetlab/1 http://www.planet-lab.org/resources/sfa/ext/planetlab/1/planetlab.xsd http://www.planet-lab.org/resources/sfa/ext/plos/1 http://www.planet-lab.org/resources/sfa/ext/plos/1/plos.xsd http://www.geni.net/resources/rspec/ext/user/1 http://www.geni.net/resources/rspec/ext/user/1/manifest.xsd"/>'
-
-
- 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)