X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2Fvim-emu.git;a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Frest%2Fnetwork.py;h=7566f44c6472eb8693b402141aad8cfd7b34cbf7;hp=c6e1dcc9db5b938cb6af21ed829f59820cfc9993;hb=refs%2Fchanges%2F49%2F6149%2F3;hpb=ff6b404f001a0460252a29051bc34c07c91e4cf1 diff --git a/src/emuvim/cli/rest/network.py b/src/emuvim/cli/rest/network.py index c6e1dcc..7566f44 100755 --- a/src/emuvim/cli/rest/network.py +++ b/src/emuvim/cli/rest/network.py @@ -1,37 +1,31 @@ -""" -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 -from tabulate import tabulate -import pprint +# 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 put, delete import argparse -import json -pp = pprint.PrettyPrinter(indent=4) class RestApiClient(): @@ -46,42 +40,38 @@ class RestApiClient(): print("Command not implemented.") def add(self, args): - vnf_src_name = self._parse_vnf_name(args.get("source")) - vnf_dst_name = self._parse_vnf_name(args.get("destination")) - params = self._create_dict( + vnf_src_name=self._parse_vnf_name(args.get("source")), + vnf_dst_name=self._parse_vnf_name(args.get("destination")), vnf_src_interface=self._parse_vnf_interface(args.get("source")), - vnf_dst_interface=self._parse_vnf_interface(args.get("destination")), + vnf_dst_interface=self._parse_vnf_interface( + args.get("destination")), weight=args.get("weight"), match=args.get("match"), bidirectional=args.get("bidirectional"), - cookie=args.get("cookie")) + cookie=args.get("cookie"), + priority=args.get("priority")) - response = put("%s/restapi/network/%s/%s" % - (args.get("endpoint"), - vnf_src_name, - vnf_dst_name), - json=params) - pp.pprint(response.json()) + response = put("{0}/restapi/network".format(args.get("endpoint")), + params=params) + print(self._nice_print(response.text)) def remove(self, args): - vnf_src_name = self._parse_vnf_name(args.get("source")) - vnf_dst_name = self._parse_vnf_name(args.get("destination")) - params = self._create_dict( + vnf_src_name=self._parse_vnf_name(args.get("source")), + vnf_dst_name=self._parse_vnf_name(args.get("destination")), vnf_src_interface=self._parse_vnf_interface(args.get("source")), - vnf_dst_interface=self._parse_vnf_interface(args.get("destination")), + vnf_dst_interface=self._parse_vnf_interface( + args.get("destination")), weight=args.get("weight"), match=args.get("match"), bidirectional=args.get("bidirectional"), - cookie=args.get("cookie")) + cookie=args.get("cookie"), + priority=args.get("priority")) - response = delete("%s/restapi/network/%s/%s" % - (args.get("endpoint"), - vnf_src_name, - vnf_dst_name), - json=params) - pp.pprint(response.json()) + response = delete("{0}/restapi/network".format(args.get("endpoint")), + params=params) + print(self._nice_print(response.text)) def _parse_vnf_name(self, vnf_name_str): vnf_name = vnf_name_str.split(':')[0] @@ -90,7 +80,7 @@ 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 @@ -98,7 +88,15 @@ class RestApiClient(): def _create_dict(self, **kwargs): return kwargs -parser = argparse.ArgumentParser(description='son-emu network') + def _nice_print(self, text): + # some modules seem to return unicode strings where newlines, other + # special characters are escaped + text = str(text).replace('\\n', '\n') + text = str(text).replace('\\"', '"') + return text + + +parser = argparse.ArgumentParser(description='son-emu-cli network') parser.add_argument( "command", choices=['add', 'remove'], @@ -114,23 +112,26 @@ parser.add_argument( help="vnf name of the destination of the chain") parser.add_argument( "--weight", "-w", dest="weight", - help="weight metric to calculate the path") + help="weight edge attribute to calculate the path") +parser.add_argument( + "--priority", "-p", dest="priority", default="1000", + help="priority of flow rule") parser.add_argument( "--match", "-m", dest="match", help="string holding extra matches for the flow entries") parser.add_argument( - "--bidirectional", "-b", dest="bidirectional", - action='store_true', + "--bidirectional", "-b", dest="bidirectional", action='store_true', help="add/remove the flow entries from src to dst and back") parser.add_argument( - "--cookie", "-c", dest="cookie", + "--cookie", "-c", dest="cookie", default="10", help="cookie for this flow, as easy to use identifier (eg. per tenant/service)") 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)