From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 3 May 2011 20:27:25 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
X-Git-Tag: sfa-1.0-21-ckp1~5
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=c815253316e79c64ae8f6bb6c4a1a20934857cfc;hp=92abde232f2d0349616cbecdf0482d86f6dd1509;p=sfa.git

Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
---

diff --git a/sfa/client/sfiAddSliver.py b/sfa/client/sfiAddSliver.py
index 2b9668b5..1016b90f 100755
--- a/sfa/client/sfiAddSliver.py
+++ b/sfa/client/sfiAddSliver.py
@@ -30,5 +30,5 @@ nodes = file(command.opts.nodefile).read().split()
 try:
     rspec.add_slivers(nodes)
 except:
-    print >> sys.stderr, "FAILED: %s" % node
+    print >> sys.stderr, "FAILED: %s" % nodes
 print >>outfile, rspec.toxml()
diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py
index 75fdc8b6..7bb94edc 100644
--- a/sfa/managers/aggregate_manager_pl.py
+++ b/sfa/managers/aggregate_manager_pl.py
@@ -203,7 +203,7 @@ def CreateSliver(api, slice_xrn, creds, rspec_string, users, call_id):
             api.plshell.BindObjectToPeer(api.plauth, 'slice', slice.id, peer, 
                                          slice.peer_id)
 
-    return aggregate.get_rspec(slice_xrn=slice_xrn)
+    return aggregate.get_rspec(slice_xrn=slice_xrn, version=RSpecVersion("pg"))
 
 
 def RenewSliver(api, xrn, creds, expiration_time, call_id):
diff --git a/sfa/rspecs/pg_rspec.py b/sfa/rspecs/pg_rspec.py
index 109c2cfd..194361e4 100755
--- a/sfa/rspecs/pg_rspec.py
+++ b/sfa/rspecs/pg_rspec.py
@@ -82,7 +82,7 @@ class PGRSpec(RSpec):
         for hostname in hostnames:
             if hostname in nodes_with_slivers:
                 continue
-            nodes = self.xml.xpath('//rspecv2:node[@component_name="%s"]' % hostname, namespaces=self.namespaces)
+            nodes = self.xml.xpath('//rspecv2:node[@component_name="%s"] | //node[@component_name="%s"]' % (hostname, hostname), namespaces=self.namespaces)
             if nodes:
                 node = nodes[0]
                 node.set('client_id', hostname)
diff --git a/sfa/rspecs/rspec_version.py b/sfa/rspecs/rspec_version.py
index 98ff7453..5caa5442 100644
--- a/sfa/rspecs/rspec_version.py
+++ b/sfa/rspecs/rspec_version.py
@@ -2,12 +2,10 @@
 from sfa.util.sfalogging import _SfaLogger
 
 
-DEFAULT_FORMAT='sfa'
-DEFAULT_VERSION_NUMBER=1
 class RSpecVersion:
 
-    format = None
-    version = None
+    format = 'sfa'
+    version = '1'
     schema = None
     namespace = None
     extensions = []
@@ -19,21 +17,15 @@ class RSpecVersion:
     def parse_version_string(self, version_string):
         # version_raw is currently a string but will 
         # eventually be a struct.
-        try:
-            format_split = version_string.split(' ')
-            format, version = format_split[0].lower(), format_split[1]
-        except:
-            self.logger.info("RSpecVersion: invalid rspec version string: %s , using default" \
-                        % version_string)
-            # invalid format. Just continue
-            format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER
-
-        self.format = format
-        self.version = version 
+        format_split = version_string.split(' ')
+        try: self.format = format_split[0].lower()  
+        except: pass
+        try: self.version = format_split[1]
+        except: pass
     
 
     def parse_version_struct(self, version_struct):
         try:
             pass
         except:
-            format, version = DEFAULT_FORMAT, DEFAULT_VERSION_NUMBER
+            pass
diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py
index bb4dffe6..1d320a50 100644
--- a/sfa/trust/rights.py
+++ b/sfa/trust/rights.py
@@ -57,10 +57,10 @@ def determine_rights(type, name):
         rl.add("refresh")
         rl.add("resolve")
         rl.add("info")
-    elif type == "sa":
+    elif type in ["sa", "authority+sa"]:
         rl.add("authority")
         rl.add("sa")
-    elif type == "ma":
+    elif type ["ma", "authority+ma"]::
         rl.add("authority")
         rl.add("ma")
     elif type == "authority":