diff options
Diffstat (limited to 'resources')
| -rw-r--r-- | resources/libraries/python/VPPUtil.py | 32 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombSetup.py | 15 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/HoneycombUtil.py | 2 | ||||
| -rw-r--r-- | resources/libraries/python/honeycomb/IPv6Management.py | 147 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/honeycomb.robot | 13 | ||||
| -rw-r--r-- | resources/libraries/robot/honeycomb/ipv6_control.robot | 44 | ||||
| -rw-r--r-- | resources/libraries/robot/shared/default.robot | 27 |
7 files changed, 251 insertions, 29 deletions
diff --git a/resources/libraries/python/VPPUtil.py b/resources/libraries/python/VPPUtil.py index da59d1958d..5881d18966 100644 --- a/resources/libraries/python/VPPUtil.py +++ b/resources/libraries/python/VPPUtil.py @@ -46,3 +46,35 @@ class VPPUtil(object): ssh.connect(node) for _, value in def_setting_tb_displayed.items(): ssh.exec_command_sudo('vppctl sh {}'.format(value)) + + @staticmethod + def stop_vpp_service(node): + """Stop VPP service on the specified node. + + :param node: VPP node. + :type node: dict + :raises RuntimeError: If VPP fails to stop. + """ + + ssh = SSH() + ssh.connect(node) + cmd = "service vpp stop" + ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=80) + if int(ret_code) != 0: + raise RuntimeError("VPP service did not shut down gracefully.") + + @staticmethod + def start_vpp_service(node): + """start VPP service on the specified node. + + :param node: VPP node. + :type node: dict + :raises RuntimeError: If VPP fails to start. + """ + + ssh = SSH() + ssh.connect(node) + cmd = "service vpp start" + ret_code, _, _ = ssh.exec_command_sudo(cmd) + if int(ret_code) != 0: + raise RuntimeError("VPP service did not start.") diff --git a/resources/libraries/python/honeycomb/HoneycombSetup.py b/resources/libraries/python/honeycomb/HoneycombSetup.py index 975a36c753..d10a5ccb4e 100644 --- a/resources/libraries/python/honeycomb/HoneycombSetup.py +++ b/resources/libraries/python/honeycomb/HoneycombSetup.py @@ -637,21 +637,6 @@ class HoneycombSetup(object): logger.info("ODL client service stopped.") - @staticmethod - def stop_vpp_service(node): - """Stop VPP service on the specified node. - - :param node: VPP node. - :type node: dict - :raises RuntimeError: If VPP fails to stop. - """ - - ssh = SSH() - ssh.connect(node) - cmd = "service vpp stop" - ret_code, _, _ = ssh.exec_command_sudo(cmd, timeout=80) - if int(ret_code) != 0: - logger.debug("VPP service refused to shut down.") class HoneycombStartupConfig(object): diff --git a/resources/libraries/python/honeycomb/HoneycombUtil.py b/resources/libraries/python/honeycomb/HoneycombUtil.py index 86feb78d94..b7338d3ed8 100644 --- a/resources/libraries/python/honeycomb/HoneycombUtil.py +++ b/resources/libraries/python/honeycomb/HoneycombUtil.py @@ -448,7 +448,7 @@ class HoneycombUtil(object): if not perf: cmd = "cp /tmp/honeycomb.log /scratch/" - ssh.exec_command_sudo(cmd) + ssh.exec_command_sudo(cmd, timeout=60) else: ssh.scp( ".", diff --git a/resources/libraries/python/honeycomb/IPv6Management.py b/resources/libraries/python/honeycomb/IPv6Management.py new file mode 100644 index 0000000000..deec041103 --- /dev/null +++ b/resources/libraries/python/honeycomb/IPv6Management.py @@ -0,0 +1,147 @@ +# Copyright (c) 2017 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. + +"""Keywords used for setup and testing of Honeycomb's control-plane interface +using IPv6. +""" + +from resources.libraries.python.ssh import SSH + + +class IPv6Management(object): + """Utilities for managing IPv6 contol-plane interfaces.""" + + def __init__(self): + pass + + @staticmethod + def get_interface_name_by_mac(node, mac): + """Get the name of an interface using its MAC address. + + :param node: Node in topology. + :param mac: MAC address. + :type node: dict + :type mac: str + :returns: Name of the interface. + :rtype: str + :raises RuntimeError: If no interface is found. + """ + + cmd = " | ".join([ + "fgrep -ls '{0}' /sys/class/net/*/address".format(mac), + "awk -F '/' '{print $5}'" + ]) + + ssh = SSH() + ssh.connect(node) + ret_code, stdout, _ = ssh.exec_command(cmd) + + if ret_code == 0: + return stdout.strip() + else: + raise RuntimeError("No interface found using the specified MAC " + "address.") + + @staticmethod + def clear_interface_configuration(node, interface): + """Remove all configured IP addresses from the specified interface + and set it into down state. + + :param node: Node in topology. + :param interface: Name of an interface on the node. + :type node: dict + :type interface: str + :raises RuntimeError: If the configuration could not be cleared. + """ + + cmd = " && ".join([ + "sudo ip addr flush dev {interface}".format(interface=interface), + "sudo ip link set dev {interface} down".format(interface=interface) + ]) + + ssh = SSH() + ssh.connect(node) + ret_code, _, _ = ssh.exec_command(cmd) + if ret_code != 0: + raise RuntimeError("Could not clear interface configuration.") + + @staticmethod + def set_management_interface_address(node, interface, address, prefix): + """Configure an IP address on the specified interface. + + :param node: Node in topology. + :param interface: Name of an interface on the node. + :param address: IP address to configure. + :param prefix: IP network prefix. + :type node: dict + :type interface: str + :type address: str + :type prefix: int + :raises RuntimeError: If the configuration fails. + """ + + ssh = SSH() + ssh.connect(node) + + # Enable IPv6 for only the specified interface + cmd = "sudo sysctl net.ipv6.conf.{0}.disable_ipv6=0".format(interface) + + ret_code, _, _ = ssh.exec_command(cmd) + if ret_code != 0: + raise RuntimeError("Could not enable IPv6 on interface.") + + # Configure IPv6 address on the interface + cmd = "sudo ip address add {address}/{prefix} dev {interface}".format( + interface=interface, + address=address, + prefix=prefix) + + ret_code, _, _ = ssh.exec_command(cmd) + if ret_code != 0: + raise RuntimeError("Could not configure IP address on interface.") + + # Set the interface up + cmd = "sudo ip link set {interface} up".format(interface=interface) + + ret_code, _, _ = ssh.exec_command(cmd) + if ret_code != 0: + raise RuntimeError("Could not change the interface to 'up' state.") + + @staticmethod + def configure_control_interface_tunnel(node, src_port, dst_ip, dst_port): + """Configure a tunnel on the specified node, tunelling any IPv4 traffic + from one port to the specified address. + + :param node: Node in topology. + :param src_port: Port to tunnel traffic from. + :param dst_ip: IP address to tunnel traffic to. + :param dst_port: Port to tunnel traffic to. + :type node: dict + :type src_port: int + :type dst_ip: str + :type dst_port: int + :raises RuntimeError: If tunnel creation is not successful. + """ + + cmd = "nohup socat TCP4-LISTEN:{src_port},fork,su=nobody " \ + "TCP6:[{dst_ip}]:{dst_port} $@ > " \ + "/tmp/socat.log 2>&1 &".format( + src_port=src_port, + dst_ip=dst_ip, + dst_port=dst_port) + + ssh = SSH() + ssh.connect(node) + ret_code, _, _ = ssh.exec_command_sudo(cmd) + if ret_code != 0: + raise RuntimeError("Could not configure tunnel.") diff --git a/resources/libraries/robot/honeycomb/honeycomb.robot b/resources/libraries/robot/honeycomb/honeycomb.robot index fa5cea7978..cb2e58e2fc 100644 --- a/resources/libraries/robot/honeycomb/honeycomb.robot +++ b/resources/libraries/robot/honeycomb/honeycomb.robot @@ -284,19 +284,6 @@ | | [arguments] | ${node} | ${feature} | | Manage Honeycomb Features | ${node} | ${feature} | disable=${True} -| Stop VPP Service on DUT -| | [Documentation] | Stop the VPP service on the specified node. -| | ... -| | ... | *Arguments:* -| | ... | - node - information about a DUT node. Type: dictionary -| | ... -| | ... | *Example:* -| | ... -| | ... | \| Stop VPP Service on DUT \| ${nodes['DUT1']} \| -| | ... -| | [Arguments] | ${node} -| | Stop VPP Service | ${node} - | Honeycomb Performance Suite Setup Generic | | [Documentation] | Generic test suite setup for Honeycomb performance tests. | | ... | Performs multiple attempts to start Honeycomb+VPP stack. diff --git a/resources/libraries/robot/honeycomb/ipv6_control.robot b/resources/libraries/robot/honeycomb/ipv6_control.robot new file mode 100644 index 0000000000..8e50a31927 --- /dev/null +++ b/resources/libraries/robot/honeycomb/ipv6_control.robot @@ -0,0 +1,44 @@ +# Copyright (c) 2017 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. + +*** Settings *** +| Library | resources.libraries.python.honeycomb.DHCP.DHCPRelayKeywords +| Library | resources.libraries.python.Dhcp.DhcpProxy +| Library | resources.libraries.python.DUTSetup +| Documentation | Keywords used to test Honeycomb DHCP features. + +*** Keywords *** +| Convert data-plane interface to control-plane +| | [Documentation] | Unbinds an interface from VPP and binds it to kernel\ +| | ... | driver specified in topology. +| | ... +| | ... | *Arguments:* +| | ... | - node - Information about a DUT node. Type: dictionary +| | ... | - bd_name - Name of the interface in topology. Type: string +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Convert data-plane interface to control-plane \| ${nodes['DUT1']} \ +| | ... | \| port3 \| +| | ... +| | [Arguments] | ${node} | ${interface} +| | ${new_driver}= | Get Variable Value +| | ... | ${node['interfaces']['${interface}']['driver']} +| | PCI Driver Unbind | ${node} +| | ... | ${node['interfaces']['${interface}']['pci_address']} +| | Run Keyword If | '${new_driver}' == 'None' +| | ... | PCI Driver Bind | ${node} +| | ... | ${node['interfaces']['${interface}']['pci_address']} | virtio-pci +| | ... | ELSE +| | ... | PCI Driver Bind | ${node} +| | ... | ${node['interfaces']['${interface}']['pci_address']} | ${new_driver} diff --git a/resources/libraries/robot/shared/default.robot b/resources/libraries/robot/shared/default.robot index ddf20405fe..250380dcc0 100644 --- a/resources/libraries/robot/shared/default.robot +++ b/resources/libraries/robot/shared/default.robot @@ -25,6 +25,7 @@ | Library | resources.libraries.python.Tap | Library | resources.libraries.python.VppConfigGenerator | Library | resources.libraries.python.VppCounters +| Library | resources.libraries.python.VPPUtil | Library | Collections *** Keywords *** @@ -375,3 +376,29 @@ | | Tear down functional test | | Linux Del Bridge | ${nodes['DUT1']} | ${bid_TAP} | | Clean Up Namespaces | ${nodes['DUT1']} + +| Stop VPP Service on DUT +| | [Documentation] | Stop the VPP service on the specified node. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Stop VPP Service on DUT \| ${nodes['DUT1']} \| +| | ... +| | [Arguments] | ${node} +| | Stop VPP Service | ${node} + +| Start VPP Service on DUT +| | [Documentation] | Start the VPP service on the specified node. +| | ... +| | ... | *Arguments:* +| | ... | - node - information about a DUT node. Type: dictionary +| | ... +| | ... | *Example:* +| | ... +| | ... | \| Start VPP Service on DUT \| ${nodes['DUT1']} \| +| | ... +| | [Arguments] | ${node} +| | Start VPP Service | ${node}
\ No newline at end of file |