fix sliver id in sliver status and list resources

diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py
index 11ea26b..e74a7de 100644 (file)
--- a/sfa/planetlab/plaggregate.py
+++ b/sfa/planetlab/plaggregate.py
@@ -118,7 +118,9 @@ class PlAggregate:
 
         # sort slivers by node id    
         for node_id in slice['node_ids']:
 
         # sort slivers by node id    
         for node_id in slice['node_ids']:

-            sliver = Sliver({'sliver_id': Xrn(slice_urn, type='slice', id=node_id, authority=self.driver.hrn).urn,
+            sliver_xrn = Xrn(slice_urn, type='sliver', id=tag['node_id'])
+            sliver_xrn.set_authority(self.driver.hrn)
+            sliver = Sliver({'sliver_id': sliver_xrn.urn,

                              'name': slice['name'],
                              'type': 'plab-vserver', 
                              'tags': []})
                              'name': slice['name'],
                              'type': 'plab-vserver', 
                              'tags': []})


@@ -129,7 +131,9 @@ class PlAggregate:
         for tag in tags:
             # most likely a default/global sliver attribute (node_id == None)
             if tag['node_id'] not in slivers:
         for tag in tags:
             # most likely a default/global sliver attribute (node_id == None)
             if tag['node_id'] not in slivers:

-                sliver = Sliver({'sliver_id': urn_to_sliver_id(slice_urn, slice['slice_id'], ""),
+                sliver_xrn = Xrn(slice_urn, type='sliver', id=tag['node_id'])
+                sliver_xrn.set_authority(self.driver.hrn)
+                sliver = Sliver({'sliver_id': sliver_xrn.urn,

                                  'name': slice['name'],
                                  'type': 'plab-vserver',
                                  'tags': []})
                                  'name': slice['name'],
                                  'type': 'plab-vserver',
                                  'tags': []})

diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py
index e331d4b..0fa8818 100644 (file)
--- a/sfa/planetlab/pldriver.py
+++ b/sfa/planetlab/pldriver.py
@@ -691,7 +691,7 @@ class PlDriver (Driver):
             if node['last_contact'] is not None:
                 
                 res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact']))
             if node['last_contact'] is not None:
                 
                 res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact']))

-            sliver_xrn = Xrn(slice_urn, type='slice', id=node['node_id'])
+            sliver_xrn = Xrn(slice_urn, type='sliver', id=node['node_id'])

             sliver_xrn.set_authority(self.hrn)
              
             res['geni_urn'] = sliver_xrn.urn
             sliver_xrn.set_authority(self.hrn)
              
             res['geni_urn'] = sliver_xrn.urn