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 43b744c..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.elements.v3.node import Node 
 
 class GENIv3(PGv2):
     type = 'GENI'
@@ -20,24 +19,17 @@ class GENIv3Ad(GENIv3):
     enabled = True
     content_type = 'ad'
     schema = 'http://www.geni.net/resources/rspec/3/ad.xsd'
-    template = """<rspec type="advertisement" 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:opstate="http://www.geni.net/resources/rspec/ext/opstate/1" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/ad.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/opstate/1 http://www.protogeni.net/resources/rspec/ext/opstate/1/ad.xsd">
+    template = """<rspec type="advertisement" 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:opstate="http://www.geni.net/resources/rspec/ext/opstate/1" xsi:schemaLocation="http://www.geni.net/resources/rspec/3 http://www.geni.net/resources/rspec/3/ad.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/opstate/1 http://www.geni.net/resources/rspec/ext/opstate/1/ad.xsd">
     <opstate:rspec_opstate aggregate_manager_id="urn:publicid:IDN+plc+authority+cm" start="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
         must be explicitly booted before use.</opstate:description>
       </opstate:state>
-      <opstate:state name="geni_configuring">
-        <opstate:wait type="geni_success" next="geni_ready" />
-        <opstate:wait type="geni_failure" next="geni_failed" />
-        <opstate:description>Booting takes a significant amount of time, so it
-        happens asynchronously while the node is in this
-        state.</opstate:description>
-      </opstate:state>
       <opstate:state name="geni_ready">
         <opstate:description>The node is up and ready to use.</opstate:description>
       </opstate:state>
@@ -60,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"/>'
-
-
-    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)