X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Frest%2Fmonitor.py;h=3787887e8cb9bc2ae9f88a8e50c0c8833f9ea391;hb=72f09885db3935e77901c3dee132cb176b927c7b;hp=7af1fbb752a0b7ac65a6d078546cee56b3bd8330;hpb=32343aa68464dc3a3ecf15f0eb91c6a09afb374b;p=osm%2Fvim-emu.git diff --git a/src/emuvim/cli/rest/monitor.py b/src/emuvim/cli/rest/monitor.py index 7af1fbb..3787887 100755 --- a/src/emuvim/cli/rest/monitor.py +++ b/src/emuvim/cli/rest/monitor.py @@ -1,38 +1,36 @@ -""" -Copyright (c) 2015 SONATA-NFV -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). -""" - -from requests import get, put, delete +# 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). +from requests import get, put import pprint import argparse from emuvim.cli import prometheus pp = pprint.PrettyPrinter(indent=4) + class RestApiClient(): def __init__(self): @@ -46,64 +44,58 @@ class RestApiClient(): print("Command not implemented.") def setup_metric(self, args): - vnf_name = self._parse_vnf_name(args.get("vnf_name")) - vnf_interface = self._parse_vnf_interface(args.get("vnf_name")) - response = put("%s/restapi/monitor/interface/%s/%s/%s" % - (args.get("endpoint"), - vnf_name, - vnf_interface, - args.get("metric"))) - pp.pprint(response.json()) + params = self._create_dict( + vnf_name=self._parse_vnf_name(args.get("vnf_name")), + vnf_interface=self._parse_vnf_interface(args.get("vnf_name")), + metric=args.get("metric")) + + url = "{0}/restapi/monitor/interface".format(args.get("endpoint")) + response = put(url, params=params) + pp.pprint(response.text) def stop_metric(self, args): - vnf_name = self._parse_vnf_name(args.get("vnf_name")) - vnf_interface = self._parse_vnf_interface(args.get("vnf_name")) + params = self._create_dict( + vnf_name=self._parse_vnf_name(args.get("vnf_name")), + vnf_interface=self._parse_vnf_interface(args.get("vnf_name")), + metric=args.get("metric")) - response = delete("%s/restapi/monitor/interface/%s/%s/%s" % - (args.get("endpoint"), - vnf_name, - vnf_interface, - args.get("metric"))) - pp.pprint(response.json()) + url = "{0}/restapi/monitor/interface".format(args.get("endpoint")) + response = put(url, params=params) + pp.pprint(response.text) def setup_flow(self, args): - vnf_name = self._parse_vnf_name(args.get("vnf_name")) - vnf_interface = self._parse_vnf_interface(args.get("vnf_name")) - - response = put("%s/restapi/monitor/flow/%s/%s/%s/%s" % - (args.get("endpoint"), - vnf_name, - vnf_interface, - args.get("metric"), - args.get("cookie"))) + params = self._create_dict( + vnf_name=self._parse_vnf_name(args.get("vnf_name")), + vnf_interface=self._parse_vnf_interface(args.get("vnf_name")), + metric=args.get("metric"), + cookie=args.get("cookie")) - pp.pprint(response.json()) + url = "{0}/restapi/monitor/flow".format(args.get("endpoint")) + response = put(url, params=params) + pp.pprint(response.text) def stop_flow(self, args): - vnf_name = self._parse_vnf_name(args.get("vnf_name")) - vnf_interface = self._parse_vnf_interface(args.get("vnf_name")) - - response = delete("%s/restapi/monitor/flow/%s/%s/%s/%s" % - (args.get("endpoint"), - vnf_name, - vnf_interface, - args.get("metric"), - args.get("cookie"))) + params = self._create_dict( + vnf_name=self._parse_vnf_name(args.get("vnf_name")), + vnf_interface=self._parse_vnf_interface(args.get("vnf_name")), + metric=args.get("metric"), + cookie=args.get("cookie")) - pp.pprint(response.json()) + url = "{0}/restapi/monitor/flow".format(args.get("endpoint")) + response = put(url, params=params) + pp.pprint(response.text) def prometheus(self, args): # This functions makes it more user-friendly to create the correct prometheus query # is replaced by the correct uuid of the deployed vnf container vnf_name = self._parse_vnf_name(args.get("vnf_name")) - vnf_interface = self._parse_vnf_interface(args.get("vnf_name")) - dc_label = args.get("datacenter") query = args.get("query") + vnf_status = get("%s/restapi/compute/%s/%s" % - (args.get("endpoint"), - args.get("datacenter"), - vnf_name)).json() + (args.get("endpoint"), + args.get("datacenter"), + vnf_name)).json() uuid = vnf_status['id'] query = query.replace('', uuid) @@ -117,15 +109,20 @@ class RestApiClient(): def _parse_vnf_interface(self, vnf_name_str): try: vnf_interface = vnf_name_str.split(':')[1] - except: + except BaseException: vnf_interface = None return vnf_interface -parser = argparse.ArgumentParser(description='son-emu monitor') + def _create_dict(self, **kwargs): + return kwargs + + +parser = argparse.ArgumentParser(description='son-emu-cli monitor') parser.add_argument( "command", - choices=['setup_metric', 'stop_metric', 'setup_flow', 'stop_flow','prometheus'], + choices=['setup_metric', 'stop_metric', + 'setup_flow', 'stop_flow', 'prometheus'], help="setup/stop a metric/flow to be monitored or query Prometheus") parser.add_argument( "--vnf_name", "-vnf", dest="vnf_name", @@ -145,9 +142,10 @@ parser.add_argument( parser.add_argument( "--endpoint", "-e", dest="endpoint", default="http://127.0.0.1:5001", - help="UUID of the plugin to be manipulated.") + help="REST API endpoint of son-emu (default:http://127.0.0.1:5001)") + def main(argv): args = vars(parser.parse_args(argv)) c = RestApiClient() - c.execute_command(args) \ No newline at end of file + c.execute_command(args)