From: Tony Mack Date: Fri, 7 Sep 2012 15:43:44 +0000 (-0400) Subject: fix sliver id in sliver status and list resources X-Git-Tag: sfa-2.1-14~18 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=3983d469a774bbab70aecfe5a2707a4c1d31055b;p=sfa.git fix sliver id in sliver status and list resources --- diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 11ea26bb..e74a7deb 100644 --- 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']: - 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': []}) @@ -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: - 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': []}) diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index e331d4b3..0fa8818f 100644 --- 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'])) - 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