Fix dummy driver

diff --git a/sfa/dummy/dummydriver.py b/sfa/dummy/dummydriver.py
index 5f3138f..ab2053d 100644 (file)
--- a/sfa/dummy/dummydriver.py
+++ b/sfa/dummy/dummydriver.py
@@ -424,9 +424,10 @@ class DummyDriver (Driver):
         # find out where this slice is currently running
         slice_name = hrn_to_dummy_slicename(slice_hrn)
         
-        slice = self.shell.GetSlices({'slice_name': slice_name})
+        slices = self.shell.GetSlices({'slice_name': slice_name})
         if len(slices) == 0:        
             raise SliverDoesNotExist("%s (used %s as slicename internally)" % (slice_hrn, slicename))
+        slice = slices[0]
         
         # report about the local nodes only
         nodes = self.shell.GetNodes({'node_ids':slice['node_ids']})
@@ -463,7 +464,7 @@ class DummyDriver (Driver):
             res = {}
             res['dummy_hostname'] = node['hostname']
             res['geni_expires'] = datetime_to_string(utcparse(slice['expires']))
-            sliver_id = Xrn(slice_urn, type='slice', id=node['node_id'], authority=self.hrn).urn
+            sliver_id = Xrn(slice_urn, type='slice', id=node['node_id']).urn
             res['geni_urn'] = sliver_id
             res['geni_status'] = 'ready'
             res['geni_error'] = ''

diff --git a/sfa/dummy/dummyslices.py b/sfa/dummy/dummyslices.py
index 94f226c..d334aa2 100644 (file)
--- a/sfa/dummy/dummyslices.py
+++ b/sfa/dummy/dummyslices.py
@@ -103,7 +103,7 @@ class DummySlices:
             slice['user_ids'] = []
         else:
             slice = slices[0]
-            if slice_record.get('expires'):
+            if slice_record and slice_record.get('expires'):
                 requested_expires = int(datetime_to_epoch(utcparse(slice_record['expires'])))
                 if requested_expires and slice['expires'] != requested_expires:
                     self.driver.shell.UpdateSlice( {'slice_id': slice['slice_id'], 'fields':{'expires' : requested_expires}})