Add output.xml with only INFO logging leve

[csit.git] / resources / libraries / python / IPv4Util.py

diff --git a/resources/libraries/python/IPv4Util.py b/resources/libraries/python/IPv4Util.py
index 96572f5..c40e391 100644 (file)
--- a/resources/libraries/python/IPv4Util.py
+++ b/resources/libraries/python/IPv4Util.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2018 Cisco and/or its affiliates.
 # 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:
@@ -18,6 +18,7 @@ from robot.api.deco import keyword
 
 from resources.libraries.python.topology import Topology
 from resources.libraries.python.IPv4Setup import get_node
+from resources.libraries.python.VatExecutor import VatTerminal
 from resources.libraries.python.ssh import exec_cmd
 
 
@@ -94,7 +95,7 @@ class IPv4Util(object):
         :type node: dict
         :type port: str
         :type nodes_addr: dict
-        :return: IPv4 prefix length.
+        :returns: IPv4 prefix length.
         :rtype: int
         """
         for net in nodes_addr.values():
@@ -117,7 +118,7 @@ class IPv4Util(object):
         :type node: dict
         :type port: int
         :type nodes_addr: dict
-        :return: IPv4 subnet.
+        :returns: IPv4 subnet.
         :rtype: str
         """
         for net in nodes_addr.values():
@@ -133,9 +134,9 @@ class IPv4Util(object):
     def flush_ip_addresses(port, node):
         """See IPv4Node.flush_ip_addresses for more information.
 
-        :param port:
-        :param node:
-        :return:
+        :param port: FIXME
+        :param node: FIXME
+        :returns: FIXME
         """
         get_node(node).flush_ip_addresses(port)
 
@@ -147,7 +148,7 @@ class IPv4Util(object):
         :param nodes_addr: Available nodes IPv4 addresses.
         :type link: str
         :type nodes_addr: dict
-        :return: Link IPv4 address.
+        :returns: Link IPv4 address.
         :rtype: str
         """
         net = nodes_addr.get(link)
@@ -163,7 +164,7 @@ class IPv4Util(object):
         :param nodes_addr: Available nodes IPv4 addresses.
         :type link: str
         :type nodes_addr: dict
-        :return: Link IPv4 address prefix.
+        :returns: Link IPv4 address prefix.
         :rtype: int
         """
         net = nodes_addr.get(link)
@@ -227,3 +228,13 @@ class IPv4Util(object):
         if ret_code != 0:
             raise RuntimeError("Arp set not successful, reason:{}".
                                format(stderr))
+
+    @staticmethod
+    def vpp_show_ip_table(node):
+        """Get IP FIB table data from a VPP node.
+
+        :param node: VPP node.
+        :type node: dict
+        """
+        with VatTerminal(node, json_param=False) as vat:
+            vat.vat_terminal_exec_cmd_from_template("show_ip_fib.vat")