From 395ed47437010c9852d9d620f491f660a085dbfd Mon Sep 17 00:00:00 2001 From: Zdeno Date: Mon, 18 Apr 2016 16:17:26 +0200 Subject: CSIT-9: COP Whitelist/blacklist - Included are also IPv6 tests - JIRA: CSIT-17 Change-Id: I89ae6c38cdc6742a597c0dc24ed1c033c1b5d155 Signed-off-by: Zdeno --- resources/libraries/python/Cop.py | 68 +++++++++++++++++++++++++++++++++ resources/libraries/python/IPv4Setup.py | 15 ++++++++ resources/libraries/python/IPv4Util.py | 3 -- resources/libraries/python/Routing.py | 22 +++++++++++ 4 files changed, 105 insertions(+), 3 deletions(-) create mode 100644 resources/libraries/python/Cop.py (limited to 'resources/libraries/python') diff --git a/resources/libraries/python/Cop.py b/resources/libraries/python/Cop.py new file mode 100644 index 0000000000..1ff9a992d9 --- /dev/null +++ b/resources/libraries/python/Cop.py @@ -0,0 +1,68 @@ +# Copyright (c) 2016 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: +# +# 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. + +"""COP utilities library.""" + +from resources.libraries.python.VatExecutor import VatTerminal +from resources.libraries.python.topology import Topology + + +class Cop(object): + """COP utilities.""" + + @staticmethod + def cop_add_whitelist_entry(node, interface, ip_format, fib_id): + """Add cop whitelisted entry. + + :param node: Node to add COP whitelist on. + :param interface: Interface of the node where the COP is added. + :param ip_format: IP format : ip4 or ip6 are valid formats. + :param fib_id: Specify the fib table ID. + :type node: dict + :type interface: str + :type ip_format: str + :type fib_id: int + """ + if ip_format not in ('ip4', 'ip6'): + raise ValueError("Ip not in correct format!") + sw_if_index = Topology.get_interface_sw_index(node, interface) + with VatTerminal(node) as vat: + vat.vat_terminal_exec_cmd_from_template('cop_whitelist.vat', + sw_if_index=sw_if_index, + ip=ip_format, + fib_id=fib_id) + + @staticmethod + def cop_interface_enable_or_disable(node, interface, state): + """Enable or disable COP on the interface. + + :param node: Node to add COP whitelist on. + :param interface: Interface of the node where the COP is added. + :param state: disable/enable COP on the interface. + :type node: dict + :type interface: str + :type state: str + """ + state = state.lower() + if state in ('enable', 'disable'): + if state == 'enable': + state = '' + sw_if_index = Topology.get_interface_sw_index(node, interface) + with VatTerminal(node) as vat: + vat.vat_terminal_exec_cmd_from_template('cop_interface.vat', + sw_if_index=sw_if_index, + state=state) + else: + raise ValueError( + "Possible values are 'enable' or 'disable'!" + ) diff --git a/resources/libraries/python/IPv4Setup.py b/resources/libraries/python/IPv4Setup.py index 14179c3105..50154103ec 100644 --- a/resources/libraries/python/IPv4Setup.py +++ b/resources/libraries/python/IPv4Setup.py @@ -314,3 +314,18 @@ class IPv4Setup(object): nodes_addr) mac_address = adj_int['mac_address'] get_node(node).set_arp(interface_name, ip_address, mac_address) + + @staticmethod + def add_arp_on_dut(node, interface, ip_address, mac_address): + """Set ARP cache entree on DUT node. + + :param node: Node in the topology. + :param interface: Interface name of the node. + :param ip_address: IP address of the interface. + :param mac_address: MAC address of the interface. + :type node: dict + :type interface: str + :type ip_address: str + :type mac_address: str + """ + get_node(node).set_arp(interface, ip_address, mac_address) diff --git a/resources/libraries/python/IPv4Util.py b/resources/libraries/python/IPv4Util.py index 31e6bf13f6..5ee73c08fc 100644 --- a/resources/libraries/python/IPv4Util.py +++ b/resources/libraries/python/IPv4Util.py @@ -51,9 +51,6 @@ class IPv4Util(object): get_node(node).set_ip(interface, address, int(prefix_length)) @staticmethod - @keyword('Node "${node}" routes to IPv4 network "${network}" with prefix ' - 'length "${prefix_length}" using interface "${interface}" via ' - '"${gateway}"') def set_route(node, network, prefix_length, interface, gateway): """See IPv4Node.set_route for more information. diff --git a/resources/libraries/python/Routing.py b/resources/libraries/python/Routing.py index 1cbbf6b822..7bb41cbfad 100644 --- a/resources/libraries/python/Routing.py +++ b/resources/libraries/python/Routing.py @@ -42,3 +42,25 @@ class Routing(object): prefix_length=prefix_len, gateway=gateway, sw_if_index=sw_if_index) + + @staticmethod + def add_fib_table(node, network, prefix_len, fib_id, place): + """Create new FIB table according to ID. + + :param node: Node to add FIB on. + :param network: IP address to add to the FIB table. + :param prefix_len: IP address prefix length. + :param fib_id: FIB table ID. + :param place: Possible variants are local, drop. + :type node: dict + :type network: str + :type prefix_len: int + :type fib_id: int + :type place: str + """ + with VatTerminal(node) as vat: + vat.vat_terminal_exec_cmd_from_template('add_fib_table.vat', + network=network, + prefix_length=prefix_len, + fib_number=fib_id, + where=place) -- cgit 1.2.3-korg