From e3708019f62d303d0c24cd6af5d4a3924bd1a797 Mon Sep 17 00:00:00 2001 From: Alexandru Avadanii Date: Thu, 27 Dec 2018 18:35:36 +0100 Subject: [PDF] Fix link speed for virtual PODs ethtool reports the link speed as 'unknown' for said devices. The only (current) consumer of this information is Fuel's new VPP support, which detects all these interfaces as 'Gigabit', so align our definitions in order to be able to dynamically construct the VPP interface names based on PDF (link speed) + IDF (PCI bus). While at it, add a new j2 macro helper to be used by Fuel installer. Change-Id: Id6a52bbb7b86bbe3db2a81bb91ac378c6876ffc0 Signed-off-by: Alexandru Avadanii --- config/installers/fuel/net_macros.j2 | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'config/installers') diff --git a/config/installers/fuel/net_macros.j2 b/config/installers/fuel/net_macros.j2 index 7ff3166c..a7cf3e57 100644 --- a/config/installers/fuel/net_macros.j2 +++ b/config/installers/fuel/net_macros.j2 @@ -35,3 +35,11 @@ {%- macro interface_str(nic, vlan = 0) -%} {{ nic }}{% if vlan | int > 0 %}.{{ vlan }}{% endif %} {%- endmacro -%} + +{%- macro vpp_interface_str(speed, pci_addr) -%} + {%- set p = pci_addr.replace('.', ':').split(':') -%} + {%- set s = 'GigabitEthernet%d/%d/%d' | format(p[-3] | int(0, 16), + p[-2] | int(0, 16), + p[-1] | int(0, 16)) -%} + {% if '40g' in speed %}Forty{% elif '10g' in speed %}Ten{% endif %}{{ s }} +{%- endmacro -%} -- cgit 1.2.3-korg