PAPI: Fix PyLint errors

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

diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py
index 0220139..b018bce 100644 (file)
--- a/resources/libraries/python/IPv4Setup.py
+++ b/resources/libraries/python/IPv4Setup.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:
@@ -60,17 +60,19 @@ class IPv4Node(object):
         pass
 
     @abstractmethod
-    def set_route(self, network, prefix_length, gateway, interface):
+    def set_route(self, network, prefix_length, gateway, interface, count=1):
         """Configure IPv4 route.
 
         :param network: Network IPv4 address.
         :param prefix_length: IPv4 prefix length.
         :param gateway: IPv4 address of the gateway.
         :param interface: Interface name.
+        :param count: Number of consecutive routes to add.
         :type network: str
         :type prefix_length: int
         :type gateway: str
         :type interface: str
+        :type route: int
         :returns: nothing
         """
         pass
@@ -97,7 +99,7 @@ class IPv4Node(object):
 
         :param interface: Interface name.
         :type interface: str
-        :return: nothing
+        :returns: nothing
         """
         pass
 
@@ -116,8 +118,8 @@ class IPv4Node(object):
 
 class Tg(IPv4Node):
     """Traffic generator node"""
-    def __init__(self, node_info):
-        super(Tg, self).__init__(node_info)
+
+    # Implicit constructor is inherited.
 
     def _execute(self, cmd):
         """Executes the specified command on TG using SSH.
@@ -146,7 +148,7 @@ class Tg(IPv4Node):
                                                 interface)
         self._sudo_execute(cmd)
 
-    def set_route(self, network, prefix_length, gateway, interface):
+    def set_route(self, network, prefix_length, gateway, interface, count=1):
         netmask = self._get_netmask(prefix_length)
         cmd = 'route add -net {} netmask {} gw {}'.\
             format(network, netmask, gateway)
@@ -177,8 +179,8 @@ class Tg(IPv4Node):
 
 class Dut(IPv4Node):
     """Device under test"""
-    def __init__(self, node_info):
-        super(Dut, self).__init__(node_info)
+
+    # Implicit contructor is inherited.
 
     def get_sw_if_index(self, interface):
         """Get sw_if_index of specified interface from current node.
@@ -202,23 +204,19 @@ class Dut(IPv4Node):
         # TODO: check return value
         VatExecutor.cmd_from_template(self.node_info, script, **args)
 
-    def set_arp(self, iface_key, ip_address, mac_address, vrf=None):
+    def set_arp(self, iface_key, ip_address, mac_address):
         """Set entry in ARP cache.
 
         :param iface_key: Interface key.
         :param ip_address: IP address.
         :param mac_address: MAC address.
-        :param vrf: VRF table ID (Optional).
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
-        :type vrf: int
         """
-        vrf = "vrf {}".format(vrf) if vrf else ''
         self.exec_vat('add_ip_neighbor.vat',
                       sw_if_index=self.get_sw_if_index(iface_key),
-                      ip_address=ip_address, mac_address=mac_address,
-                      vrf=vrf)
+                      ip_address=ip_address, mac_address=mac_address)
 
     def set_ip(self, interface, address, prefix_length):
         self.exec_vat('add_ip_address.vat',
@@ -333,7 +331,7 @@ class IPv4Setup(object):
         interfaces from topology and use them to setup ARP entries.
 
         :param nodes_info: Dictionary containing information on all nodes
-        in topology.
+            in topology.
         :param nodes_addr: Nodes IPv4 addresses.
         :type nodes_info: dict
         :type nodes_addr: dict
@@ -350,18 +348,16 @@ class IPv4Setup(object):
                 get_node(node).set_arp(iface_key, ip_address, mac_address)
 
     @staticmethod
-    def add_arp_on_dut(node, iface_key, ip_address, mac_address, vrf=None):
+    def add_arp_on_dut(node, iface_key, ip_address, mac_address):
         """Set ARP cache entree on DUT node.
 
         :param node: VPP Node in the topology.
         :param iface_key: Interface key.
         :param ip_address: IP address of the interface.
         :param mac_address: MAC address of the interface.
-        :param vrf: VRF table ID (Optional).
         :type node: dict
         :type iface_key: str
         :type ip_address: str
         :type mac_address: str
-        :type vrf: int
         """
-        get_node(node).set_arp(iface_key, ip_address, mac_address, vrf)
+        get_node(node).set_arp(iface_key, ip_address, mac_address)