-# 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:
:type count: int
:type data_size: int
:type timeout: int
- :return: Number of lost packets.
+ :returns: Number of lost packets.
:rtype: int
"""
ssh = SSH()
cmd = "ping6 -c {c} -s {s} -W {W} {dst}".format(c=count, s=data_size,
W=timeout,
dst=dst_addr)
- (ret_code, stdout, _) = ssh.exec_command(cmd)
+ (_, stdout, _) = ssh.exec_command(cmd)
regex = re.compile(r'(\d+) packets transmitted, (\d+) received')
match = regex.search(stdout)
:type cnt: int
:type size: int
:type timeout: int
- :return: Number of lost packets.
+ :returns: Number of lost packets.
:rtype: int
"""
dst_ip = IPv6Util.get_node_port_ipv6_address(dst_node, port, nodes_ip)
return IPv6Util.ipv6_ping(src_node, dst_ip, cnt, size, timeout)
@staticmethod
- def get_node_port_ipv6_address(node, interface, nodes_addr):
+ def get_node_port_ipv6_address(node, iface_key, nodes_addr):
"""Return IPv6 address of the node port.
:param node: Node in the topology.
- :param interface: Interface name of the node.
+ :param iface_key: Interface key of the node.
:param nodes_addr: Nodes IPv6 addresses.
:type node: dict
- :type interface: str
+ :type iface_key: str
:type nodes_addr: dict
- :return: IPv6 address string.
+ :returns: IPv6 address string.
:rtype: str
"""
+ interface = Topology.get_interface_name(node, iface_key)
for net in nodes_addr.values():
for port in net['ports'].values():
host = port.get('node')
dev = port.get('if')
if host == node['host'] and dev == interface:
- ip = port.get('addr')
- if ip is not None:
- return ip
+ ip_addr = port.get('addr')
+ if ip_addr is not None:
+ return ip_addr
else:
raise Exception(
'Node {n} port {p} IPv6 address is not set'.format(