From: Thierry Parmentelat Date: Sun, 27 May 2018 12:12:14 +0000 (+0200) Subject: the big cleanup: remove max aggregate manager X-Git-Tag: sfa-4.0-0~4 X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d8eb2951074d0e3f7e5fa222217e45a3e4a8448c the big cleanup: remove max aggregate manager --- diff --git a/sfa/generic/max.py b/sfa/generic/max.py deleted file mode 100644 index 8b572268..00000000 --- a/sfa/generic/max.py +++ /dev/null @@ -1,20 +0,0 @@ -# an example of how to plugin the max aggregate manager with the flavour model -# might need to be tested -# -from sfa.generic.pl import pl - - -class max (pl): - - # the max flavour behaves like pl, except for - # the aggregate - def aggregate_manager_class(self): - import sfa.managers.aggregate_manager_max - return sfa.managers.aggregate_manager_max.AggregateManagerMax - -# I believe the component stuff is not implemented - def component_manager_class(self): - return None - - def component_driver_class(self): - return None diff --git a/sfa/managers/aggregate_manager_max.py b/sfa/managers/aggregate_manager_max.py deleted file mode 100644 index 67b115d1..00000000 --- a/sfa/managers/aggregate_manager_max.py +++ /dev/null @@ -1,335 +0,0 @@ -import os -import time -import re - -#from sfa.util.faults import * -from sfa.util.sfalogging import logger -from sfa.util.sfatime import SFATIME_FORMAT -from sfa.util.config import Config -from sfa.util.callids import Callids -from sfa.util.version import version_core -from sfa.util.xrn import urn_to_hrn, hrn_to_urn, Xrn - -# xxx the sfa.rspecs module is dead - this symbol is now undefined -#from sfa.rspecs.sfa_rspec import sfa_rspec_version - -from sfa.managers.aggregate_manager import AggregateManager - -from sfa.planetlab.plslices import PlSlices - - -class AggregateManagerMax (AggregateManager): - - def __init__(self, config): - pass - - RSPEC_TMP_FILE_PREFIX = "/tmp/max_rspec" - - # execute shell command and return both exit code and text output - def shell_execute(self, cmd, timeout): - pipe = os.popen('{ ' + cmd + '; } 2>&1', 'r') - pipe = os.popen(cmd + ' 2>&1', 'r') - text = '' - while timeout: - line = pipe.read() - text += line - time.sleep(1) - timeout = timeout - 1 - code = pipe.close() - if code is None: - code = 0 - if text[-1:] == '\n': - text = text[:-1] - return code, text - - def call_am_apiclient(self, client_app, params, timeout): - """ - call AM API client with command like in the following example: - cd aggregate_client; java -classpath AggregateWS-client-api.jar:lib/* \ - net.geni.aggregate.client.examples.CreateSliceNetworkClient \ - ./repo https://geni:8443/axis2/services/AggregateGENI \ - ... params ... - """ - (client_path, am_url) = Config().get_max_aggrMgr_info() - sys_cmd = "cd " + client_path + "; java -classpath AggregateWS-client-api.jar:lib/* net.geni.aggregate.client.examples." + \ - client_app + " ./repo " + am_url + " " + ' '.join(params) - ret = self.shell_execute(sys_cmd, timeout) - logger.debug("shell_execute cmd: %s returns %s" % (sys_cmd, ret)) - return ret - - # save request RSpec xml content to a tmp file - def save_rspec_to_file(self, rspec): - path = AggregateManagerMax.RSPEC_TMP_FILE_PREFIX + "_" + \ - time.strftime(SFATIME_FORMAT, time.gmtime(time.time())) + ".xml" - file = open(path, "w") - file.write(rspec) - file.close() - return path - - # get stripped down slice id/name plc.maxpl.xislice1 --> maxpl_xislice1 - def get_plc_slice_id(self, cred, xrn): - (hrn, type) = urn_to_hrn(xrn) - slice_id = hrn.find(':') - sep = '.' - if hrn.find(':') != -1: - sep = ':' - elif hrn.find('+') != -1: - sep = '+' - else: - sep = '.' - slice_id = hrn.split(sep)[-2] + '_' + hrn.split(sep)[-1] - return slice_id - - # extract xml - def get_xml_by_tag(self, text, tag): - indx1 = text.find('<' + tag) - indx2 = text.find('/' + tag + '>') - xml = None - if indx1 != -1 and indx2 > indx1: - xml = text[indx1:indx2 + len(tag) + 2] - return xml - - # formerly in aggregate_manager.py but got unused in there... - def _get_registry_objects(self, slice_xrn, creds, users): - """ - - """ - hrn, _ = urn_to_hrn(slice_xrn) - - #hrn_auth = get_authority(hrn) - - # Build up objects that an SFA registry would return if SFA - # could contact the slice's registry directly - reg_objects = None - - if users: - # dont allow special characters in the site login base - #only_alphanumeric = re.compile('[^a-zA-Z0-9]+') - #login_base = only_alphanumeric.sub('', hrn_auth[:20]).lower() - slicename = hrn_to_pl_slicename(hrn) - login_base = slicename.split('_')[0] - reg_objects = {} - site = {} - site['site_id'] = 0 - site['name'] = 'geni.%s' % login_base - site['enabled'] = True - site['max_slices'] = 100 - - # Note: - # Is it okay if this login base is the same as one already at this myplc site? - # Do we need uniqueness? Should use hrn_auth instead of just the - # leaf perhaps? - site['login_base'] = login_base - site['abbreviated_name'] = login_base - site['max_slivers'] = 1000 - reg_objects['site'] = site - - slice = {} - - # get_expiration always returns a normalized datetime - no need to - # utcparse - extime = Credential(string=creds[0]).get_expiration() - # If the expiration time is > 60 days from now, set the expiration - # time to 60 days from now - if extime > datetime.datetime.utcnow() + datetime.timedelta(days=60): - extime = datetime.datetime.utcnow() + datetime.timedelta(days=60) - slice['expires'] = int(time.mktime(extime.timetuple())) - slice['hrn'] = hrn - slice['name'] = hrn_to_pl_slicename(hrn) - slice['url'] = hrn - slice['description'] = hrn - slice['pointer'] = 0 - reg_objects['slice_record'] = slice - - reg_objects['users'] = {} - for user in users: - user['key_ids'] = [] - hrn, _ = urn_to_hrn(user['urn']) - user['email'] = hrn_to_pl_slicename(hrn) + "@geni.net" - user['first_name'] = hrn - user['last_name'] = hrn - reg_objects['users'][user['email']] = user - - return reg_objects - - def prepare_slice(self, api, slice_xrn, creds, users): - reg_objects = self._get_registry_objects(slice_xrn, creds, users) - (hrn, type) = urn_to_hrn(slice_xrn) - slices = PlSlices(self.driver) - peer = slices.get_peer(hrn) - sfa_peer = slices.get_sfa_peer(hrn) - slice_record = None - if users: - slice_record = users[0].get('slice_record', {}) - registry = api.registries[api.hrn] - credential = api.getCredential() - # ensure site record exists - site = slices.verify_site(hrn, slice_record, peer, sfa_peer) - # ensure slice record exists - slice = slices.verify_slice(hrn, slice_record, peer, sfa_peer) - # ensure person records exists - persons = slices.verify_persons(hrn, slice, users, peer, sfa_peer) - - def parse_resources(self, text, slice_xrn): - resources = [] - urn = hrn_to_urn(slice_xrn, 'sliver') - plc_slice = re.search("Slice Status => ([^\n]+)", text) - if plc_slice.group(1) != 'NONE': - res = {} - res['geni_urn'] = urn + '_plc_slice' - res['geni_error'] = '' - res['geni_status'] = 'unknown' - if plc_slice.group(1) == 'CREATED': - res['geni_status'] = 'ready' - resources.append(res) - vlans = re.findall("GRI => ([^\n]+)\n\t Status => ([^\n]+)", text) - for vlan in vlans: - res = {} - res['geni_error'] = '' - res['geni_urn'] = urn + '_vlan_' + vlan[0] - if vlan[1] == 'ACTIVE': - res['geni_status'] = 'ready' - elif vlan[1] == 'FAILED': - res['geni_status'] = 'failed' - else: - res['geni_status'] = 'configuring' - resources.append(res) - return resources - - def slice_status(self, api, slice_xrn, creds): - urn = hrn_to_urn(slice_xrn, 'slice') - result = {} - top_level_status = 'unknown' - slice_id = self.get_plc_slice_id(creds, urn) - (ret, output) = self.call_am_apiclient( - "QuerySliceNetworkClient", [slice_id, ], 5) - # parse output into rspec XML - if output.find("Unkown Rspec:") > 0: - top_level_staus = 'failed' - result['geni_resources'] = '' - else: - has_failure = 0 - all_active = 0 - if output.find("Status => FAILED") > 0: - top_level_staus = 'failed' - elif (output.find("Status => ACCEPTED") > 0 or output.find("Status => PENDING") > 0 - or output.find("Status => INSETUP") > 0 or output.find("Status => INCREATE") > 0 - ): - top_level_status = 'configuring' - else: - top_level_status = 'ready' - result['geni_resources'] = self.parse_resources(output, slice_xrn) - result['geni_urn'] = urn - result['geni_status'] = top_level_status - return result - - def create_slice(self, api, xrn, cred, rspec, users): - indx1 = rspec.find("") - if indx1 > -1 and indx2 > indx1: - rspec = rspec[indx1 + len(""):indx2 - 1] - rspec_path = self.save_rspec_to_file(rspec) - self.prepare_slice(api, xrn, cred, users) - slice_id = self.get_plc_slice_id(cred, xrn) - sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" + slice_id + "/g\" " + \ - rspec_path + \ - ";sed -i \"s/:rspec=[^:'<\\\" ]*/:rspec=" + \ - slice_id + "/g\" " + rspec_path - ret = self.shell_execute(sys_cmd, 1) - sys_cmd = "sed -i \"s/rspec id=\\\"[^\\\"]*/rspec id=\\\"" + \ - rspec_path + "/g\"" - ret = self.shell_execute(sys_cmd, 1) - (ret, output) = self.call_am_apiclient( - "CreateSliceNetworkClient", [rspec_path, ], 3) - # parse output ? - rspec = " Done! " - return True - - def delete_slice(self, api, xrn, cred): - slice_id = self.get_plc_slice_id(cred, xrn) - (ret, output) = self.call_am_apiclient( - "DeleteSliceNetworkClient", [slice_id, ], 3) - # parse output ? - return 1 - - def get_rspec(self, api, cred, slice_urn): - logger.debug("#### called max-get_rspec") - # geni_slice_urn: urn:publicid:IDN+plc:maxpl+slice+xi_rspec_test1 - if slice_urn == None: - (ret, output) = self.call_am_apiclient( - "GetResourceTopology", ['all', '\"\"'], 5) - else: - slice_id = self.get_plc_slice_id(cred, slice_urn) - (ret, output) = self.call_am_apiclient( - "GetResourceTopology", ['all', slice_id, ], 5) - # parse output into rspec XML - if output.find("No resouce found") > 0: - rspec = " No resource found " - else: - comp_rspec = self.get_xml_by_tag(output, 'computeResource') - logger.debug("#### computeResource %s" % comp_rspec) - topo_rspec = self.get_xml_by_tag(output, 'topology') - logger.debug("#### topology %s" % topo_rspec) - rspec = " " - if comp_rspec != None: - rspec = rspec + self.get_xml_by_tag(output, 'computeResource') - if topo_rspec != None: - rspec = rspec + self.get_xml_by_tag(output, 'topology') - rspec = rspec + " " - return (rspec) - - def start_slice(self, api, xrn, cred): - # service not supported - return None - - def stop_slice(self, api, xrn, cred): - # service not supported - return None - - def reset_slices(self, api, xrn): - # service not supported - return None - - # GENI AM API Methods - - def SliverStatus(self, api, slice_xrn, creds, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): - return {} - return self.slice_status(api, slice_xrn, creds) - - def CreateSliver(self, api, slice_xrn, creds, rspec_string, users, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): - return "" - # TODO: create real CreateSliver response rspec - ret = self.create_slice(api, slice_xrn, creds, rspec_string, users) - if ret: - return self.get_rspec(api, creds, slice_xrn) - else: - return " Error! " - - def DeleteSliver(self, api, xrn, creds, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): - return "" - return self.delete_slice(api, xrn, creds) - - # no caching - def ListResources(self, api, creds, options): - call_id = options.get('call_id') - if Callids().already_handled(call_id): - return "" - # version_string = "rspec_%s" % (rspec_version.get_version_name()) - slice_urn = options.get('geni_slice_urn') - return self.get_rspec(api, creds, slice_urn) - - def fetch_context(self, slice_hrn, user_hrn, contexts): - """ - Returns the request context required by sfatables. At some point, this mechanism should be changed - to refer to "contexts", which is the information that sfatables is requesting. But for now, we just - return the basic information needed in a dict. - """ - base_context = {'sfa': {'user': {'hrn': user_hrn}}} - return base_context diff --git a/sfa/managers/max/max.xml b/sfa/managers/max/max.xml deleted file mode 100644 index f549ab7d..00000000 --- a/sfa/managers/max/max.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - geni.maxgigapop.net - Example MAX RSpec - - 1279848020 - 1280712039 - - - -
206.196.176.55
- - generic - 2.0GHz - 1 - 256MB - 16GB - - - Ethernet - eth1 - 100Mbps - 10.10.10.2/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_1 - - - Ethernet - eth1 - 100Mbps - 10.10.30.1/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_2 - - - -
206.196.176.138
- - generic - 2.0GHz - 1 - 256MB - 16GB - - - Ethernet - eth1 - 100Mbps - 10.10.20.2/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab2:interface=eth1.any_3 - - - Ethernet - eth1 - 100Mbps - 10.10.30.2/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_2 - - - -
206.196.176.133
- - generic - 2.0GHz - 1 - 256MB - 16GB - - - Ethernet - eth1 - 100Mbps - 10.10.10.1/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab3:interface=eth1.any_1 - - - Ethernet - eth1 - 100Mbps - 10.10.20.1/24 - any - urn:aggregate=geni.maxgigapop.net:rspec=my-test-max-rspec-slice1:domain=dragon.maxgigapop.net:node=planetlab5:interface=eth1.any_3 - - - -