X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Flibraries%2Fpython%2FIPv6Util.py;h=f89d17169baa8bfd09e9abf3c0f886bf0bc9d8b6;hp=437a7c0cbb085496c22294889ce5dd713d4957fd;hb=1469b71f48bb4e397ebaa65fbaf0512be691ec49;hpb=cbd47fbe97945e9dc6584d08cd2266e3a7536a68 diff --git a/resources/libraries/python/IPv6Util.py b/resources/libraries/python/IPv6Util.py index 437a7c0cbb..f89d17169b 100644 --- a/resources/libraries/python/IPv6Util.py +++ b/resources/libraries/python/IPv6Util.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: @@ -37,7 +37,7 @@ class IPv6Util(object): :type count: int :type data_size: int :type timeout: int - :return: Number of lost packets. + :returns: Number of lost packets. :rtype: int """ ssh = SSH() @@ -46,7 +46,7 @@ class IPv6Util(object): 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) @@ -74,7 +74,7 @@ class IPv6Util(object): :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) @@ -90,7 +90,7 @@ class IPv6Util(object): :type node: dict :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) @@ -99,9 +99,9 @@ class IPv6Util(object): 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(