SM.CreateSliver() result rspec is same format as rspec request

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

diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index a68bd31..a2033cd 100755 (executable)
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -15,6 +15,7 @@ class PGRSpec(RSpec):
     schemas =  {'xsi': 'http://www.protogeni.net/resources/rspec/0.2 http://www.protogeni.net/resources/rspec/0.2/ad.xsd'
             }
     format = 'pg'
+    format = 'protogeni'
     xml = None
 
     def get_network(self):
@@ -73,12 +74,13 @@ class PGRSpec(RSpec):
             #if 'interfaces' in node:
             
 
-    def add_slivers(self, hostnames, check_for_dupes=False): 
-        if not isinstance(hostnames, list):
-            hostnames = [hostnames]
+    def add_slivers(self, slivers, check_for_dupes=False): 
+        if not isinstance(slivers, list):
+            slivers = [slivers]
 
         nodes_with_slivers = self.get_nodes_with_slivers()
-        for hostname in hostnames:
+        for sliver in slivers:
+            hostname = sliver['hostname']
             if hostname in nodes_with_slivers:
                 continue
             nodes = self.xml.xpath('//rspecv2:node[@component_name="%s"] | //node[@component_name="%s"]' % (hostname, hostname), namespaces=self.namespaces)