[PATCH 1/2] regression_tests: ovs-dpdk-pvp use dpdkN names instead of nicN

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

Older ovs versions (e.g. 2.6) use internal DPDK naming of nics instead
of the pci addresses, if a different name is used the configuration
fails.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 recipes/regression_tests/phase3/ovs-dpdk-pvp.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
index c476f7f..1b1f51f 100644
--- a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
+++ b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
@@ -226,8 +226,8 @@ h2.run("driverctl set-override %s vfio-pci" % h2_nic2_pci)
 h2.restart_service("openvswitch")
 
 h2.run("ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev")
-h2.run("ovs-vsctl add-port br0 nic1 -- set interface nic1 type=dpdk
ofport_request=11 options:dpdk-devargs=%s" % h2_nic1_pci)
-h2.run("ovs-vsctl add-port br0 nic2 -- set interface nic2 type=dpdk
ofport_request=12 options:dpdk-devargs=%s" % h2_nic2_pci)
+h2.run("ovs-vsctl add-port br0 dpdk0 -- set interface dpdk0 type=dpdk
ofport_request=11 options:dpdk-devargs=%s" % h2_nic1_pci)
+h2.run("ovs-vsctl add-port br0 dpdk1 -- set interface dpdk1 type=dpdk
ofport_request=12 options:dpdk-devargs=%s" % h2_nic2_pci)
 
 #============================================
 # Host2 configure Guest with vhostuser NICs
@@ -480,8 +480,8 @@ guest.close()
 h2.run("ovs-ofctl del-flows br0")
 h2.run("ovs-vsctl del-port br0 guest_nic2")
 h2.run("ovs-vsctl del-port br0 guest_nic1")
-h2.run("ovs-vsctl del-port br0 nic1")
-h2.run("ovs-vsctl del-port br0 nic2")
+h2.run("ovs-vsctl del-port br0 dpdk0")
+h2.run("ovs-vsctl del-port br0 dpdk1")
 h2.run("ovs-vsctl del-br br0")
 
 h2.run("virsh shutdown %s || true" % guest_virtname)
-- 
2.16.1

[PATCH 2/2] InterfaceManager: fix parsing IFLA_*LINK index

From: Ondrej Lichtner <olichtne(a)redhat.com&gt;

The index of the parent device is accessible through the IFLA_LINK
attribute only for vlan devices, for other device types (vxlan or vti)
the index is accessible through IFLA_INFO_DATA.

Having a correct reference for the parent device is required for correct
ordering of deconfiguration commands.

Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
---
 lnst/Slave/InterfaceManager.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py
index 5c646b4..b7c15d3 100644
--- a/lnst/Slave/InterfaceManager.py
+++ b/lnst/Slave/InterfaceManager.py
@@ -407,7 +407,15 @@ class Device(object):
             self.set_master(nl_msg.get_attr("IFLA_MASTER"), primary=True)
             self._mtu = nl_msg.get_attr("IFLA_MTU")
 
-            link = nl_msg.get_attr("IFLA_LINK")
+            if nl_msg.get_nested("IFLA_LINKINFO", "IFLA_INFO_KIND")
== "vxlan":
+                link = nl_msg.get_nested("IFLA_LINKINFO",
"IFLA_INFO_DATA",
+                                         "IFLA_VXLAN_LINK")
+            elif nl_msg.get_nested("IFLA_LINKINFO", "IFLA_INFO_KIND")
== "vti":
+                link = nl_msg.get_nested("IFLA_LINKINFO",
"IFLA_INFO_DATA",
+                                         "IFLA_VTI_LINK")
+            else:
+                link = nl_msg.get_attr("IFLA_LINK")
+
             if link != None:
                 # IFLA_LINK is an index of device that's closer to physical
                 # interface in the stack, e.g. index of eth0 for eth0.100
-- 
2.16.1

[PATCH 2/2] InterfaceManager: fix parsing IFLA_*LINK index

[Yuval Mintz]

>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  
>  The index of the parent device is accessible through the IFLA_LINK
>  attribute only for vlan devices, for other device types (vxlan or vti)
>  the index is accessible through IFLA_INFO_DATA.
>  
>  Having a correct reference for the parent device is required for correct
>  ordering of deconfiguration commands.
>  
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  
Ondrej, I've tried syncing to the 'master' branch but now my tests are
failing
with the following:

    Traceback (most recent call last):
      File "/usr/lib/python2.7/site-packages/lnst/Slave/NetTestSlave.py", line
1432, in _process_msg
        result = method(*msg["args"])
      File "/usr/lib/python2.7/site-packages/lnst/Slave/NetTestSlave.py", line
82, in hello
        self._if_manager.rescan_devices()
      File "/usr/lib/python2.7/site-packages/lnst/Slave/InterfaceManager.py",
line 116, in rescan_devices
        self._devices[dev['index']].update_netlink(dev['netlink_msg'])
      File "/usr/lib/python2.7/site-packages/lnst/Slave/InterfaceManager.py",
line 415, in update_netlink
        if nl_msg.get_nested("IFLA_LINKINFO", "IFLA_INFO_KIND") ==
"vxlan":
    AttributeError: 'ifinfmsg' object has no attribute 'get_nested'

What's missing?

>  ---
>   lnst/Slave/InterfaceManager.py | 10 +++++++++-
>   1 file changed, 9 insertions(+), 1 deletion(-)
>  
>  diff --git a/lnst/Slave/InterfaceManager.py b/lnst/Slave/InterfaceManager.py
>  index 5c646b4..b7c15d3 100644
>  --- a/lnst/Slave/InterfaceManager.py
>  +++ b/lnst/Slave/InterfaceManager.py
>  @@ -407,7 +407,15 @@ class Device(object):
>               self.set_master(nl_msg.get_attr("IFLA_MASTER"), primary=True)
>               self._mtu = nl_msg.get_attr("IFLA_MTU")
>  
>  -            link = nl_msg.get_attr("IFLA_LINK")
>  +            if nl_msg.get_nested("IFLA_LINKINFO", "IFLA_INFO_KIND")
> ==
>  "vxlan":
>  +                link = nl_msg.get_nested("IFLA_LINKINFO",
> "IFLA_INFO_DATA",
>  +                                         "IFLA_VXLAN_LINK")
>  +            elif nl_msg.get_nested("IFLA_LINKINFO",
> "IFLA_INFO_KIND") == "vti":
>  +                link = nl_msg.get_nested("IFLA_LINKINFO",
> "IFLA_INFO_DATA",
>  +                                         "IFLA_VTI_LINK")
>  +            else:
>  +                link = nl_msg.get_attr("IFLA_LINK")
>  +
>               if link != None:
>                   # IFLA_LINK is an index of device that's closer to physical
>                   # interface in the stack, e.g. index of eth0 for eth0.100
>  --
>  2.16.1
>  _______________________________________________
>  LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
>  To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org
>

[PATCH 2/2] InterfaceManager: fix parsing IFLA_*LINK index

[Ondrej Lichtner]

On Sun, Mar 11, 2018 at 10:53:29AM +0000, Yuval Mintz wrote:
>  > From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  > 
>  > The index of the parent device is accessible through the IFLA_LINK
>  > attribute only for vlan devices, for other device types (vxlan or vti)
>  > the index is accessible through IFLA_INFO_DATA.
>  > 
>  > Having a correct reference for the parent device is required for correct
>  > ordering of deconfiguration commands.
>  > 
>  > Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  
>  Ondrej, I've tried syncing to the 'master' branch but now my tests are
> failing
>  with the following:
>  
>      Traceback (most recent call last):
>        File "/usr/lib/python2.7/site-packages/lnst/Slave/NetTestSlave.py", line
> 1432, in _process_msg
>          result = method(*msg["args"])
>        File "/usr/lib/python2.7/site-packages/lnst/Slave/NetTestSlave.py", line
> 82, in hello
>          self._if_manager.rescan_devices()
>        File "/usr/lib/python2.7/site-packages/lnst/Slave/InterfaceManager.py",
> line 116, in rescan_devices
>          self._devices[dev['index']].update_netlink(dev['netlink_msg'])
>        File "/usr/lib/python2.7/site-packages/lnst/Slave/InterfaceManager.py",
> line 415, in update_netlink
>          if nl_msg.get_nested("IFLA_LINKINFO", "IFLA_INFO_KIND") ==
> "vxlan":
>      AttributeError: 'ifinfmsg' object has no attribute 'get_nested'
>  
>  What's missing? 
You probably need a newer pyroute2 version we've been using
commit 0bea92f68913ad3c007ce113931d528911448faa
for quite some time (it's a commit from 2016, is probably equal to
version 0.4.10) now so I didn't notice that this could be an issue,
sorry for that.

-Ondrej

[Ondrej Lichtner]

On Tue, Mar 06, 2018 at 03:20:22PM +0100, olichtne(a)redhat.com wrote:
>  From: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  
>  Older ovs versions (e.g. 2.6) use internal DPDK naming of nics instead
>  of the pci addresses, if a different name is used the configuration
>  fails.
>  
>  Signed-off-by: Ondrej Lichtner <olichtne(a)redhat.com&gt;
>  ---
>   recipes/regression_tests/phase3/ovs-dpdk-pvp.py | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>  
>  diff --git a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
> b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
>  index c476f7f..1b1f51f 100644
>  --- a/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
>  +++ b/recipes/regression_tests/phase3/ovs-dpdk-pvp.py
>  @@ -226,8 +226,8 @@ h2.run("driverctl set-override %s vfio-pci" % h2_nic2_pci)
>   h2.restart_service("openvswitch")
>   
>   h2.run("ovs-vsctl add-br br0 -- set bridge br0 datapath_type=netdev")
>  -h2.run("ovs-vsctl add-port br0 nic1 -- set interface nic1 type=dpdk
> ofport_request=11 options:dpdk-devargs=%s" % h2_nic1_pci)
>  -h2.run("ovs-vsctl add-port br0 nic2 -- set interface nic2 type=dpdk
> ofport_request=12 options:dpdk-devargs=%s" % h2_nic2_pci)
>  +h2.run("ovs-vsctl add-port br0 dpdk0 -- set interface dpdk0 type=dpdk
> ofport_request=11 options:dpdk-devargs=%s" % h2_nic1_pci)
>  +h2.run("ovs-vsctl add-port br0 dpdk1 -- set interface dpdk1 type=dpdk
> ofport_request=12 options:dpdk-devargs=%s" % h2_nic2_pci)
>   
>   #============================================
>   # Host2 configure Guest with vhostuser NICs
>  @@ -480,8 +480,8 @@ guest.close()
>   h2.run("ovs-ofctl del-flows br0")
>   h2.run("ovs-vsctl del-port br0 guest_nic2")
>   h2.run("ovs-vsctl del-port br0 guest_nic1")
>  -h2.run("ovs-vsctl del-port br0 nic1")
>  -h2.run("ovs-vsctl del-port br0 nic2")
>  +h2.run("ovs-vsctl del-port br0 dpdk0")
>  +h2.run("ovs-vsctl del-port br0 dpdk1")
>   h2.run("ovs-vsctl del-br br0")
>   
>   h2.run("virsh shutdown %s || true" % guest_virtname)
>  -- 
>  2.16.1
>   
Did some extensive testing of both of these patches so I'm also directly
pushing these to master.

-Ondrej