X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Frest%2Fcompute.py;h=07d059fcfd08eaf540ed56a00f6bd50bb0c2e5bf;hb=17b6e881a3813e6f1f99100ed384f974eaff36a3;hp=f8da42843e02a7a52686ab687201499c539c2612;hpb=aba0a5ebb8a7c606e988bbbb01c7875447d23ebe;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/rest/compute.py b/src/emuvim/api/rest/compute.py index f8da428..07d059f 100755 --- a/src/emuvim/api/rest/compute.py +++ b/src/emuvim/api/rest/compute.py @@ -29,12 +29,16 @@ import logging from flask_restful import Resource from flask import request import json +from copy import deepcopy logging.basicConfig(level=logging.INFO) +CORS_HEADER = {'Access-Control-Allow-Origin': '*'} + dcs = {} -class ComputeStart(Resource): + +class Compute(Resource): """ Start a new compute instance: A docker container (note: zerorpc does not support keyword arguments) :param dc_label: name of the DC @@ -47,26 +51,48 @@ class ComputeStart(Resource): """ global dcs - def put(self, dc_label, compute_name): - logging.debug("API CALL: compute start") - try: - #check if json data is a dict - data = request.json - if type(data) is not dict: - data = json.loads(request.json) + def put(self, dc_label, compute_name, resource=None, value=None): + + # deploy new container + # check if json data is a dict + data = request.json + if data is None: + data = {} + elif type(data) is not dict: + data = json.loads(request.json) - network = data.get("network") - nw_list = self._parse_network(network) - image = data.get("image") - command = data.get("docker_command") + network = data.get("network") + nw_list = self._parse_network(network) + image = data.get("image") + command = data.get("docker_command") + try: + logging.debug("API CALL: compute start") c = dcs.get(dc_label).startCompute( - compute_name, image= image, command= command, network= nw_list) + compute_name, image=image, command=command, network=nw_list) # return docker inspect dict - return c.getStatus(), 200 + return c.getStatus(), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER + + def get(self, dc_label, compute_name): + + logging.debug("API CALL: compute status") + + try: + return dcs.get(dc_label).containers.get(compute_name).getStatus(), 200, CORS_HEADER + except Exception as ex: + logging.exception("API error.") + return ex.message, 500, CORS_HEADER + + def delete(self, dc_label, compute_name): + logging.debug("API CALL: compute stop") + try: + return dcs.get(dc_label).stopCompute(compute_name), 200, CORS_HEADER + except Exception as ex: + logging.exception("API error.") + return ex.message, 500, CORS_HEADER def _parse_network(self, network_str): ''' @@ -76,7 +102,8 @@ class ComputeStart(Resource): ''' nw_list = list() - if network_str is None or '),(' not in network_str : + # TODO make this more robust with regex check + if network_str is None: return nw_list networks = network_str[1:-1].split('),(') @@ -86,77 +113,123 @@ class ComputeStart(Resource): return nw_list -class ComputeStop(Resource): - - global dcs - - def get(self, dc_label, compute_name): - logging.debug("API CALL: compute stop") - try: - return dcs.get(dc_label).stopCompute(compute_name), 200 - except Exception as ex: - logging.exception("API error.") - return ex.message,500 - class ComputeList(Resource): - global dcs - def get(self, dc_label): + def get(self, dc_label=None): logging.debug("API CALL: compute list") try: - if dc_label == 'None': + if dc_label is None or dc_label == 'None': # return list with all compute nodes in all DCs all_containers = [] + all_extSAPs = [] for dc in dcs.itervalues(): all_containers += dc.listCompute() - return [(c.name, c.getStatus()) for c in all_containers], 200 + all_extSAPs += dc.listExtSAPs() + + extSAP_list = [(sap.name, sap.getStatus()) for sap in all_extSAPs] + container_list = [(c.name, c.getStatus()) for c in all_containers] + total_list = container_list + extSAP_list + return total_list, 200, CORS_HEADER else: # return list of compute nodes for specified DC - return [(c.name, c.getStatus()) - for c in dcs.get(dc_label).listCompute()], 200 + container_list = [(c.name, c.getStatus()) for c in dcs.get(dc_label).listCompute()] + extSAP_list = [(sap.name, sap.getStatus()) for sap in dcs.get(dc_label).listExtSAPs()] + total_list = container_list + extSAP_list + return total_list, 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 - + return ex.message, 500, CORS_HEADER -class ComputeStatus(Resource): +class ComputeResources(Resource): + """ + Update the container's resources using the docker.update function + re-using the same parameters: + url params: + blkio_weight + cpu_period, cpu_quota, cpu_shares + cpuset_cpus + cpuset_mems + mem_limit + mem_reservation + memswap_limit + kernel_memory + restart_policy + see https://docs.docker.com/engine/reference/commandline/update/ + or API docs: https://docker-py.readthedocs.io/en/stable/api.html#module-docker.api.container + :param dc_label: name of the DC + :param compute_name: compute container name + :return: docker inspect dict of deployed docker + """ global dcs - def get(self, dc_label, compute_name): - - logging.debug("API CALL: compute list") + def put(self, dc_label, compute_name): + logging.debug("REST CALL: update container resources") try: - return dcs.get(dc_label).containers.get(compute_name).getStatus(), 200 + c = self._update_resources(dc_label, compute_name) + return c.getStatus(), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER + + def _update_resources(self, dc_label, compute_name): + + # get URL parameters + params = request.args + # then no data + if params is None: + params = {} + logging.debug("REST CALL: update container resources {0}".format(params)) + #check if container exists + d = dcs.get(dc_label).net.getNodeByName(compute_name) + + # general request of cpu percentage + # create a mutable copy + params = params.to_dict() + if 'cpu_bw' in params: + cpu_period = int(dcs.get(dc_label).net.cpu_period) + value = params.get('cpu_bw') + cpu_quota = int(cpu_period * float(value)) + #put default values back + if float(value) <= 0: + cpu_period = 100000 + cpu_quota = -1 + params['cpu_period'] = cpu_period + params['cpu_quota'] = cpu_quota + #d.updateCpuLimit(cpu_period=cpu_period, cpu_quota=cpu_quota) + + # only pass allowed keys to docker + allowed_keys = ['blkio_weight', 'cpu_period', 'cpu_quota', 'cpu_shares', 'cpuset_cpus', + 'cpuset_mems', 'mem_limit', 'mem_reservation', 'memswap_limit', + 'kernel_memory', 'restart_policy'] + filtered_params = {key:params[key] for key in allowed_keys if key in params} + + d.update_resources(**filtered_params) + + return d class DatacenterList(Resource): - global dcs def get(self): logging.debug("API CALL: datacenter list") try: - return [d.getStatus() for d in dcs.itervalues()], 200 + return [d.getStatus() for d in dcs.itervalues()], 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER -class DatacenterStatus(Resource): +class DatacenterStatus(Resource): global dcs def get(self, dc_label): logging.debug("API CALL: datacenter status") try: - return dcs.get(dc_label).getStatus(), 200 + return dcs.get(dc_label).getStatus(), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 - - + return ex.message, 500, CORS_HEADER