From: Josh Karlin <jkarlin@bbn.com>
Date: Thu, 25 Mar 2010 19:49:14 +0000 (+0000)
Subject: ListResources now supports slice lookups
X-Git-Tag: geni-apiv1-totrunk~89
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=4e0510bbf60893400b6744dca240c1656f2c018f;p=sfa.git

ListResources now supports slice lookups
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index c6b0a616..92fe1ff4 100755
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -912,6 +912,13 @@ class Sfi:
         user_cred = self.get_user_cred().save_to_string(save_parents=True)
         server = self.geni_am
         call_options = {'geni_compressed': True}
+        if args:
+            urn = args[0]
+        else:
+            urn = None
+        if urn:
+            call_options['geni_slice_urn'] = urn
+            
         rspec = server.ListResources([user_cred], call_options)
         rspec = zlib.decompress(rspec.decode('base64'))
         print rspec
diff --git a/sfa/managers/geni_am_pl.py b/sfa/managers/geni_am_pl.py
index afa747aa..f144430e 100644
--- a/sfa/managers/geni_am_pl.py
+++ b/sfa/managers/geni_am_pl.py
@@ -33,11 +33,13 @@ def ListResources(api, creds, options):
     manager_module = manager_base + ".aggregate_manager_%s" % mgr_type
     manager = __import__(manager_module, fromlist=[manager_base])
 
-    urn = None
+    hrn = None
     if options.has_key('geni_slice_urn'):
-        urn = options['geni_slice_urn']
+        xrn = options['geni_slice_urn']
+        hrn, type = urn_to_hrn(xrn)
 
-    rspec = manager.get_rspec(api, urn, None)
+
+    rspec = manager.get_rspec(api, hrn, None)
     #outgoing_rules = SFATablesRules('OUTGOING')
     
     if options.has_key('geni_compressed') and options['geni_compressed'] == True:
diff --git a/sfa/trust/gid.py b/sfa/trust/gid.py
index 5c7b7354..d62e43e1 100644
--- a/sfa/trust/gid.py
+++ b/sfa/trust/gid.py
@@ -8,7 +8,6 @@
 
 import xmlrpclib
 import uuid
-
 from sfa.trust.certificate import Certificate
 from sfa.util.namespace import *
 ##
@@ -59,7 +58,7 @@ class GID(Certificate):
         
         Certificate.__init__(self, create, subject, string, filename)
         if uuid:
-            self.uuid = uuid
+            self.uuid = int(uuid)
         if hrn:
             self.hrn = hrn
         if urn: