From 528c9db99de6b49dbf02add34dd9bdf673802fe1 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Fri, 24 Aug 2012 12:55:24 -0400 Subject: [PATCH] implenet performOperationalAction --- sfa/managers/aggregate_manager.py | 33 +-------- sfa/methods/GetTicket.py | 57 --------------- sfa/openstack/nova_driver.py | 112 ++++++++---------------------- sfa/openstack/osaggregate.py | 22 +++++- sfa/planetlab/pldriver.py | 103 ++++++--------------------- 5 files changed, 71 insertions(+), 256 deletions(-) delete mode 100644 sfa/methods/GetTicket.py diff --git a/sfa/managers/aggregate_manager.py b/sfa/managers/aggregate_manager.py index 9ec3775c..0ffedf2f 100644 --- a/sfa/managers/aggregate_manager.py +++ b/sfa/managers/aggregate_manager.py @@ -67,27 +67,6 @@ class AggregateManager: version.update(testbed_version) return version - def ListSlices(self, api, creds, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): return [] - - # look in cache first - if self.driver.cache: - slices = self.driver.cache.get('slices') - if slices: - logger.debug("%s.list_slices returns from cache" % (self.driver.__module__)) - return slices - - # call driver - slices = self.driver.list_slices(creds, options) - - # cache the result - if self.driver.cache: - logger.debug ("%s.list_slices stores value in cache" % (self.driver.__module__)) - self.driver.cache.add('slices', instance_urns) - - return self.driver.list_slices (creds, options) - def ListResources(self, api, creds, options): call_id = options.get('call_id') if Callids().already_handled(call_id): return "" @@ -133,7 +112,7 @@ class AggregateManager: """ call_id = options.get('call_id') if Callids().already_handled(call_id): return "" - return self.driver.allocate(xrn, creds, rspec_string, options) + return self.driver.allocate(xrn, rspec_string, options) def Provision(self, api, xrns, creds, options): """ @@ -142,7 +121,7 @@ class AggregateManager: """ call_id = options.get('call_id') if Callids().already_handled(call_id): return "" - return self.driver.provision(xrns, creds, options) + return self.driver.provision(xrns, options) def Delete(self, api, xrns, creds, options): call_id = options.get('call_id') @@ -164,11 +143,3 @@ class AggregateManager: if Callids().already_handled(call_id): return True return self.driver.shutdown(xrn, options) - def GetTicket(self, api, xrn, creds, rspec, users, options): - - xrn = Xrn(xrn) - slice_urn=xrn.get_urn() - slice_hrn=xrn.get_hrn() - - return self.driver.get_ticket (slice_urn, slice_hrn, creds, rspec, options) - diff --git a/sfa/methods/GetTicket.py b/sfa/methods/GetTicket.py deleted file mode 100644 index 54978e7e..00000000 --- a/sfa/methods/GetTicket.py +++ /dev/null @@ -1,57 +0,0 @@ -from sfa.util.xrn import urn_to_hrn -from sfa.util.method import Method -from sfa.util.sfatablesRuntime import run_sfatables - -from sfa.trust.credential import Credential - -from sfa.storage.parameter import Parameter, Mixed - -class GetTicket(Method): - """ - Retrieve a ticket. This operation is currently implemented on PLC - only (see SFA, engineering decisions); it is not implemented on - components. - - The ticket is filled in with information from the PLC database. This - information includes resources, and attributes such as user keys and - initscripts. - - @param cred credential string - @param name name of the slice to retrieve a ticket for (hrn or urn) - @param rspec resource specification dictionary - - @return the string representation of a ticket object - """ - - interfaces = ['aggregate', 'slicemgr'] - - accepts = [ - Parameter(str, "Human readable name of slice to retrive a ticket for (hrn or urn)"), - Mixed(Parameter(str, "Credential string"), - Parameter(type([str]), "List of credentials")), - Parameter(str, "Resource specification (rspec)"), - Parameter(type([]), "List of user information"), - Parameter(dict, "Options") - ] - - returns = Parameter(str, "String representation of a ticket object") - - def call(self, xrn, creds, rspec, users, options): - hrn, type = urn_to_hrn(xrn) - # Find the valid credentials - valid_creds = self.api.auth.checkCredentials(creds, 'getticket', hrn) - origin_hrn = Credential(string=valid_creds[0]).get_gid_caller().get_hrn() - - #log the call - self.api.logger.info("interface: %s\tcaller-hrn: %s\ttarget-hrn: %s\tmethod-name: %s"%(self.api.interface, origin_hrn, hrn, self.name)) - - # filter rspec through sfatables - if self.api.interface in ['aggregate']: - chain_name = 'OUTGOING' - elif self.api.interface in ['slicemgr']: - chain_name = 'FORWARD-OUTGOING' - rspec = run_sfatables(chain_name, hrn, origin_hrn, rspec) - - # remove nodes that are not available at this interface from the rspec - return self.api.manager.GetTicket(self.api, xrn, creds, rspec, users, options) - diff --git a/sfa/openstack/nova_driver.py b/sfa/openstack/nova_driver.py index 56f0334b..2fbf6e06 100644 --- a/sfa/openstack/nova_driver.py +++ b/sfa/openstack/nova_driver.py @@ -2,7 +2,7 @@ import time import datetime from sfa.util.faults import MissingSfaInfo, UnknownSfaType, \ - RecordNotFound, SfaNotImplemented, SfaInvalidArgument + RecordNotFound, SfaNotImplemented, SfaInvalidArgument, UnsupportedOperation from sfa.util.sfalogging import logger from sfa.util.defaultdict import defaultdict @@ -319,12 +319,12 @@ class NovaDriver(Driver): return {} # first 2 args are None in case of resource discovery - def list_resources (self, version, options): + def list_resources (self, version=None, options={}): aggregate = OSAggregate(self) rspec = aggregate.list_resources(version=version, options=options) return rspec - def describe(self, urns, version, options): + def describe(self, urns, version=None, options={}): aggregate = OSAggregate(self) return aggregate.describe(urns, version=version, options=options) @@ -333,7 +333,7 @@ class NovaDriver(Driver): desc = aggregate.describe(urns) return desc['geni_slivers'] - def allocate (self, urn, rspec_string, options): + def allocate (self, urn, rspec_string, options={}): xrn = Xrn(urn) aggregate = OSAggregate(self) @@ -355,13 +355,12 @@ class NovaDriver(Driver): tenant_name = OSXrn(xrn=slice_hrn, type='slice').get_tenant_name() aggregate.run_instances(instance_name, tenant_name, rspec_string, key_name, pubkeys) - return aggregate.describe(slice_xrn=slice_urn, version=rspec.version) + return aggregate.describe(urns=[urn], version=rspec.version) - def provision(self, urns, version, options): - aggregate = OSAggregate(self) - return aggregate.describe(urns, version=version, options=options) + def provision(self, urns, options={}): + return self.describe(urns, options=options) - def delete (self, urns, options): + def delete (self, urns, options={}): aggregate = OSAggregate(self) for urn in urns: xrn = OSXrn(xrn=urn, type='slice') @@ -371,13 +370,30 @@ class NovaDriver(Driver): aggregate.delete_instance(tenant_name, project_name, id) return 1 - def renew (self, urns, expiration_time, options): + def renew (self, urns, expiration_time, options={}): return True - def perform_operational_action (self, urns, action, options): - pass + def perform_operational_action (self, urns, action, options={}): + aggregate = OSAggregate(self) + action = action.lower() + if action == 'geni_start': + action_method = aggregate.start_instances + elif action == 'geni_stop': + action_method = aggregate.stop_instances + elif action == 'geni_restart': + action_method = aggreate.restart_instances + else: + raise UnsupportedOperation(action) + for urn in urns: + xrn = OSXrn(urn=urn) + tenant_name = xrn.get_tenant_name() + project_name = xrn.get_slicename() + id = xrn.id + aggreate.action_method(tenant_name, project_name, id) + description = self.describe(urns) + return description['geni_slivers'] - def shutdown(self, xrn, options): + def shutdown(self, xrn, options={}): xrn = OSXrn(xrn=xrn, type='slice') tenant_name = xrn.get_tenant_name() name = xrn.get_slicename() @@ -386,73 +402,3 @@ class NovaDriver(Driver): for instance in instances: self.driver.shell.nova_manager.servers.shutdown(instance) return True - - # xxx this code is quite old and has not run for ages - # it is obviously totally broken and needs a rewrite - def get_ticket (self, slice_urn, slice_hrn, creds, rspec_string, options): - raise SfaNotImplemented,"OpenStackDriver.get_ticket needs a rewrite" -# please keep this code for future reference -# slices = PlSlices(self) -# peer = slices.get_peer(slice_hrn) -# sfa_peer = slices.get_sfa_peer(slice_hrn) -# -# # get the slice record -# credential = api.getCredential() -# interface = api.registries[api.hrn] -# registry = api.server_proxy(interface, credential) -# records = registry.Resolve(xrn, credential) -# -# # make sure we get a local slice record -# record = None -# for tmp_record in records: -# if tmp_record['type'] == 'slice' and \ -# not tmp_record['peer_authority']: -# #Error (E0602, GetTicket): Undefined variable 'SliceRecord' -# slice_record = SliceRecord(dict=tmp_record) -# if not record: -# raise RecordNotFound(slice_hrn) -# -# # similar to CreateSliver, we must verify that the required records exist -# # at this aggregate before we can issue a ticket -# # parse rspec -# rspec = RSpec(rspec_string) -# requested_attributes = rspec.version.get_slice_attributes() -# -# # ensure site record exists -# site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer) -# # ensure slice record exists -# slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer) -# # ensure person records exists -# # xxx users is undefined in this context -# persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer) -# # ensure slice attributes exists -# slices.verify_slice_attributes(slice, requested_attributes) -# -# # get sliver info -# slivers = slices.get_slivers(slice_hrn) -# -# if not slivers: -# raise SliverDoesNotExist(slice_hrn) -# -# # get initscripts -# initscripts = [] -# data = { -# 'timestamp': int(time.time()), -# 'initscripts': initscripts, -# 'slivers': slivers -# } -# -# # create the ticket -# object_gid = record.get_gid_object() -# new_ticket = SfaTicket(subject = object_gid.get_subject()) -# new_ticket.set_gid_caller(api.auth.client_gid) -# new_ticket.set_gid_object(object_gid) -# new_ticket.set_issuer(key=api.key, subject=self.hrn) -# new_ticket.set_pubkey(object_gid.get_pubkey()) -# new_ticket.set_attributes(data) -# new_ticket.set_rspec(rspec) -# #new_ticket.set_parent(api.auth.hierarchy.get_auth_ticket(auth_hrn)) -# new_ticket.encode() -# new_ticket.sign() -# -# return new_ticket.save_to_string(save_parents=True) diff --git a/sfa/openstack/osaggregate.py b/sfa/openstack/osaggregate.py index 0e4be844..d6b16b00 100644 --- a/sfa/openstack/osaggregate.py +++ b/sfa/openstack/osaggregate.py @@ -369,12 +369,30 @@ class OSAggregate: self.driver.shell.nova_manager.servers.delete(instance) return 1 - def stop_instances(self, instance_name, tenant_name): + def stop_instances(self, instance_name, tenant_name, id=None): self.driver.shell.nova_manager.connect(tenant=tenant_name) - instances = self.driver.shell.nova_manager.servers.findall(name=instance_name) + args = {'name': instance_name} + if id: + args['id'] = id + instances = self.driver.shell.nova_manager.servers.findall(**args) for instance in instances: self.driver.shell.nova_manager.servers.pause(instance) return 1 + def start_instances(self, instance_name, tenant_name, id=None): + self.driver.shell.nova_manager.connect(tenant=tenant_name) + args = {'name': instance_name} + if id: + args['id'] = id + instances = self.driver.shell.nova_manager.servers.findall(**args) + for instance in instances: + self.driver.shell.nova_manager.servers.resume(instance) + return 1 + + def restart_instances(self, instacne_name, tenant_name, id=None): + self.stop_instances(instance_name, tenant_name, id) + self.start_instances(instance_name, tenant_name, id) + return 1 + def update_instances(self, project_name): pass diff --git a/sfa/planetlab/pldriver.py b/sfa/planetlab/pldriver.py index 25d16f4d..fe3d0ab8 100644 --- a/sfa/planetlab/pldriver.py +++ b/sfa/planetlab/pldriver.py @@ -563,20 +563,13 @@ class PlDriver (Driver): def aggregate_version (self): return {} - def list_slices (self, creds, options): - # get data from db - slices = self.shell.GetSlices({'peer_id': None}, ['name']) - slice_hrns = [slicename_to_hrn(self.hrn, slice['name']) for slice in slices] - slice_urns = [hrn_to_urn(slice_hrn, 'slice') for slice_hrn in slice_hrns] - return slice_urns - # first 2 args are None in case of resource discovery - def list_resources (self, version, options): + def list_resources (self, version=None, options={}): aggregate = PlAggregate(self) rspec = aggregate.list_resources(version=version, options=options) return rspec - def describe(self, urns, version, options): + def describe(self, urns, version, options={}): aggregate = PlAggregate(self) return aggregate.describe(urns, version=version, options=options) @@ -649,7 +642,7 @@ class PlDriver (Driver): result['geni_resources'] = resources return result - def allocate (self, urn, rspec_string, options): + def allocate (self, urn, rspec_string, options={}): xrn = Xrn(urn) aggregate = PlAggregate(self) slices = PlSlices(self) @@ -710,7 +703,10 @@ class PlDriver (Driver): return aggregate.describe(slice_xrn=xrn.get_urn(), version=rspec.version) - def delete(self, urns, options): + def provision(self, urns, options={}): + return self.describe(urns, options=options) + + def delete(self, urns, options={}): names = [] ids = [] for urn in urns: @@ -741,7 +737,7 @@ class PlDriver (Driver): self.shell.BindObjectToPeer('slice', slice['slice_id'], peer, slice['peer_slice_id']) return 1 - def renew (self, urns, expiration_time, options): + def renew (self, urns, expiration_time, options={}): # we can only renew slices, not individual slivers. ignore sliver # ids in the urn names = [] @@ -760,8 +756,19 @@ class PlDriver (Driver): except: return False + 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: + raise UnsupportedOperation(action) + description = self.describe(urns) + return description['geni_slivers'] + # set the 'enabled' tag to 0 - def shutdown (self, xrn, options): + def shutdown (self, xrn, options={}): xrn = PlXrn(xrn=xrn, type='slice') slicename = xrn.pl_slicename() slices = self.shell.GetSlices({'name': slicename}, ['slice_id']) @@ -775,73 +782,3 @@ class PlDriver (Driver): tag_id = slice_tags[0]['slice_tag_id'] self.shell.UpdateSliceTag(tag_id, '0') return 1 - - # xxx this code is quite old and has not run for ages - # it is obviously totally broken and needs a rewrite - def get_ticket (self, slice_urn, slice_hrn, creds, rspec_string, options): - raise SfaNotImplemented,"PlDriver.get_ticket needs a rewrite" -# please keep this code for future reference -# slices = PlSlices(self) -# peer = slices.get_peer(slice_hrn) -# sfa_peer = slices.get_sfa_peer(slice_hrn) -# -# # get the slice record -# credential = api.getCredential() -# interface = api.registries[api.hrn] -# registry = api.server_proxy(interface, credential) -# records = registry.Resolve(xrn, credential) -# -# # make sure we get a local slice record -# record = None -# for tmp_record in records: -# if tmp_record['type'] == 'slice' and \ -# not tmp_record['peer_authority']: -# #Error (E0602, GetTicket): Undefined variable 'SliceRecord' -# slice_record = SliceRecord(dict=tmp_record) -# if not record: -# raise RecordNotFound(slice_hrn) -# -# # similar to CreateSliver, we must verify that the required records exist -# # at this aggregate before we can issue a ticket -# # parse rspec -# rspec = RSpec(rspec_string) -# requested_attributes = rspec.version.get_slice_attributes() -# -# # ensure site record exists -# site = slices.verify_site(slice_hrn, slice_record, peer, sfa_peer) -# # ensure slice record exists -# slice = slices.verify_slice(slice_hrn, slice_record, peer, sfa_peer) -# # ensure person records exists -# # xxx users is undefined in this context -# persons = slices.verify_persons(slice_hrn, slice, users, peer, sfa_peer) -# # ensure slice attributes exists -# slices.verify_slice_attributes(slice, requested_attributes) -# -# # get sliver info -# slivers = slices.get_slivers(slice_hrn) -# -# if not slivers: -# raise SliverDoesNotExist(slice_hrn) -# -# # get initscripts -# initscripts = [] -# data = { -# 'timestamp': int(time.time()), -# 'initscripts': initscripts, -# 'slivers': slivers -# } -# -# # create the ticket -# object_gid = record.get_gid_object() -# new_ticket = SfaTicket(subject = object_gid.get_subject()) -# new_ticket.set_gid_caller(api.auth.client_gid) -# new_ticket.set_gid_object(object_gid) -# new_ticket.set_issuer(key=api.key, subject=self.hrn) -# new_ticket.set_pubkey(object_gid.get_pubkey()) -# new_ticket.set_attributes(data) -# new_ticket.set_rspec(rspec) -# #new_ticket.set_parent(api.auth.hierarchy.get_auth_ticket(auth_hrn)) -# new_ticket.encode() -# new_ticket.sign() -# -# return new_ticket.save_to_string(save_parents=True) -- 2.43.0