X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fapi%2Frest%2Fmonitor.py;h=094f122233e92912a911ed305b8a468eaeaf86f7;hb=refs%2Fchanges%2F49%2F6149%2F3;hp=74f7acf279a3bf31bed681b4cc751c49ac34fb59;hpb=e5ed9d18877fae6cf7b42af20bc19595c789568b;p=osm%2Fvim-emu.git diff --git a/src/emuvim/api/rest/monitor.py b/src/emuvim/api/rest/monitor.py index 74f7acf..094f122 100755 --- a/src/emuvim/api/rest/monitor.py +++ b/src/emuvim/api/rest/monitor.py @@ -1,50 +1,43 @@ -""" -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). -""" - -""" -Distributed Cloud Emulator (dcemulator) -Networking and monitoring functions -(c) 2015 by Steven Van Rossem -""" - +# 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, Paderborn University +# 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). +# +# Distributed Cloud Emulator (dcemulator) +# Networking and monitoring functions +# (c) 2015 by Steven Van Rossem import logging -from flask_restful import Resource, reqparse +from flask_restful import Resource from flask import request -import json -logging.basicConfig(level=logging.INFO) +logging.basicConfig() CORS_HEADER = {'Access-Control-Allow-Origin': '*'} net = None - class MonitorInterfaceAction(Resource): """ Monitor the counters of a VNF interface @@ -68,11 +61,13 @@ class MonitorInterfaceAction(Resource): try: if cookie: - c = net.monitor_agent.setup_flow(vnf_name, vnf_interface, metric, cookie) + c = net.monitor_agent.setup_flow( + vnf_name, vnf_interface, metric, cookie) else: - c = net.monitor_agent.setup_metric(vnf_name, vnf_interface, metric) + c = net.monitor_agent.setup_metric( + vnf_name, vnf_interface, metric) # return monitor message response - return str(c), 200, CORS_HEADER + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") return ex.message, 500, CORS_HEADER @@ -90,9 +85,11 @@ class MonitorInterfaceAction(Resource): try: if cookie: - c = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) + c = net.monitor_agent.stop_flow( + vnf_name, vnf_interface, metric, cookie) else: - c = net.monitor_agent.stop_metric(vnf_name, vnf_interface, metric) + c = net.monitor_agent.stop_metric( + vnf_name, vnf_interface, metric) # return monitor message response return str(c), 200, CORS_HEADER except Exception as ex: @@ -123,7 +120,8 @@ class MonitorFlowAction(Resource): cookie = data.get("cookie", 0) try: - c = net.monitor_agent.setup_flow(vnf_name, vnf_interface, metric, cookie) + c = net.monitor_agent.setup_flow( + vnf_name, vnf_interface, metric, cookie) # return monitor message response return str(c), 200, CORS_HEADER except Exception as ex: @@ -142,13 +140,15 @@ class MonitorFlowAction(Resource): cookie = data.get("cookie", 0) try: - c = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) + c = net.monitor_agent.stop_flow( + vnf_name, vnf_interface, metric, cookie) # return monitor message response return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") return ex.message, 500, CORS_HEADER + class MonitorLinkAction(Resource): """ Add or remove flow monitoring on chains between VNFs. @@ -171,7 +171,8 @@ class MonitorLinkAction(Resource): :return: message string indicating if the chain action is succesful or not """ - # the global net is set from the topology file, and connected via connectDCNetwork function in rest_api_endpoint.py + # the global net is set from the topology file, and connected via + # connectDCNetwork function in rest_api_endpoint.py global net def put(self): @@ -199,13 +200,16 @@ class MonitorLinkAction(Resource): # no check if vnfs are really connected to this datacenter... try: - # get URL parameters - data = request.args - #then no data + # check json payload + logging.debug("json: {}".format(request.json)) + logging.debug("args: {}".format(request.args)) + + data = request.json + if data is None: + data = request.args if data is None: data = {} - vnf_src_name = data.get("vnf_src_name") vnf_dst_name = data.get("vnf_dst_name") vnf_src_interface = data.get("vnf_src_interface") @@ -219,7 +223,7 @@ class MonitorLinkAction(Resource): monitor = data.get("monitor") monitor_placement = data.get("monitor_placement") - #first install monitor flow + # first install monitor flow c1 = net.setChain( vnf_src_name, vnf_dst_name, vnf_src_interface=vnf_src_interface, @@ -234,7 +238,7 @@ class MonitorLinkAction(Resource): monitor=monitor, monitor_placement=monitor_placement) - #then export monitor flow + # then export monitor flow metric = data.get("metric") if 'rx' in monitor_placement: vnf_name = vnf_dst_name @@ -245,9 +249,11 @@ class MonitorLinkAction(Resource): c2 = 'command unknown' if command == 'add-flow': - c2 = net.monitor_agent.setup_flow(vnf_name, vnf_interface, metric, cookie) + c2 = net.monitor_agent.setup_flow( + vnf_name, vnf_interface, metric, cookie) elif command == 'del-flows': - c2 = net.monitor_agent.stop_flow(vnf_name, vnf_interface, metric, cookie) + c2 = net.monitor_agent.stop_flow( + vnf_name, vnf_interface, metric, cookie) # return setChain response return (str(c1) + " " + str(c2)), 200, CORS_HEADER @@ -255,6 +261,7 @@ class MonitorLinkAction(Resource): logging.exception("API error.") return ex.message, 500, CORS_HEADER + class MonitorSkewAction(Resource): """ Monitor the counters of a VNF interface @@ -274,13 +281,14 @@ class MonitorSkewAction(Resource): resource_name = data.get("resource_name", 'cpu') try: # configure skewmon - c = net.monitor_agent.update_skewmon(vnf_name, resource_name, action='start') + c = net.monitor_agent.update_skewmon( + vnf_name, resource_name, action='start') # return monitor message response - return str(c), 200 + return str(c), 200, CORS_HEADER except Exception as ex: logging.exception("API error.") - return ex.message, 500 + return ex.message, 500, CORS_HEADER def delete(self): logging.debug("REST CALL: stop monitor skewness") @@ -292,7 +300,8 @@ class MonitorSkewAction(Resource): resource_name = data.get("resource_name", 'cpu') try: # configure skewmon - c = net.monitor_agent.update_skewmon(vnf_name, resource_name, action='stop') + c = net.monitor_agent.update_skewmon( + vnf_name, resource_name, action='stop') # return monitor message response return str(c), 200, CORS_HEADER @@ -300,3 +309,28 @@ class MonitorSkewAction(Resource): logging.exception("API error.") return ex.message, 500, CORS_HEADER + +class MonitorTerminal(Resource): + """ + start a terminal for the selected VNFs + :param vnf_list: list of names of the VNFs to start a terminal from (all VNFs if None) + :return: message string indicating if the monitor action is succesful or not + """ + global net + + def get(self): + # get URL parameters + data = request.args + if data is None: + data = {} + vnf_list = data.get("vnf_list") + logging.debug("REST CALL: start terminal for: {}".format(vnf_list)) + try: + # start terminals + c = net.monitor_agent.term(vnf_list) + + # return monitor message response + return str(c), 200, CORS_HEADER + except Exception as ex: + logging.exception("API error.") + return ex.message, 500, CORS_HEADER