From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Fri, 13 Dec 2013 14:35:44 +0000 (+0100)
Subject: Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
X-Git-Tag: sfa-3.1-2~50
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=a0ecdcce6c47700324b8cdb94951ab11392b4642;hp=fae309c53ba7e65f1b51047d8c8fbb7a10477713;p=sfa.git

Merge branch 'geni-v3' of ssh://git.onelab.eu/git/sfa into geni-v3
---

diff --git a/sfa/client/sfi.py b/sfa/client/sfi.py
index 157828eb..6e60f636 100644
--- a/sfa/client/sfi.py
+++ b/sfa/client/sfi.py
@@ -392,8 +392,8 @@ class Sfi:
                               help="display version of the local client")
 
         if command in ("version", "trusted"):
-            parser.add_option("-R","--registry-interface",
-                              action="store_true", dest="registry-interface", default=False,
+            parser.add_option("-R","--registry_interface",
+                              action="store_true", dest="registry_interface", default=False,
                               help="target the registry interface instead of slice interface")
 
         if command in ("add", "update"):
@@ -880,7 +880,7 @@ use this if you mean an authority instead""")
         if options.version_local:
             version=version_core()
         else:
-            if options.registry-interface:
+            if options.registry_interface:
                 server=self.registry()
             else:
                 server = self.sliceapi()
@@ -1618,13 +1618,13 @@ $ sfi m -b http://mymanifold.foo.com:7080/
         """
         return the trusted certs at this interface (get_trusted_certs)
         """ 
-        if options.registry-interface:
+        if options.registry_interface:
             server=self.registry()
         else:
             server = self.sliceapi()
         cred = self.my_authority_credential_string()
         trusted_certs = server.get_trusted_certs(cred)
-        if not options.registry-interface:
+        if not options.registry_interface:
             trusted_certs = ReturnValue.get_value(trusted_certs)
 
         for trusted_cert in trusted_certs:
diff --git a/sfa/planetlab/plslices.py b/sfa/planetlab/plslices.py
index 5e106cdc..9a118ada 100644
--- a/sfa/planetlab/plslices.py
+++ b/sfa/planetlab/plslices.py
@@ -377,9 +377,15 @@ class PlSlices:
         slice_exists = [slice for slice in slices if slice['hrn'] == slice_hrn]
         expires = int(datetime_to_epoch(utcparse(expiration)))
         if not slice_exists:
+            if slice_record:
+                url = slice_record.get('url', slice_hrn)
+                description = slice_record.get('description', slice_hrn)
+            else:
+                url = slice_hrn
+                description = slice_hrn
             slice = {'name': slice_name,
-                     'url': slice_record.get('url', slice_hrn),
-                     'description': slice_record.get('description', slice_hrn)}
+                     'url': url,
+                     'description': description}
             # add the slice                          
             slice['slice_id'] = self.driver.shell.AddSlice(slice)
             # set the slice HRN