-# 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:
:param mac_address: MAC address.
:type mac_address: str
- :return: List representation of MAC address.
+ :returns: List representation of MAC address.
:rtype: list
"""
list_mac = []
:param mac_address: MAC address of interface we are looking for.
:type interfaces_list: dict
:type mac_address: str
- :return: Interface from JSON.
+ :returns: Interface from JSON.
:rtype: dict
"""
interface_dict = {}
:param node: Node dictionary.
:param interface_dump_json: JSON output from dump_interface_list VAT
- command.
+ command.
:type node: dict
:type interface_dump_json: str
"""
interface_dict = VatJsonUtil.get_vpp_interface_by_mac(
interface_list, if_mac)
if not interface_dict:
- raise Exception('Interface {0} not found by MAC {1}'
- .format(ifc, if_mac))
+ logger.trace('Interface {0} not found by MAC {1}'
+ .format(ifc, if_mac))
+ continue
ifc['name'] = interface_dict["interface_name"]
ifc['vpp_sw_index'] = interface_dict["sw_if_index"]
ifc['mtu'] = interface_dict["mtu"]
"""Get sw_if_index from given JSON output by interface name.
:param interface_dump_json: JSON output from dump_interface_list VAT
- command.
+ command.
:param interface_name: Interface name.
:type interface_dump_json: str
:type interface_name: str
- :return: SW interface index.
+ :returns: SW interface index.
:rtype: int
:raises ValueError: If interface not found in interface_dump_json.
"""
"""Get interface name from given JSON output by sw_if_index.
:param interface_dump_json: JSON output from dump_interface_list VAT
- command.
+ command.
:param sw_if_index: SW interface index.
:type interface_dump_json: str
:type sw_if_index: int
- :return: Interface name.
+ :returns: Interface name.
:rtype: str
:raises ValueError: If interface not found in interface_dump_json.
"""
:type err_msg: str
:raises RuntimeError: If VAT command return value is incorrect.
"""
- if type(vat_out) is dict:
+ if isinstance(vat_out, dict):
retval = vat_out.get('retval')
if retval is not None:
if retval != exp_retval: