rspec = aggregate.list_resources(version=version, options=options)
return rspec
- def describe(self, urns, version, options={}, allocation_status=None):
+ def describe(self, urns, version, options={}):
aggregate = PlAggregate(self)
return aggregate.describe(urns, version=version, options=options)
persons = slices.verify_persons(xrn.hrn, slice, users, peer, sfa_peer, options=options)
# ensure slice attributes exists
slices.verify_slice_attributes(slice, requested_attributes, options=options)
-
+
# add/remove slice from nodes
- requested_slivers = []
- for node in rspec.version.get_nodes_with_slivers():
- hostname = None
- if node.get('component_name'):
- hostname = node.get('component_name').strip()
- elif node.get('component_id'):
- hostname = xrn_to_hostname(node.get('component_id').strip())
- if hostname:
- requested_slivers.append(hostname)
- nodes = slices.verify_slice_nodes(slice, requested_slivers, peer)
-
- # update all sliver allocation states setting then to geni_allocated
- sliver_ids = []
- for node in nodes:
- sliver_hrn = '%s.%s-%s' % (self.hrn, slice['slice_id'], node['node_id'])
- sliver_id = Xrn(sliver_hrn, type='sliver').urn
- sliver_ids.append(sliver_id)
- SliverAllocation.set_allocations(sliver_ids, 'geni_allocated')
+ request_nodes = rspec.version.get_nodes_with_slivers()
+ nodes = slices.verify_slice_nodes(slice, request_nodes, peer)
# add/remove links links
slices.verify_slice_links(slice, rspec.version.get_link_requests(), nodes)
slivers = aggregate.get_slivers(urns)
sliver_ids = [sliver['sliver_id'] for sliver in slivers]
SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned')
-
- return self.describe(urns, None, options=options)
+ version_manager = VersionManager()
+ rspec_version = version_manager.get_version(options['geni_rspec_version'])
+ return self.describe(urns, rspec_version, options=options)
def delete(self, urns, options={}):
# collect sliver ids so we can update sliver allocation states after
# we remove the slivers.
aggregate = PlAggregate(self)
slivers = aggregate.get_slivers(urns)
- slice_id = slivers[0]['slice_id']
- node_ids = []
- sliver_ids = []
- for sliver in slivers:
- node_ids.append(sliver['node_id'])
- sliver_ids.append(sliver['sliver_id'])
-
- # determine if this is a peer slice
- # xxx I wonder if this would not need to use PlSlices.get_peer instead
- # in which case plc.peers could be deprecated as this here
- # is the only/last call to this last method in plc.peers
- slice_hrn = PlXrn(auth=self.hrn, slicename=slivers[0]['name']).get_hrn()
- peer = peers.get_peer(self, slice_hrn)
- try:
- if peer:
- self.shell.UnBindObjectFromPeer('slice', slice_id, peer)
-
- self.shell.DeleteSliceFromNodes(slice_id, node_ids)
-
- # delete sliver allocation states
- SliverAllocation.delete_allocations(sliver_ids)
- finally:
- if peer:
- self.shell.BindObjectToPeer('slice', slice_id, peer, slice['peer_slice_id'])
+ if slivers:
+ slice_id = slivers[0]['slice_id']
+ node_ids = []
+ sliver_ids = []
+ for sliver in slivers:
+ node_ids.append(sliver['node_id'])
+ sliver_ids.append(sliver['sliver_id'])
+
+ # determine if this is a peer slice
+ # xxx I wonder if this would not need to use PlSlices.get_peer instead
+ # in which case plc.peers could be deprecated as this here
+ # is the only/last call to this last method in plc.peers
+ slice_hrn = PlXrn(auth=self.hrn, slicename=slivers[0]['name']).get_hrn()
+ peer = peers.get_peer(self, slice_hrn)
+ try:
+ if peer:
+ self.shell.UnBindObjectFromPeer('slice', slice_id, peer)
+
+ self.shell.DeleteSliceFromNodes(slice_id, node_ids)
+
+ # delete sliver allocation states
+ SliverAllocation.delete_allocations(sliver_ids)
+ finally:
+ if peer:
+ self.shell.BindObjectToPeer('slice', slice_id, peer, slice['peer_slice_id'])
# prepare return struct
geni_slivers = []
- for node_id in node_ids:
- sliver_hrn = '%s.%s-%s' % (self.hrn, slice_id, node_id)
+ for sliver in slivers:
geni_slivers.append(
- {'geni_sliver_urn': Xrn(sliver_hrn, type='sliver').urn,
+ {'geni_sliver_urn': sliver['sliver_id'],
'geni_allocation_status': 'geni_unallocated',
- 'geni_expires': datetime_to_string(utcparse(slivers[0]['expires']))})
+ 'geni_expires': datetime_to_string(utcparse(sliver['expires']))})
return geni_slivers
def renew (self, urns, expiration_time, options={}):
slice = slices[0]
requested_time = utcparse(expiration_time)
record = {'expires': int(datetime_to_epoch(requested_time))}
- try:
- self.shell.UpdateSlice(slice['slice_id'], record)
- return True
- except:
- return False
+ self.shell.UpdateSlice(slice['slice_id'], record)
+ description = self.describe(urns, None, options)
+ return description['geni_slivers']
+
def perform_operational_action (self, urns, action, options={}):
# MyPLC doesn't support operational actions. Lets pretend like it
# fault if sliver is not full allocated (operational status is geni_pending_allocation)
description = self.describe(urns, None, options)
for sliver in description['geni_slivers']:
- if sliver['operational_status'] == 'geni_pending_allocation':
+ if sliver['geni_operational_status'] == 'geni_pending_allocation':
raise UnsupportedOperation(action, "Sliver must be fully allocated (operational status is not geni_pending_allocation)")
#
# Perform Operational Action Here