From 3f8ecb2aa170dedfea669617b6ecdabb3df7792d Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 5 Dec 2012 13:22:50 -0500 Subject: [PATCH] describe should return an empty rspec instead of an error if there are not allocated/provisioned slivers --- sfa/openstack/osaggregate.py | 3 --- sfa/planetlab/plaggregate.py | 2 -- 2 files changed, 5 deletions(-) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 8a48fe23..066e7e41 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -71,9 +71,6 @@ class OSAggregate: tenant_name = OSXrn(xrn=urns[0], type='slice').get_tenant_name() self.driver.shell.nova_manager.connect(tenant=tenant_name) instances = self.get_instances(urns) - if len(instances) == 0: - raise SliverDoesNotExist("You have not allocated any slivers here") - # lookup the sliver allocations sliver_ids = [sliver['sliver_id'] for sliver in slivers] constraint = SliverAllocation.sliver_id.in_(sliver_ids) diff --git a/sfa/planetlab/plaggregate.py b/sfa/planetlab/plaggregate.py index 7cb9ad6b..e55a2933 100644 --- a/sfa/planetlab/plaggregate.py +++ b/sfa/planetlab/plaggregate.py @@ -354,8 +354,6 @@ class PlAggregate: # get slivers geni_slivers = [] slivers = self.get_slivers(urns, options) - if len(slivers) == 0: - raise SliverDoesNotExist("You have not allocated any slivers here for %s" % str(urns)) rspec.xml.set('expires', datetime_to_string(utcparse(slivers[0]['expires']))) # lookup the sliver allocations -- 2.45.2