X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPv4Setup.py;h=b018bceacf128624bd01a4c38ab948aa5db03f47;hb=5899ac744eb5f722f53151c98e5acfdbdf678d0c;hp=7129e6723149ca882ebdf4eafcc60a710a079f4f;hpb=933f6fd1af59ffede0f1e51ca67b6913fb9a27e8;p=csit.git diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py index 7129e67231..b018bceacf 100644 --- 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. @@ -329,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