X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Frest%2Fcompute.py;h=f0c89540ec2d43e23990026f4e58fcb063a320d2;hb=9cc7360bf2c0dacb869d8ed0674d9d9e269a1082;hp=1c9c892370fe5669e6e104256b6ff21acbabc48d;hpb=8945ecfc73514b99b6798dfe774263a45df2896d;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/rest/compute.py b/src/emuvim/api/rest/compute.py index 1c9c892..f0c8954 100755 --- a/src/emuvim/api/rest/compute.py +++ b/src/emuvim/api/rest/compute.py @@ -1,3 +1,30 @@ +""" +Copyright (c) 2015 SONATA-NFV and Paderborn University +ALL RIGHTS RESERVED. + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, software +distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and +limitations under the License. + +Neither the name of the SONATA-NFV [, ANY ADDITIONAL AFFILIATION] +nor the names of its contributors may be used to endorse or promote +products derived from this software without specific prior written +permission. + +This work has been performed in the framework of the SONATA project, +funded by the European Commission under Grant number 671517 through +the Horizon 2020 and 5G-PPP programmes. The authors would like to +acknowledge the contributions of their colleagues of the SONATA +partner consortium (www.sonata-nfv.eu). +""" import logging from flask_restful import Resource from flask import request @@ -7,7 +34,8 @@ logging.basicConfig(level=logging.INFO) 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 @@ -20,42 +48,94 @@ class ComputeStart(Resource): """ global dcs - def put(self, dc_label, compute_name): - logging.debug("API CALL: compute start") - try: + def put(self, dc_label, compute_name, resource=None, value=None): + # check if resource update + if resource and value: + c = self._update_resource(dc_label, compute_name, resource, value) + return c.getStatus(), 200 + + # 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") - image = json.loads(request.json).get("image") - network = json.loads(request.json).get("network") - command = json.loads(request.json).get("docker_command") + try: + logging.debug("API CALL: compute start") c = dcs.get(dc_label).startCompute( - compute_name, image= image, command= command, network= network) + compute_name, image=image, command=command, network=nw_list) # return docker inspect dict return c.getStatus(), 200 except Exception as ex: logging.exception("API error.") return ex.message, 500 -class ComputeStop(Resource): + def _update_resource(self, dc_label, compute_name, resource, value): + #check if container exists + d = dcs.get(dc_label).net.getNodeByName(compute_name) + if resource == 'cpu': + cpu_period = int(dcs.get(dc_label).net.cpu_period) + cpu_quota = int(cpu_period * float(value)) + #put default values back + if float(value) <= 0: + cpu_period = 100000 + cpu_quota = -1 + d.updateCpuLimit(cpu_period=cpu_period, cpu_quota=cpu_quota) + return d - global dcs 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 + except Exception as ex: + logging.exception("API error.") + return ex.message, 500 + + def delete(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 + return ex.message, 500 + def _parse_network(self, network_str): + ''' + parse the options for all network interfaces of the vnf + :param network_str: (id=x,ip=x.x.x.x/x), ... + :return: list of dicts [{"id":x,"ip":"x.x.x.x/x"}, ...] + ''' + nw_list = list() -class ComputeList(Resource): + # TODO make this more robust with regex check + if network_str is None: + return nw_list + networks = network_str[1:-1].split('),(') + for nw in networks: + nw_dict = dict(tuple(e.split('=')) for e in nw.split(',')) + nw_list.append(nw_dict) + + return nw_list + + +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 = [] for dc in dcs.itervalues(): @@ -64,28 +144,13 @@ class ComputeList(Resource): else: # return list of compute nodes for specified DC return [(c.name, c.getStatus()) - for c in dcs.get(dc_label).listCompute()], 200 + for c in dcs.get(dc_label).listCompute()], 200 except Exception as ex: logging.exception("API error.") return ex.message, 500 -class ComputeStatus(Resource): - - global dcs - - def get(self, dc_label, compute_name): - - logging.debug("API CALL: compute list") - - try: - return dcs.get(dc_label).containers.get(compute_name).getStatus(), 200 - except Exception as ex: - logging.exception("API error.") - return ex.message, 500 - class DatacenterList(Resource): - global dcs def get(self): @@ -96,8 +161,8 @@ class DatacenterList(Resource): logging.exception("API error.") return ex.message, 500 -class DatacenterStatus(Resource): +class DatacenterStatus(Resource): global dcs def get(self, dc_label):