ListResources uses the 'rspec_version' field specified in the 'options' struct to...

[sfa.git] / sfa / rspecs / pg_rspec.py

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 8b452f4..569c342 100755 (executable)
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -6,24 +6,20 @@ from sfa.util.xrn import *
 from sfa.util.plxrn import hostname_to_urn
 from sfa.util.config import Config  
 
+
 class PGRSpec(RSpec):
-    xml = None
     header = '<?xml version="1.0"?>\n'
+    template = """
+<rspec xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.protogeni.net/resources/rspec/0.2" xsi:schemaLocation="http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd">\n
+</rspec>
+"""
     namespaces = {'rspecv2':'http://www.protogeni.net/resources/rspec/0.2',
                   'xsi': 'http://www.w3.org/2001/XMLSchema-instance'
                  }
     schemas =  {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
             }
-
-    def create(self, type="advertisement"):
-        RSpec.create(self)
-        for namespace in self.namespaces:
-            xmlns = "xmlns"
-            if namespace not in 'rspecv2':
-                xmlns = xmlns + ":" + namespace
-            self.xml.set(xmlns, self.namespaces[namespace])
-        for schema in self.schemas:
-            self.xml.set(schema+":schemaLocation", self.schemas[schema])
+    format = 'pg'
+    xml = None
 
     def get_network(self):
         network = None 
@@ -32,10 +28,26 @@ class PGRSpec(RSpec):
             network  = nodes[0].get('component_manager_uuid')
         return network
 
-    def get_nodes(self, nodes_with_slivers=False):
+    def get_networks(self):
+        networks = self.xml.xpath('//rspecv2:node[@component_manager_uuid]/@component_manager_uuid')
+        return set(networks)
+
+    def get_node_elements(self):
         nodes = self.xml.xpath('//rspecv2:node', self.namespaces)
         return nodes
 
+    def get_nodes(self, network=None):
+        return self.xml.xpath('//rspecv2:node[@component_uuid]/@component_uuid', self.namespaces) 
+
+    def get_nodes_with_slivers(self, network=None):
+        if network:
+            return self.xml.xpath('//node[@component_manager_uuid="%s"][sliver_type]/@component_uuid' % network, self.namespaces)
+        else:
+            return self.xml.xpath('//node[sliver_type]/@component_uuid' % network, self.namespaces)
+
+    def get_nodes_without_slivers(self, network=None):
+        pass
+
     def add_nodes(self, nodes, check_for_dupes=False):
         if not isinstance(nodes, list):
             nodes = [nodes]
@@ -57,6 +69,9 @@ class PGRSpec(RSpec):
     def add_slivers(self, slivers, check_for_dupes=False): 
         pass
 
+    def add_interfaces(self, interfaces, check_for_dupes=False):
+        pass
+
     def add_links(self, links, check_for_dupes=False):
         pass