X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=src%2Femuvim%2Fcli%2Frest%2Fnetwork.py;h=91051dd93220f2a5e696a56248eae695694f338f;hb=4b093f6f432f097030a168ede4078eb243967607;hp=e7687f638bfa20b11384fd4807f92c347a097f5b;hpb=8945ecfc73514b99b6798dfe774263a45df2896d;p=osm%2Fvim-emu.git

diff --git a/src/emuvim/cli/rest/network.py b/src/emuvim/cli/rest/network.py
index e7687f6..91051dd 100755
--- a/src/emuvim/cli/rest/network.py
+++ b/src/emuvim/cli/rest/network.py
@@ -1,8 +1,33 @@
+"""
+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
 import argparse
-import json
 
 pp = pprint.PrettyPrinter(indent=4)
 
@@ -28,13 +53,14 @@ class RestApiClient():
             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=json.dumps(params))
+                       json=params)
         pp.pprint(response.json())
 
     def remove(self, args):
@@ -47,13 +73,14 @@ class RestApiClient():
             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=json.dumps(params))
+                       json=params)
         pp.pprint(response.json())
 
     def _parse_vnf_name(self, vnf_name_str):
@@ -87,23 +114,25 @@ 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="0",
+    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",
     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:5000",
+    default="http://127.0.0.1:5001",
     help="UUID of the plugin to be manipulated.")
 
 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)