import datetime
#
from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \
- RecordNotFound, SfaNotImplemented, SliverDoesNotExist, SearchFailed
+ RecordNotFound, SfaNotImplemented, SliverDoesNotExist, SearchFailed, \
+ UnsupportedOperation
from sfa.util.sfalogging import logger
from sfa.util.defaultdict import defaultdict
from sfa.util.sfatime import utcparse, datetime_to_string, datetime_to_epoch
# one would think the driver should not need to mess with the SFA db, but..
from sfa.storage.alchemy import dbsession
-from sfa.storage.model import RegRecord
+from sfa.storage.model import RegRecord, SliverAllocation
# used to be used in get_ticket
#from sfa.trust.sfaticket import SfaTicket
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)
def status (self, urns, options={}):
aggregate = PlAggregate(self)
desc = aggregate.describe(urns)
- return desc['geni_slivers']
-
- # find out where this slice is currently running
- slicename = hrn_to_pl_slicename(slice_hrn)
-
- slices = self.shell.GetSlices([slicename], ['slice_id', 'node_ids','person_ids','name','expires'])
- 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_id':slice['node_ids'],'peer_id':None},
- ['node_id', 'hostname', 'site_id', 'boot_state', 'last_contact'])
-
- if len(nodes) == 0:
- raise SliverDoesNotExist("You have not allocated any slivers here")
-
- # get login info
- user = {}
- if slice['person_ids']:
- persons = self.shell.GetPersons(slice['person_ids'], ['key_ids'])
- key_ids = [key_id for person in persons for key_id in person['key_ids']]
- person_keys = self.shell.GetKeys(key_ids)
- keys = [key['key'] for key in person_keys]
-
- user.update({'urn': slice_urn,
- 'login': slice['name'],
- 'protocol': ['ssh'],
- 'port': ['22'],
- 'keys': keys})
-
- site_ids = [node['site_id'] for node in nodes]
-
- result = {}
- result['geni_urn'] = slice_urn
- result['pl_login'] = slice['name']
- result['pl_expires'] = datetime_to_string(utcparse(slice['expires']))
- result['geni_expires'] = datetime_to_string(utcparse(slice['expires']))
-
- resources = []
- for node in nodes:
- res = {}
- res['pl_hostname'] = node['hostname']
- res['pl_boot_state'] = node['boot_state']
- res['pl_last_contact'] = node['last_contact']
- res['geni_expires'] = datetime_to_string(utcparse(slice['expires']))
- if node['last_contact'] is not None:
-
- res['pl_last_contact'] = datetime_to_string(utcparse(node['last_contact']))
- sliver_id = "%s:%s" % (slice['slice_id'], node['node_id'])
- sliver_xrn = Xrn(slice_urn, id = sliver_id)
- sliver_xrn.set_authority(self.hrn)
- res['geni_urn'] = sliver_xrn.get_urn()
- if node['boot_state'] == 'boot':
- res['geni_status'] = 'ready'
- else:
- res['geni_status'] = 'failed'
- res['geni_allocation_status'] = 'geni_provisioned'
-
- res['geni_error'] = ''
- res['users'] = [user]
- resources.append(res)
-
- result['geni_resources'] = resources
- return result
+ status = {'geni_urn': desc['geni_urn'],
+ 'geni_slivers': desc['geni_slivers']}
+ return status
def allocate (self, urn, rspec_string, options={}):
xrn = Xrn(urn)
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)
-
+ 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)
requested_leases.append(requested_lease)
leases = slices.verify_slice_leases(slice, requested_leases, kept_leases, peer)
-
# handle MyPLC peer association.
# only used by plc and ple.
slices.handle_peer(site, slice, persons, peer)
- return aggregate.describe([xrn.get_urn()], version=rspec.version, allocation_status='geni_allocated')
+ return aggregate.describe([xrn.get_urn()], version=rspec.version)
def provision(self, urns, options={}):
- return self.describe(urns, None, options=options, allocation_status='geni_provisioned')
+ # update sliver allocation states and set them to geni_provisioned
+ aggregate = PlAggregate(self)
+ slivers = aggregate.get_slivers(urns)
+ sliver_ids = [sliver['sliver_id'] for sliver in slivers]
+ SliverAllocation.set_allocations(sliver_ids, 'geni_provisioned')
+ 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={}):
- # urns argument may contain slice or sliver urns. Slice urns contain the
- # a slice's name whereas sliver urns contain a slice_id, node_id tupple.
- # We will collect names/ids specified in the urns provided by the caller.
- slice_names = []
- slice_ids = []
- node_ids = []
-
- for urn in urns:
- xrn = PlXrn(xrn=urn)
- if xrn.type == 'slice' and xrn.pl_slicename() not in slice_names:
- slice_names.append(xrn.pl_slicename())
- elif xrn.type == 'sliver':
- leaf = xrn.leaf
- leaf_split = leaf.split('-')
- if len(leaf_split) > 1:
- slice_ids.append(leaf_split[0])
- node_ids.append(leaf_split[1])
-
- # look up the requested urns
- filter = {}
- if slice_names:
- filter['name'] = slice_names
- if slice_ids:
- filter['id'] = slice_ids
- slices = self.shell.GetSlices(filter)
- if not slices:
- raise SearchFailed(urns)
- slice = slices[0]
- if not node_ids:
- node_ids = slice['node_ids']
- # 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=slice['name']).get_hrn()
- peer = peers.get_peer(self, slice_hrn)
- try:
- if peer:
- self.shell.UnBindObjectFromPeer('slice', slice['slice_id'], peer)
-
- self.shell.DeleteSliceFromNodes(slice['slice_id'], node_ids)
- finally:
- if peer:
- self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id'])
+ # collect sliver ids so we can update sliver allocation states after
+ # we remove the slivers.
+ aggregate = PlAggregate(self)
+ slivers = aggregate.get_slivers(urns)
+ 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['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(slice['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
# supports start, but reject everything else.
action = action.lower()
- if action == 'geni_start':
- pass
- else:
+ if action not in ['geni_start']:
raise UnsupportedOperation(action)
+
+ # fault if sliver is not full allocated (operational status is geni_pending_allocation)
description = self.describe(urns, None, options)
- return description['geni_slivers']
+ for sliver in description['geni_slivers']:
+ 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
+ #
+
+ geni_slivers = self.describe(urns, None, options)['geni_slivers']
+ return geni_slivers
# set the 'enabled' tag to 0
def shutdown (self, xrn, options={}):
git://git.onelab.eu / sfa.git / blobdiff