[PATCH lnst 00/13] Subject: Test IP-in-IP netdevices

[Petr Machata]

Hi,

the goal of this patch set is to provide test coverage to offloading of L3
tunnels, with the emphasis on GRE in particular.

The first patch is a small improvement in how routes are parsed, so that later
on I can ask about IPv6 route flags and have tests about that.

Then there are three patches that introduce support for several netdevices
pertaining to IP-in-IP setups: dummy device, which serves as an underlay anchor
for many tests, and GRE and IPIP netdevices for tunnels themselves.

Finally there's a suite of patches that introduce the tests. First several
context managers for TestLib, and then eight patches, one per test recipe. Each
recipe then holds several actual tests to exercise the feature in a variety of
scenarios.

Regarding the context managers, those allow one to structure netdevice lifetimes
(and other artifacts) in a nicely scoped manner, such as:

        with vrf(sw) as vrf_u, \
             vrf(sw) as vrf_o:

            # Do stuff with the VRFs.
            with dummy(sw, vrf_u) as d, \
                 gre(sw, d, vrf_o,
                     local_ip="1.2.3.4", remote_ip="1.2.3.5") as g:

                # Do stuff with D and G.
                ping_test(...)

            # Here, D and G are gone again, but the VRFs are still around for
            # more tests.

Not all tests map nicely to that paradigm. E.g. often, routes exhibit this
nested lifetime, but sometimes one wants to shuffle a route around mid-operation
to test some corner case. But most of the time, resources tend to have nested
lifetime like this, and there the "with" statement is a natural fit.

Thanks,
Petr

Petr Machata (13):
  HostAPI: Make SlaveMethods.get_routes() IPv6-aware
  Support dummy devices
  Support GRE devices
  Support ipip devices
  recipes: switchdev: TestLib: Add context managers
  recipes: switchdev: Test GRE tunnels
  recipes: switchdev: Test IPIP tunnels
  recipes: switchdev: Test GRE in flat scenario
  recipes: switchdev: Test alien traffic in GRE tunnel
  recipes: switchdev: Test offload flag in IPIP routes
  recipes: switchdev: Test decap-only GRE tunnels
  recipes: switchdev: Test GRE migration
  recipes: switchdev: Test a conflicting tunnel

 lnst/Controller/RecipeParser.py                |   8 +-
 lnst/Controller/Task.py                        |  47 ++++++
 lnst/Slave/NetConfigDevice.py                  |  79 +++++++++-
 lnst/Slave/NetTestSlave.py                     |   3 +-
 recipes/switchdev/TestLib.py                   | 152 +++++++++++++++++++
 recipes/switchdev/ipip-001-gre-hier-basic.py   | 197 +++++++++++++++++++++++++
 recipes/switchdev/ipip-001-gre-hier-basic.xml  |  12 ++
 recipes/switchdev/ipip-002-ipip-hier-basic.py  |  60 ++++++++
 recipes/switchdev/ipip-002-ipip-hier-basic.xml |  57 +++++++
 recipes/switchdev/ipip-003-gre-flat.py         | 134 +++++++++++++++++
 recipes/switchdev/ipip-003-gre-flat.xml        |  12 ++
 recipes/switchdev/ipip-004-gre-traps.py        |  69 +++++++++
 recipes/switchdev/ipip-004-gre-traps.xml       |  12 ++
 recipes/switchdev/ipip-005-offload-flag.py     |  63 ++++++++
 recipes/switchdev/ipip-005-offload-flag.xml    |  12 ++
 recipes/switchdev/ipip-006-gre-decap.py        |  93 ++++++++++++
 recipes/switchdev/ipip-006-gre-decap.xml       | 136 +++++++++++++++++
 recipes/switchdev/ipip-007-gre-migration.py    |  96 ++++++++++++
 recipes/switchdev/ipip-007-gre-migration.xml   |  12 ++
 recipes/switchdev/ipip-008-gre-conflict.py     |  82 ++++++++++
 recipes/switchdev/ipip-008-gre-conflict.xml    |  12 ++
 recipes/switchdev/ipip_common.py               |  72 +++++++++
 recipes/switchdev/ipip_common_topology.xml     |  58 ++++++++
 schema-recipe.rng                              |  24 +++
 24 files changed, 1496 insertions(+), 6 deletions(-)
 create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.py
 create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.xml
 create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.py
 create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.xml
 create mode 100644 recipes/switchdev/ipip-003-gre-flat.py
 create mode 100644 recipes/switchdev/ipip-003-gre-flat.xml
 create mode 100644 recipes/switchdev/ipip-004-gre-traps.py
 create mode 100644 recipes/switchdev/ipip-004-gre-traps.xml
 create mode 100644 recipes/switchdev/ipip-005-offload-flag.py
 create mode 100644 recipes/switchdev/ipip-005-offload-flag.xml
 create mode 100644 recipes/switchdev/ipip-006-gre-decap.py
 create mode 100644 recipes/switchdev/ipip-006-gre-decap.xml
 create mode 100644 recipes/switchdev/ipip-007-gre-migration.py
 create mode 100644 recipes/switchdev/ipip-007-gre-migration.xml
 create mode 100644 recipes/switchdev/ipip-008-gre-conflict.py
 create mode 100644 recipes/switchdev/ipip-008-gre-conflict.xml
 create mode 100644 recipes/switchdev/ipip_common.py
 create mode 100644 recipes/switchdev/ipip_common_topology.xml

-- 
2.4.11

[PATCH lnst 01/13] HostAPI: Make SlaveMethods.get_routes() IPv6-aware

[Petr Machata]

Introduce an as simple as possible regular expression to parse IPv6
routes. This doesn't support parsing of the least significant 32 bits
in IPv4 format.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
Reviewed-by: Yotam Gigi <yotamg(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Reword the subject for clarity

 lnst/Slave/NetTestSlave.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lnst/Slave/NetTestSlave.py b/lnst/Slave/NetTestSlave.py
index a6acb8d..8f2eef3 100644
--- a/lnst/Slave/NetTestSlave.py
+++ b/lnst/Slave/NetTestSlave.py
@@ -766,7 +766,8 @@ class SlaveMethods:
         dc_routes = []
         nh_routes = []
         ip_re = "\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}"
-        prefix_re = "^(" + ip_re + "(?:/\d{1,3})?)"
+        ip6_re =
"(?:(?:[\da-f]{1,4}:)*|:)(?::|(?:[\da-f]{1,4})|(?::[\da-f]{1,4})*)"
+        prefix_re = "^((?:local )?" + "(?:%s|%s)" % (ip_re, ip6_re) +
"(?:/\d{1,3})?)"
 
         # parse directly connected routes
         dc_route_re = prefix_re + " dev (\w+) (.*)"
-- 
2.4.11

[PATCH lnst 02/13] Support dummy devices

[Petr Machata]

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
Reviewed-by: Yotam Gigi <yotamg(a)mellanox.com&gt;
---
 lnst/Controller/Task.py       |  3 +++
 lnst/Slave/NetConfigDevice.py | 14 +++++++++++++-
 schema-recipe.rng             |  8 ++++++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index a5fb0d3..1b18779 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -495,6 +495,9 @@ class HostAPI(object):
 
         return self._add_iface("vxlan", if_id, netns, ip, options, slaves)
 
+    def create_dummy(self, if_id=None, netns=None, ip=None):
+        return self._add_iface("dummy", if_id, netns, ip, {}, [])
+
     def enable_service(self, service):
         return self._m.enable_service(service)
 
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index cadce06..e47d80a 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -249,6 +249,17 @@ class NetConfigDeviceBridge(NetConfigDeviceGeneric):
         self._dev_config["slaves"].remove(slave_id)
         self._add_rm_port("del", slave_id)
 
+class NetConfigDeviceDummy(NetConfigDeviceGeneric):
+    _modulename = ""
+
+    def create(self):
+        dev_name = self._dev_config["name"]
+        exec_cmd("ip link add %s type dummy" % dev_name)
+
+    def destroy(self):
+        dev_name = self._dev_config["name"]
+        exec_cmd("ip link del %s" % dev_name)
+
 class NetConfigDeviceMacvlan(NetConfigDeviceGeneric):
     _modulename = "macvlan"
 
@@ -774,7 +785,8 @@ type_class_mapping = {
     "vti": NetConfigDeviceVti,
     "vti6": NetConfigDeviceVti6,
     "lo": NetConfigDeviceLoopback,
-    "vxlan": NetConfigDeviceVxlan
+    "vxlan": NetConfigDeviceVxlan,
+    "dummy": NetConfigDeviceDummy,
 }
 
 def NetConfigDevice(dev_config, if_manager):
diff --git a/schema-recipe.rng b/schema-recipe.rng
index 1a40a02..1e845bf 100644
--- a/schema-recipe.rng
+++ b/schema-recipe.rng
@@ -140,6 +140,7 @@
                             <ref name="vti6"/>
                             <ref name="lo"/>
                             <ref name="vxlan"/>
+                            <ref name="dummy"/>
                         </choice>
                     </zeroOrMore>
                 </element>
@@ -353,6 +354,13 @@
         </element>
     </define>
 
+    <define name="dummy">
+        <element name="dummy">
+            <attribute name="id"/>
+            <ref name="softdevice"/>
+        </element>
+    </define>
+
     <define name="softdevice">
         <optional>
             <attribute name="netns"/>
-- 
2.4.11

[PATCH lnst 03/13] Support GRE devices

[Petr Machata]

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
Reviewed-by: Yotam Gigi <yotamg(a)mellanox.com&gt;
---
 lnst/Controller/RecipeParser.py |  8 ++++----
 lnst/Controller/Task.py         | 30 ++++++++++++++++++++++++++++++
 lnst/Slave/NetConfigDevice.py   | 35 +++++++++++++++++++++++++++++++++++
 schema-recipe.rng               |  8 ++++++++
 4 files changed, 77 insertions(+), 4 deletions(-)

diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py
index 09233a7..7ecf100 100644
--- a/lnst/Controller/RecipeParser.py
+++ b/lnst/Controller/RecipeParser.py
@@ -188,12 +188,12 @@ class RecipeParser(XmlParser):
             opts = self._process_options(opts_tag)
             if len(opts) > 0:
                 iface["options"] = opts
-        elif iface["type"] in ["vxlan"]:
-            # real_dev of the VXLAN interface
+        elif iface["type"] in ["vxlan", "gre"]:
+            # real_dev of the interface
             slaves_tag = iface_tag.find("slaves")
             if slaves_tag is not  None and len(slaves_tag) > 1:
-                msg = "VXLAN '%s' needs one or no slave definition."\
-                        % iface["id"]
+                msg = "%s '%s' needs one or no slave definition."\
+                        % (iface["type"], iface["id"])
                 raise RecipeError(msg, iface_tag)
 
             if slaves_tag:
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index 1b18779..023e75d 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -495,6 +495,36 @@ class HostAPI(object):
 
         return self._add_iface("vxlan", if_id, netns, ip, options, slaves)
 
+    def create_gre(self, ttl=None, tos=None,
+                   key=None, ikey=None, okey=None,
+                   seq=None, iseq=None, oseq=None,
+                   csum=None, icsum=None, ocsum=None,
+                   ul_iface=None,
+                   local_ip=None, remote_ip=None,
+                   if_id=None, netns=None, ip=None, options={}):
+
+        for v, itag, iv, otag, ov in [(key, "ikey", ikey, "okey",
okey),
+                                      (seq, "iseq", iseq, "oseq",
oseq),
+                                      (csum, "icsum", icsum, "ocsum",
ocsum)]:
+            if v is not None:
+                if iv is not None and iv != v:
+                    raise TaskError("%s is overspecified" % itag)
+                if ov is not None and ov != v:
+                    raise TaskError("%s is overspecified" % otag)
+
+        options.update({"ttl": ttl, "tos": tos,
+                        "key": key, "ikey": ikey, "okey":
okey,
+                        "seq": seq, "iseq": iseq, "oseq":
oseq,
+                        "csum": csum, "icsum": icsum,
"ocsum": ocsum,
+                        "local_ip": local_ip, "remote_ip":
remote_ip})
+
+        if ul_iface is not None:
+            slaves = [ul_iface]
+        else:
+            slaves = []
+
+        return self._add_iface("gre", if_id, netns, ip, options, slaves)
+
     def create_dummy(self, if_id=None, netns=None, ip=None):
         return self._add_iface("dummy", if_id, netns, ip, {}, [])
 
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index e47d80a..90e5126 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -124,6 +124,40 @@ class NetConfigDeviceEth(NetConfigDeviceGeneric):
         exec_cmd("lldptool -i %s -V PFC -T enabled=none" %
config["name"])
         exec_cmd("lldptool -i %s -L adminStatus=disabled" %
config["name"])
 
+class NetConfigDeviceGre(NetConfigDeviceGeneric):
+    _modulename = "gre"
+
+    def create(self):
+        config = self._dev_config
+        dev_name = config["name"]
+        params = []
+
+        slaves = get_slaves(config)
+        if len(slaves) == 1:
+            ul_id = slaves[0]
+            ul_name = self._if_manager.get_mapped_device(ul_id).get_name()
+            params.append(" dev %s" % ul_name)
+
+        for k in ("ttl", "tos", "key", "ikey",
"okey",
+                  "local_ip", "remote_ip"):
+            v = get_option(config, k)
+            if v is not None:
+                flag = {"local_ip": "local",
+                        "remote_ip": "remote"}.get(k, k)
+                params.append(" %s %s" % (flag, v))
+
+        for k in ("seq", "iseq", "oseq",
+                  "csum", "icsum", "ocsum"):
+            v = get_option(config, k)
+            if v is not None and bool_it(v):
+                params.append(" " + k)
+
+        exec_cmd("ip tunnel add name %s mode gre%s"
+                 % (dev_name, "".join(params)))
+
+    def destroy(self):
+        dev_name = self._dev_config["name"]
+        exec_cmd("ip link del %s" % dev_name)
 
 class NetConfigDeviceLoopback(NetConfigDeviceGeneric):
     def configure(self):
@@ -787,6 +821,7 @@ type_class_mapping = {
     "lo": NetConfigDeviceLoopback,
     "vxlan": NetConfigDeviceVxlan,
     "dummy": NetConfigDeviceDummy,
+    "gre": NetConfigDeviceGre,
 }
 
 def NetConfigDevice(dev_config, if_manager):
diff --git a/schema-recipe.rng b/schema-recipe.rng
index 1e845bf..7b856aa 100644
--- a/schema-recipe.rng
+++ b/schema-recipe.rng
@@ -141,6 +141,7 @@
                             <ref name="lo"/>
                             <ref name="vxlan"/>
                             <ref name="dummy"/>
+                            <ref name="gre"/>
                         </choice>
                     </zeroOrMore>
                 </element>
@@ -361,6 +362,13 @@
         </element>
     </define>
 
+    <define name="gre">
+        <element name="gre">
+            <attribute name="id"/>
+            <ref name="softdevice"/>
+        </element>
+    </define>
+
     <define name="softdevice">
         <optional>
             <attribute name="netns"/>
-- 
2.4.11

[PATCH lnst 04/13] Support ipip devices

[Petr Machata]

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
Reviewed-by: Yotam Gigi <yotamg(a)mellanox.com&gt;
---
 lnst/Controller/RecipeParser.py |  2 +-
 lnst/Controller/Task.py         | 14 ++++++++++++++
 lnst/Slave/NetConfigDevice.py   | 30 ++++++++++++++++++++++++++++++
 schema-recipe.rng               |  8 ++++++++
 4 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/lnst/Controller/RecipeParser.py b/lnst/Controller/RecipeParser.py
index 7ecf100..742c144 100644
--- a/lnst/Controller/RecipeParser.py
+++ b/lnst/Controller/RecipeParser.py
@@ -188,7 +188,7 @@ class RecipeParser(XmlParser):
             opts = self._process_options(opts_tag)
             if len(opts) > 0:
                 iface["options"] = opts
-        elif iface["type"] in ["vxlan", "gre"]:
+        elif iface["type"] in ["vxlan", "gre",
"ipip"]:
             # real_dev of the interface
             slaves_tag = iface_tag.find("slaves")
             if slaves_tag is not  None and len(slaves_tag) > 1:
diff --git a/lnst/Controller/Task.py b/lnst/Controller/Task.py
index 023e75d..14bc059 100644
--- a/lnst/Controller/Task.py
+++ b/lnst/Controller/Task.py
@@ -525,6 +525,20 @@ class HostAPI(object):
 
         return self._add_iface("gre", if_id, netns, ip, options, slaves)
 
+    def create_ipip(self, ttl=None, tos=None, ul_iface=None,
+                    local_ip=None, remote_ip=None,
+                    if_id=None, netns=None, ip=None, options={}):
+
+        options.update({"ttl": ttl, "tos": tos,
+                        "local_ip": local_ip, "remote_ip":
remote_ip})
+
+        if ul_iface is not None:
+            slaves = [ul_iface]
+        else:
+            slaves = []
+
+        return self._add_iface("ipip", if_id, netns, ip, options, slaves)
+
     def create_dummy(self, if_id=None, netns=None, ip=None):
         return self._add_iface("dummy", if_id, netns, ip, {}, [])
 
diff --git a/lnst/Slave/NetConfigDevice.py b/lnst/Slave/NetConfigDevice.py
index 90e5126..a3376a7 100644
--- a/lnst/Slave/NetConfigDevice.py
+++ b/lnst/Slave/NetConfigDevice.py
@@ -159,6 +159,35 @@ class NetConfigDeviceGre(NetConfigDeviceGeneric):
         dev_name = self._dev_config["name"]
         exec_cmd("ip link del %s" % dev_name)
 
+class NetConfigDeviceIpIp(NetConfigDeviceGeneric):
+    _modulename = "ipip"
+
+    def create(self):
+        config = self._dev_config
+        dev_name = config["name"]
+        params = []
+
+        slaves = get_slaves(config)
+        if len(slaves) == 1:
+            ul_id = slaves[0]
+            ul_name = self._if_manager.get_mapped_device(ul_id).get_name()
+            params.append(" dev %s" % ul_name)
+
+        v = get_option(config, "local_ip")
+        if v is not None:
+            params.append(" local %s" % v)
+
+        v = get_option(config, "remote_ip")
+        if v is not None:
+            params.append(" remote %s" % v)
+
+        exec_cmd("ip tunnel add name %s mode ipip%s"
+                 % (dev_name, "".join(params)))
+
+    def destroy(self):
+        dev_name = self._dev_config["name"]
+        exec_cmd("ip link del %s" % dev_name)
+
 class NetConfigDeviceLoopback(NetConfigDeviceGeneric):
     def configure(self):
         config = self._dev_config
@@ -822,6 +851,7 @@ type_class_mapping = {
     "vxlan": NetConfigDeviceVxlan,
     "dummy": NetConfigDeviceDummy,
     "gre": NetConfigDeviceGre,
+    "ipip": NetConfigDeviceIpIp,
 }
 
 def NetConfigDevice(dev_config, if_manager):
diff --git a/schema-recipe.rng b/schema-recipe.rng
index 7b856aa..6114437 100644
--- a/schema-recipe.rng
+++ b/schema-recipe.rng
@@ -142,6 +142,7 @@
                             <ref name="vxlan"/>
                             <ref name="dummy"/>
                             <ref name="gre"/>
+                            <ref name="ipip"/>
                         </choice>
                     </zeroOrMore>
                 </element>
@@ -369,6 +370,13 @@
         </element>
     </define>
 
+    <define name="ipip">
+        <element name="ipip">
+            <attribute name="id"/>
+            <ref name="softdevice"/>
+        </element>
+    </define>
+
     <define name="softdevice">
         <optional>
             <attribute name="netns"/>
-- 
2.4.11

[PATCH lnst 05/13] recipes: switchdev: TestLib: Add context managers

[Petr Machata]

This introduces a number of context managers to be used inside Python
"with" statements to get a lexically-scoped resouce lifetimes. The
resources in question are VRF, GRE, IPIP and dummy devices, and routes.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Move the context managers form TestLibIpIp.py to TestLib.py.
    - Add docstrings to context managers

 recipes/switchdev/TestLib.py | 152 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 152 insertions(+)

diff --git a/recipes/switchdev/TestLib.py b/recipes/switchdev/TestLib.py
index b677a8c..f63c683 100644
--- a/recipes/switchdev/TestLib.py
+++ b/recipes/switchdev/TestLib.py
@@ -7,6 +7,7 @@ published by the Free Software Foundation; see COPYING for details.
 __author__ = """
 jiri(a)mellanox.com (Jiri Pirko)
 idosch(a)mellanox.com (Ido Schimmel)
+petrm(a)mellanox.com (Petr Machata)
 """
 
 from time import sleep
@@ -497,3 +498,154 @@ class Qdisc:
 
     def run(self, command):
         self._machine.run(command)
+
+class vrf:
+    """A context manager that creates a VRF on enter, and destroys it on
exit.
+    Returns a string name of the newly-allocated VRF. Use with a ``with``
+    statement::
+
+        with vrf(machine) as v:
+            # Do stuff with v.
+            pass
+    """
+
+    counter = iter(range(1000))
+    def __init__(self, sw):
+        """Args:
+            sw: The machine to create the VRF on.
+        """
+        self._id = self.__class__.counter.next()
+        self._sw = sw
+
+    def _dev(self):
+        return "vrf%d" % self._id
+
+    def __enter__(self):
+        tab = 1000 + self._id
+        self._sw.run("ip l add name %s type vrf table %d" % (self._dev(),
tab))
+        self._sw.run("ip l set dev %s up" % self._dev())
+        return self._dev()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self._sw.run("ip l del dev %s" % self._dev())
+
+class dummy:
+    """A context manager that creates a dummy device on enter, and
destroys it on
+    exit. Returns the dummy device created. Use with a ``with`` statement::
+
+        with dummy(machine) as d:
+            # Do stuff with d.
+            pass
+    """
+
+    def __init__(self, sw, vrf_name=None, **kwargs):
+        """Args:
+            sw: The machine to create the dummy on.
+            vrf_name: (Optional) name of VRF to put this device in.
+            **kwargs: Arbitrary arguments that are passed to sw.create_dummy.
+        """
+        self._sw = sw
+        self._vrf_name = vrf_name
+        self._d_opts = kwargs
+        self._d = None
+
+    def _ulfwdroute(self, op):
+        self._sw.run("ip r %s tab %d 1.2.3.5/32 via %s"
+               % (op, self._vrf_u_tab, ipv4(test_ip(99, 2, []))))
+
+    def __enter__(self):
+        self._d = self._sw.create_dummy(**self._d_opts)
+        if self._vrf_name is not None:
+            self._sw.run("ip l set dev %s master %s"
+                         % (self._d.get_devname(), self._vrf_name))
+        return self._d
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        if self._d is not None:
+            self._d.destroy()
+
+class tunnel:
+    """A base class for context managers that create tunnel devices on
enter, and
+    destroy them on exit. Returns the netdevice created. Use with a ``with``
+    statement::
+
+        with sometunnel(machine, bound) as t:
+            # Do stuff with t.
+            pass
+    """
+
+    def __init__(self, sw, d, vrf_name=None, **kwargs):
+        """Args:
+            sw: The machine to create the tunnel on.
+            d: A bound device of the tunnel. May be ``None``.
+            vrf_name: (Optional) name of VRF to put this device in.
+            **kwargs: Arbitrary arguments that are passed to the function that
+                creates the tunnel in question, as documented at subclasses.
+        """
+        self._sw = sw
+        self._d = d
+        self._vrf_name = vrf_name
+        self._opts = kwargs
+
+        self._dev = None
+
+    def _create(self, ul_iface, ip, opts):
+        raise NotImplementedError()
+
+    def __enter__(self):
+        self._dev = self._create(self._d, self._opts)
+        if self._vrf_name is not None:
+            self._sw.run("ip link set dev %s vrf %s"
+                         % (self._dev.get_devname(), self._vrf_name))
+
+        return self._dev
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        if self._dev is not None:
+            if self._d is not None:
+                self._dev.slave_del(self._d.get_id())
+            self._dev.destroy()
+
+class gre(tunnel):
+    """A context manager that creates a GRE netdevice on enter and
destroys it on
+    exit. See ``tunnel`` for more details. This calls ``Task.create_gre`` to
+    actually create the tunnel."""
+    def _create(self, ul_iface, opts):
+        return self._sw.create_gre(ul_iface=ul_iface, **opts)
+
+class ipip(tunnel):
+    """A context manager that creates an IPIP netdevice on enter and
destroys it on
+    exit. See ``tunnel`` for more details. This calls ``Task.create_ipip`` to
+    actually create the tunnel."""
+    def _create(self, ul_iface, opts):
+        return self._sw.create_ipip(ul_iface=ul_iface, **opts)
+
+class route:
+    """A context manager that inserts a route on enter and removes it on
exit. Use
+    with a ``with`` statement::
+
+        with route(machine, vrf, "192.168.2.0/24 via 192.168.1.1"):
+            # Test that the router behaves as expected.
+            pass
+    """
+
+    def __init__(self, sw, vrf_name, route):
+        """Args:
+            sw: The machine to create the tunnel on.
+            vrf_name: Name of VRF to put this device in. May be ``None``.
+            route: The route to add.
+        """
+        self._sw = sw
+        self._vrf = vrf_name
+        self._route = route
+
+    def do(self, op):
+        vrf_arg = " vrf " + self._vrf if self._vrf is not None else
""
+        self._sw.run("ip route %s%s %s" % (op, vrf_arg, self._route))
+
+    def __enter__(self):
+        self.do("add")
+        return self
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.do("del")
-- 
2.4.11

[PATCH lnst 06/13] recipes: switchdev: Test GRE tunnels

[Petr Machata]

This adds a number of elementary test for GRE tunneling in a
configuration where overlay and underlay are each in a different VRF.
Several lifetime scenarios are tested, as well as several features, e.g.
tunnel keys and checksums.

Along with this test is added a new library ipip_common, with common
code used across a number of IPIP scenarios to be added next.

Also added is an XML library with description of a GRE network that is
likewise used by several scenarios in the IPIP suite.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Rename TestLibIpIp.py to ipip_common.py.
    - Rename ipip-gre-network.xml to ipip_common_topology.xml.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-001-gre-hier-basic.py  | 197 ++++++++++++++++++++++++++
 recipes/switchdev/ipip-001-gre-hier-basic.xml |  12 ++
 recipes/switchdev/ipip_common.py              |  72 ++++++++++
 recipes/switchdev/ipip_common_topology.xml    |  58 ++++++++
 4 files changed, 339 insertions(+)
 create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.py
 create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.xml
 create mode 100644 recipes/switchdev/ipip_common.py
 create mode 100644 recipes/switchdev/ipip_common_topology.xml

diff --git a/recipes/switchdev/ipip-001-gre-hier-basic.py
b/recipes/switchdev/ipip-001-gre-hier-basic.py
new file mode 100644
index 0000000..166c5dc
--- /dev/null
+++ b/recipes/switchdev/ipip-001-gre-hier-basic.py
@@ -0,0 +1,197 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m1_if1.add_nhs_route(ipv6(test_ip(2, 0)), [ipv6(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 1))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    logging.info("=== Hierarchical configuration")
+    with vrf(sw) as vrf_u, \
+         vrf(sw) as vrf_o:
+        connect_host_ifaces(sw, sw_if1, vrf_o, sw_if2, vrf_u)
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf_u, "1.2.3.5")
+
+        with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+             encap_route(m2, vrf_None, 1, "gre1", ip=ipv6):
+            # - Set up encap route before decap route.
+            # - Tear down encap route before decap route.
+            logging.info("--- Eup, Dup, Edown, Ddown")
+            with dummy(sw, vrf_u) as d, \
+                 gre(sw, d, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5") as g, \
+                 encap_route(sw, vrf_o, 2, g, ip=ipv4), \
+                 encap_route(sw, vrf_o, 2, g, ip=ipv6):
+
+                sleep(5)
+                d.set_addresses(["1.2.3.4/32"])
+                sleep(15)
+                ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                          ipv6=True)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+            # - Set up decap route before encap route.
+            # - Tear down decap route before encap route.
+            logging.info("--- Dup, Eup, Ddown, Edown")
+            with dummy(sw, vrf_u, ip=["1.2.3.4/32"]) as d, \
+                 gre(sw, d, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5") as g:
+
+                with encap_route(sw, vrf_o, 2, g, ip=ipv4), \
+                     encap_route(sw, vrf_o, 2, g, ip=ipv6):
+                    sleep(15)
+                    ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                              ipv6=True)
+                    ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+                d.set_addresses([])
+                g.set_addresses([])
+
+            # - Set up two tunnels and test route replacement.
+            logging.info("--- Route replacement")
+            with dummy(sw, vrf_u, ip=["1.2.3.6/32"]) as d1, \
+                 gre(sw, d1, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.6",
+                     remote_ip="1.2.3.7") as g1, \
+                 dummy(sw, vrf_u, ip=["1.2.3.4/32"]) as d2, \
+                 gre(sw, d2, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5") as g2:
+
+                def quick_test(ipv4_fail, ipv6_fail):
+                    sleep(5)
+                    ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g1,
+                              count=25, fail_expected=ipv6_fail, ipv6=True)
+                    ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g1,
+                              count=25, fail_expected=ipv4_fail)
+
+                # Replacing IPv4 route should cause the IPv4 traffic to drop and
+                # not affect the IPv6 one.
+                encap_route(sw, vrf_o, 2, g2, ip=ipv6).do("add")
+                encap_route(sw, vrf_o, 2, g1, ip=ipv4).do("add")
+                quick_test(True, False)
+
+                encap_route(sw, vrf_o, 2, g2, ip=ipv4).do("replace")
+                quick_test(False, False)
+
+                encap_route(sw, vrf_o, 2, g1, ip=ipv4).do("replace")
+                quick_test(True, False)
+
+                encap_route(sw, vrf_o, 2, g2, ip=ipv4).do("replace")
+                quick_test(False, False)
+
+                # And vice versa.
+                encap_route(sw, vrf_o, 2, g1, ip=ipv6).do("replace")
+                quick_test(False, True)
+
+                encap_route(sw, vrf_o, 2, g2, ip=ipv6).do("replace")
+                quick_test(False, False)
+
+                encap_route(sw, vrf_o, 2, g1, ip=ipv6).do("replace")
+                quick_test(False, True)
+
+                encap_route(sw, vrf_o, 2, g2, ip=ipv6).do("replace")
+                quick_test(False, False)
+
+                # Done.
+                encap_route(sw, vrf_o, 2, g2, ip=ipv4).do("del")
+                encap_route(sw, vrf_o, 2, g2, ip=ipv6).do("del")
+
+        with dummy(sw, vrf_u, ip=["1.2.3.4/32"]) as d:
+
+            # - Test with ikey/okey.
+            logging.info("--- ikey/okey")
+            with encap_route(m2, vrf_None, 1, "gre2"), \
+                 gre(sw, d, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5",
+                     ikey=2222, okey=1111) as g, \
+                 encap_route(sw, vrf_o, 2, g):
+
+                sleep(15)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+            # - Slow path: non-inherit TOS.
+            logging.info("--- non-inherit TOS (slow path)")
+            with encap_route(m2, vrf_None, 1, "gre1"), \
+                 gre(sw, d, vrf_o,
+                     tos="0x10",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5") as g, \
+                 encap_route(sw, vrf_o, 2, g):
+
+                sleep(15)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g,
+                          require_fastpath=False)
+
+            # - Slow path: csum-enabled tunnel.
+            logging.info("--- checksum (slow path)")
+            with encap_route(m2, vrf_None, 1, "gre3"), \
+                 gre(sw, d, vrf_o,
+                     tos="inherit",
+                     local_ip="1.2.3.4",
+                     remote_ip="1.2.3.5",
+                     key=3333, csum=True) as g, \
+                 encap_route(sw, vrf_o, 2, g):
+
+                sleep(15)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g,
+                          require_fastpath=False)
+
+        # - Enable two dummy devices in different VRFs with the decap address.
+        #   The driver crashes on tunnel tear-down if it incorrectly assigned
+        #   both decaps to the same tunnel.
+        logging.info("--- the same tunnel local address in two VRFs")
+        with vrf(sw) as vrf3, \
+             dummy(sw, vrf_u) as d, \
+             gre(sw, d, vrf_o,
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g, \
+             encap_route(sw, vrf3, 2, g), \
+             dummy(sw, vrf3) as d3:
+
+            sleep(5)
+            d.set_addresses(["1.2.3.4/32"])
+            d3.set_addresses(["1.2.3.4/32"])
+            sleep(5)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-001-gre-hier-basic.xml
b/recipes/switchdev/ipip-001-gre-hier-basic.xml
new file mode 100644
index 0000000..fce33f1
--- /dev/null
+++ b/recipes/switchdev/ipip-001-gre-hier-basic.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-001-gre-hier-basic.py" />
+</lnstrecipe>
diff --git a/recipes/switchdev/ipip_common.py b/recipes/switchdev/ipip_common.py
new file mode 100644
index 0000000..8d114ad
--- /dev/null
+++ b/recipes/switchdev/ipip_common.py
@@ -0,0 +1,72 @@
+"""
+A helper module for IP-in-IP tests.
+
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import route
+
+def ping_test(tl, m1, sw, addr, m1_if1, gre,
+              require_fastpath=True, fail_expected=False, count=100,
+              ipv6=False):
+    limit = int(0.9 * count)
+    if gre is not None:
+        before_stats = gre.link_stats()["rx_packets"]
+    ping_mod = ctl.get_module("IcmpPing" if not ipv6 else
"Icmp6Ping",
+                                options={
+                                    "addr": addr,
+                                    "count": count,
+                                    "interval": 0.2,
+                                    "iface" : m1_if1.get_devname(),
+                                    "limit_rate": limit,
+                                })
+    m1.run(ping_mod, fail_expected=fail_expected)
+
+    if not fail_expected and gre is not None:
+        after_stats = gre.link_stats()["rx_packets"]
+
+        delta = after_stats - before_stats
+        if require_fastpath and delta > 10:
+            # Allow a few packets of control plane traffic to go through slow
+            # path. All the data plane traffic should go through fast path.
+            tl.custom(sw, "ipip",
+                      "Too many packets (%d) observed at GRE netdevice" %
delta)
+
+def ipv4(test_ip):
+    return test_ip[0]
+
+def ipv6(test_ip):
+    return test_ip[1]
+
+def encap_route(m, vrf, subnet, if_or_name, ip=ipv4, src=None):
+    if type(if_or_name) is str:
+        devname = m.get_interface(if_or_name).get_devname()
+    else:
+        devname = if_or_name.get_devname()
+    if src is not None:
+        srcstr = " src %s" % src
+    else:
+        srcstr = ""
+    return route(m, vrf, "%s dev %s%s" %
+                 (ip(test_ip(subnet, 0)), devname, srcstr))
+
+def test_ip(major, minor, prefix=[24,64]):
+    return ["192.168.%d.%d%s" % (major, minor,
+            "/" + str(prefix[0]) if len(prefix) > 0 else ""),
+            "2002:%d::%d%s" % (major, minor,
+            "/" + str(prefix[1]) if len(prefix) > 1 else "")]
+
+def add_forward_route(m, vrf, remote_ip, via=ipv4(test_ip(99, 2, []))):
+    route(m, vrf, "%s/32 via %s"
+          % (remote_ip, via)).__enter__()
+
+def connect_host_ifaces(sw, if_o, vrf_o, if_u, vrf_u):
+    sw.run("ip l set dev %s master %s" % (if_o.get_devname(), vrf_o))
+    sw.run("ip l set dev %s master %s" % (if_u.get_devname(), vrf_u))
diff --git a/recipes/switchdev/ipip_common_topology.xml
b/recipes/switchdev/ipip_common_topology.xml
new file mode 100644
index 0000000..dc1c307
--- /dev/null
+++ b/recipes/switchdev/ipip_common_topology.xml
@@ -0,0 +1,58 @@
+<network>
+    <host id="machine1">
+        <params/>
+        <interfaces>
+            <eth id="if1" label="A">
+                <addresses>
+                    <address value="{$onet1}.33/24" />
+                    <address value="{$o6net1}::33/64" />
+                </addresses>
+            </eth>
+        </interfaces>
+    </host>
+    <host id="machine2">
+        <params/>
+        <interfaces>
+            <eth id="if1" label="B">
+                <addresses>
+                    <address value="{$unet}.2/24" />
+                </addresses>
+            </eth>
+            <dummy id="d1">
+                <addresses>
+                    <address value="1.2.3.5/32" />
+                    <address value="{$onet2}.33/32" />
+                    <address value="{$o6net2}::33/128" />
+                </addresses>
+            </dummy>
+            <gre id="gre1">
+                <options>
+                    <option name="local_ip" value="1.2.3.5"/>
+                    <option name="remote_ip" value="1.2.3.4"/>
+                </options>
+            </gre>
+            <gre id="gre2">
+                <options>
+                    <option name="local_ip" value="1.2.3.5"/>
+                    <option name="remote_ip" value="1.2.3.4"/>
+                    <option name="ikey" value="1111" />
+                    <option name="okey" value="2222" />
+                </options>
+            </gre>
+            <gre id="gre3">
+                <options>
+                    <option name="local_ip" value="1.2.3.5"/>
+                    <option name="remote_ip" value="1.2.3.4"/>
+                    <option name="key" value="3333" />
+                    <option name="csum" value="True" />
+                </options>
+            </gre>
+        </interfaces>
+    </host>
+    <host id="switch">
+        <interfaces>
+            <eth id="if1" label="A" />
+            <eth id="if2" label="B" />
+        </interfaces>
+    </host>
+</network>
-- 
2.4.11

[PATCH lnst 07/13] recipes: switchdev: Test IPIP tunnels

[Petr Machata]

This is an IPIP (hence IPv4-only) counterpart to the GRE elementary test
for a configuration where overlay and underlay are each in a different
VRF.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-002-ipip-hier-basic.py  | 60 ++++++++++++++++++++++++++
 recipes/switchdev/ipip-002-ipip-hier-basic.xml | 57 ++++++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.py
 create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.xml

diff --git a/recipes/switchdev/ipip-002-ipip-hier-basic.py
b/recipes/switchdev/ipip-002-ipip-hier-basic.py
new file mode 100644
index 0000000..33ca148
--- /dev/null
+++ b/recipes/switchdev/ipip-002-ipip-hier-basic.py
@@ -0,0 +1,60 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, ipip
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 1))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    logging.info("=== Hierarchical configuration")
+    with vrf(sw) as vrf_u, \
+         vrf(sw) as vrf_o:
+        connect_host_ifaces(sw, sw_if1, vrf_o, sw_if2, vrf_u)
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf_u, "1.2.3.5")
+
+        with encap_route(m2, vrf_None, 1, "ipip1", ip=ipv4):
+            # - Set up encap route before decap route.
+            # - Tear down encap route before decap route.
+            logging.info("--- Dup, Eup, Edown, Ddown")
+            with dummy(sw, vrf_u, ip=["1.2.3.4/32"]) as d, \
+                 ipip(sw, d, vrf_o,
+                      tos="inherit",
+                      local_ip="1.2.3.4",
+                      remote_ip="1.2.3.5") as g, \
+                 encap_route(sw, vrf_o, 2, g):
+
+                sleep(15)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-002-ipip-hier-basic.xml
b/recipes/switchdev/ipip-002-ipip-hier-basic.xml
new file mode 100644
index 0000000..fcacbbc
--- /dev/null
+++ b/recipes/switchdev/ipip-002-ipip-hier-basic.xml
@@ -0,0 +1,57 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <network>
+        <host id="machine1">
+            <params/>
+            <interfaces>
+                <eth id="if1" label="A">
+                    <addresses>
+                        <address value="{$onet1}.33/24" />
+                        <address value="{$o6net1}::33/64" />
+                    </addresses>
+                </eth>
+            </interfaces>
+        </host>
+        <host id="machine2">
+            <params/>
+            <interfaces>
+                <eth id="if1" label="B">
+                    <addresses>
+                        <address value="{$unet}.2/24" />
+                    </addresses>
+                </eth>
+                <dummy id="d1">
+                    <addresses>
+                        <address value="1.2.3.5/32" />
+                        <address value="{$onet2}.33/32" />
+                        <address value="{$o6net2}::33/62" />
+                    </addresses>
+                </dummy>
+
+                <ipip id="ipip1">
+                    <addresses>
+                        <address value="{$onet2}.1/32" />
+                    </addresses>
+                    <options>
+                        <option name="local_ip"
value="1.2.3.5"/>
+                        <option name="remote_ip"
value="1.2.3.4"/>
+                    </options>
+                </ipip>
+            </interfaces>
+        </host>
+        <host id="switch">
+            <interfaces>
+                <eth id="if1" label="A" />
+                <eth id="if2" label="B" />
+            </interfaces>
+        </host>
+    </network>
+    <task python="ipip-002-ipip-hier-basic.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 08/13] recipes: switchdev: Test GRE in flat scenario

[Petr Machata]

This adds a test for GRE tunneling in a scenario where overlay and
underlay are in the same VRF. As in the case of ipip-001-gre-hier-basic,
several lifetime scenarios are tested.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-003-gre-flat.py  | 134 ++++++++++++++++++++++++++++++++
 recipes/switchdev/ipip-003-gre-flat.xml |  12 +++
 2 files changed, 146 insertions(+)
 create mode 100644 recipes/switchdev/ipip-003-gre-flat.py
 create mode 100644 recipes/switchdev/ipip-003-gre-flat.xml

diff --git a/recipes/switchdev/ipip-003-gre-flat.py
b/recipes/switchdev/ipip-003-gre-flat.py
new file mode 100644
index 0000000..a24350a
--- /dev/null
+++ b/recipes/switchdev/ipip-003-gre-flat.py
@@ -0,0 +1,134 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m1_if1.add_nhs_route(ipv6(test_ip(2, 0)), [ipv6(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 1))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    logging.info("=== Flat configuration in non-default VRF")
+    with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6), \
+         vrf(sw) as vrf1, \
+         dummy(sw, vrf1, ip=["1.2.3.4/32"]) as d, \
+         gre(sw, None, vrf1,
+             tos="inherit",
+             local_ip="1.2.3.4",
+             remote_ip="1.2.3.5") as g, \
+         encap_route(sw, vrf1, 2, g, ip=ipv4), \
+         encap_route(sw, vrf1, 2, g, ip=ipv6):
+
+        connect_host_ifaces(sw, sw_if1, vrf1, sw_if2, vrf1)
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf1, "1.2.3.5")
+        sleep(20)
+
+        ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                  ipv6=True)
+        ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+    logging.info("=== Flat configuration in default VRF")
+    with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6):
+
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf_None, "1.2.3.5")
+
+        # - Set up encap route before decap route.
+        # - Tear down encap route before decap route.
+        logging.info("--- Eup, Dup, Edown, Ddown")
+        with dummy(sw, vrf_None) as d, \
+             gre(sw, None, vrf_None,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g, \
+             encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+             encap_route(sw, vrf_None, 2, g, ip=ipv6):
+
+            sleep(5)
+            d.set_addresses(["1.2.3.4/32"])
+            sleep(15)
+            ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                      ipv6=True)
+            ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+        # - Set up decap route before encap route.
+        # - Tear down decap route before encap route.
+        logging.info("--- Dup, Eup, Ddown, Edown")
+        with dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d, \
+             gre(sw, None, vrf_None,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g:
+
+            with encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+                 encap_route(sw, vrf_None, 2, g, ip=ipv6):
+                sleep(15)
+                ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                          ipv6=True)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+            d.set_addresses([])
+            g.set_addresses([])
+
+        logging.info("--- Bound device in flat config")
+        with dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d, \
+             gre(sw, d, vrf_None,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g, \
+             encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+             encap_route(sw, vrf_None, 2, g, ip=ipv6):
+                sleep(15)
+                ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                          ipv6=True)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+        logging.info("--- No dummy")
+        with gre(sw, None, vrf_None,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5",
+                 ip=["1.2.3.4/32"]) as g, \
+             encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+             encap_route(sw, vrf_None, 2, g, ip=ipv6):
+
+            sleep(15)
+            ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                      ipv6=True)
+            ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-003-gre-flat.xml
b/recipes/switchdev/ipip-003-gre-flat.xml
new file mode 100644
index 0000000..a6cdb11
--- /dev/null
+++ b/recipes/switchdev/ipip-003-gre-flat.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-003-gre-flat.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 09/13] recipes: switchdev: Test alien traffic in GRE tunnel

[Petr Machata]

Test that traffic that doesn't match offloaded GRE tunnel is still
handled correctly.

- Test that non-GRE traffic (ping) to an offloaded endpoint reaches the
  box and is handled.

- Test that tunnel traffic that doesn't match the offload is seen by the
  slow-path netdevice, so that Linux has a chance to send ICMP
  unreachable responses.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-004-gre-traps.py  | 69 ++++++++++++++++++++++++++++++++
 recipes/switchdev/ipip-004-gre-traps.xml | 12 ++++++
 2 files changed, 81 insertions(+)
 create mode 100644 recipes/switchdev/ipip-004-gre-traps.py
 create mode 100644 recipes/switchdev/ipip-004-gre-traps.xml

diff --git a/recipes/switchdev/ipip-004-gre-traps.py
b/recipes/switchdev/ipip-004-gre-traps.py
new file mode 100644
index 0000000..1d68311
--- /dev/null
+++ b/recipes/switchdev/ipip-004-gre-traps.py
@@ -0,0 +1,69 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 2))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    # Test that non-IPIP traffic gets to slow path.
+    with dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d, \
+         gre(sw, None, vrf_None,
+             tos="inherit",
+             local_ip="1.2.3.4",
+             remote_ip="1.2.3.5") as g, \
+         encap_route(sw, vrf_None, 2, g, ip=ipv4):
+        sleep(15)
+        ping_test(tl, m2, sw, "1.2.3.4", m2_if1, g, count=20)
+
+    # Configure the wrong interface on M2 to test that the traffic gets trapped
+    # to CPU.
+    with encap_route(m2, vrf_None, 1, "gre3"):
+
+        add_forward_route(sw, vrf_None, "1.2.3.5")
+
+        with dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d, \
+             gre(sw, None, vrf_None,
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g:
+            sleep(15)
+
+            before_stats = sw_if2.link_stats()["rx_packets"]
+            ping_test(tl, m2, sw, ipv4(test_ip(1, 33, [])), m2_if1, g,
+                      count=20, fail_expected=True)
+            after_stats = sw_if2.link_stats()["rx_packets"]
+            delta = after_stats - before_stats
+            if delta < 15:
+                tl.custom(sw, "ipip",
+                        "Too few packets (%d) observed in slow path" % delta)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-004-gre-traps.xml
b/recipes/switchdev/ipip-004-gre-traps.xml
new file mode 100644
index 0000000..97ab9e6
--- /dev/null
+++ b/recipes/switchdev/ipip-004-gre-traps.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-004-gre-traps.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 10/13] recipes: switchdev: Test offload flag in IPIP routes

[Petr Machata]

Offloaded encap and decap routes should be marked as such. Test that
they are.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-005-offload-flag.py  | 63 +++++++++++++++++++++++++++++
 recipes/switchdev/ipip-005-offload-flag.xml | 12 ++++++
 2 files changed, 75 insertions(+)
 create mode 100644 recipes/switchdev/ipip-005-offload-flag.py
 create mode 100644 recipes/switchdev/ipip-005-offload-flag.xml

diff --git a/recipes/switchdev/ipip-005-offload-flag.py
b/recipes/switchdev/ipip-005-offload-flag.py
new file mode 100644
index 0000000..fab9d42
--- /dev/null
+++ b/recipes/switchdev/ipip-005-offload-flag.py
@@ -0,0 +1,63 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 2))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    # Test that offloaded routes do have "offload" flag.
+    with dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d:
+        with gre(sw, None, vrf_None,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g, \
+             encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+             encap_route(sw, vrf_None, 2, g, ip=ipv6):
+            sleep(15)
+
+            ulip = test_ip(2, 0, [24, 64])
+            (r4,), _ = sw.get_routes("table 0 %s" % ipv4(ulip))
+            if "offload" not in r4["flags"]:
+                tl.custom(sw, "ipip", "IPv4 encap route not
offloaded")
+
+            (r6,), _ = sw.get_routes("table 0 %s" % ipv6(ulip))
+            if "offload" not in r6["flags"]:
+                tl.custom(sw, "ipip", "IPv6 encap route not
offloaded")
+
+            (dcr4,), _ = sw.get_routes("table local 1.2.3.4")
+            if "offload" not in dcr4["flags"]:
+                tl.custom(sw, "ipip", "IPv4 decap route not
offloaded")
+
+        sleep(5)
+        (dcr4,), _ = sw.get_routes("table local 1.2.3.4")
+        if "offload" in dcr4["flags"]:
+            tl.custom(sw, "ipip", "IPv4 decap still flagged
offloaded")
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-005-offload-flag.xml
b/recipes/switchdev/ipip-005-offload-flag.xml
new file mode 100644
index 0000000..6fafce5
--- /dev/null
+++ b/recipes/switchdev/ipip-005-offload-flag.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-005-offload-flag.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 11/13] recipes: switchdev: Test decap-only GRE tunnels

[Petr Machata]

A decap offload should be added as soon as the tunnel is created and a
decap route is available. Set up an asymmetric topology where pings go
through a decap-only tunnel, and pongs though an alternative route that
doesn't involve tunneling.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-006-gre-decap.py  |  93 +++++++++++++++++++++
 recipes/switchdev/ipip-006-gre-decap.xml | 136 +++++++++++++++++++++++++++++++
 2 files changed, 229 insertions(+)
 create mode 100644 recipes/switchdev/ipip-006-gre-decap.py
 create mode 100644 recipes/switchdev/ipip-006-gre-decap.xml

diff --git a/recipes/switchdev/ipip-006-gre-decap.py
b/recipes/switchdev/ipip-006-gre-decap.py
new file mode 100644
index 0000000..6ea8fe1
--- /dev/null
+++ b/recipes/switchdev/ipip-006-gre-decap.py
@@ -0,0 +1,93 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def refresh_addrs(m, iface):
+    # A device loses IPv6 address when changing VRF, which we normally work
+    # around with doing a reset of the device. But for VLAN devices, reset
+    # removes and recreates them in default VRF. So instead reset the addresses
+    # by hand.
+    m.run("ip a flush dev %s" % iface.get_devname())
+
+    # Down/up cycle to get a new link-local address so that IPv6 neighbor
+    # discovery works.
+    m.run("ip l set dev %s down" % iface.get_devname())
+    m.run("ip l set dev %s up" % iface.get_devname())
+
+    # Now reassign the fixed addresses.
+    for ip, mask in iface.get_ips().get_val():
+        m.run("ip a add dev %s %s/%s" % (iface.get_devname(), ip, mask))
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    (m1_if1_10, m1_if1_20,
+     m2_if1_10, m2_if1_20,
+     sw_if1_10, sw_if1_20,
+     sw_if2_10, sw_if2_20) = ifaces
+
+    m2_if1_10.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+
+    logging.info("=== Decap-only flow in default VRF")
+    with encap_route(m2, vrf_None, 1, "gre1",
+                     ip=ipv4, src=ipv4(test_ip(2, 33, []))), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6), \
+         dummy(sw, vrf_None, ip=["1.2.3.4/32"]) as d, \
+         gre(sw, None, vrf_None,
+             tos="inherit",
+             local_ip="1.2.3.4",
+             remote_ip="1.2.3.5") as g:
+
+        add_forward_route(sw, vrf_None, "1.2.3.5")
+        sleep(15)
+
+        ping_test(tl, m2, sw, ipv6(test_ip(1, 33, [])), m2_if1_10, g, ipv6=True)
+        ping_test(tl, m2, sw, ipv4(test_ip(1, 33, [])), m2_if1_10, g)
+
+    logging.info("=== Decap-only flow in hierarchical configuration")
+    with encap_route(m2, vrf_None, 1, "gre1",
+                     ip=ipv4, src=ipv4(test_ip(2, 33, []))), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6), \
+         vrf(sw) as vrf_u, \
+         vrf(sw) as vrf_o, \
+         dummy(sw, vrf_u, ip=["1.2.3.4/32"]) as d, \
+         gre(sw, d, vrf_o,
+             tos="inherit",
+             local_ip="1.2.3.4",
+             remote_ip="1.2.3.5") as g:
+
+        connect_host_ifaces(sw, sw_if1_10, vrf_o, sw_if2_10, vrf_u)
+        refresh_addrs(sw, sw_if1_10)
+        add_forward_route(sw, vrf_u, "1.2.3.5")
+
+        ping_test(tl, m2, sw, ipv6(test_ip(1, 33, [])), m2_if1_10, g, ipv6=True)
+        ping_test(tl, m2, sw, ipv4(test_ip(1, 33, [])), m2_if1_10, g)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1.10"),
+         ctl.get_host("machine1").get_interface("if1.20"),
+         ctl.get_host("machine2").get_interface("if1.10"),
+         ctl.get_host("machine2").get_interface("if1.20"),
+         ctl.get_host("switch").get_interface("if1.10"),
+         ctl.get_host("switch").get_interface("if1.20"),
+         ctl.get_host("switch").get_interface("if2.10"),
+         ctl.get_host("switch").get_interface("if2.20")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-006-gre-decap.xml
b/recipes/switchdev/ipip-006-gre-decap.xml
new file mode 100644
index 0000000..7a3ad3f
--- /dev/null
+++ b/recipes/switchdev/ipip-006-gre-decap.xml
@@ -0,0 +1,136 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <network>
+        <host id="machine1">
+            <params/>
+            <interfaces>
+                <eth id="if1" label="A" />
+                <vlan id="if1.10">
+                    <options>
+                        <option name="vlan_tci" value="10" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$onet1}.33/24" />
+                        <address value="{$o6net1}::33/64" />
+                    </addresses>
+                </vlan>
+                <vlan id="if1.20">
+                    <options>
+                        <option name="vlan_tci" value="20" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$onet2}.99/24" />
+                        <address value="{$o6net2}::99/64" />
+                    </addresses>
+                </vlan>
+            </interfaces>
+        </host>
+        <host id="machine2">
+            <params/>
+            <interfaces>
+                <eth id="if1" label="B" />
+                <vlan id="if1.10">
+                    <options>
+                        <option name="vlan_tci" value="10" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$unet}.2/24" />
+                    </addresses>
+                </vlan>
+                <vlan id="if1.20">
+                    <options>
+                        <option name="vlan_tci" value="20" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$onet2}.33/32" />
+                        <address value="{$o6net2}::33/64" />
+                    </addresses>
+                </vlan>
+                <dummy id="d1">
+                    <addresses>
+                        <address value="1.2.3.5/32" />
+                    </addresses>
+                </dummy>
+                <gre id="gre1">
+                    <options>
+                        <option name="local_ip"
value="1.2.3.5"/>
+                        <option name="remote_ip"
value="1.2.3.4"/>
+                    </options>
+                </gre>
+            </interfaces>
+        </host>
+        <host id="switch">
+            <interfaces>
+                <eth id="if1" label="A" />
+                <vlan id="if1.10">
+                    <options>
+                        <option name="vlan_tci" value="10" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$onet1}.1/24" />
+                        <address value="{$o6net1}::1/64" />
+                    </addresses>
+                </vlan>
+                <vlan id="if1.20">
+                    <options>
+                        <option name="vlan_tci" value="20" />
+                    </options>
+                    <slaves>
+                        <slave id="if1"/>
+                    </slaves>
+                </vlan>
+
+                <eth id="if2" label="B" />
+                <vlan id="if2.10">
+                    <options>
+                        <option name="vlan_tci" value="10" />
+                    </options>
+                    <slaves>
+                        <slave id="if2"/>
+                    </slaves>
+                    <addresses>
+                        <address value="{$unet}.1/24" />
+                    </addresses>
+                </vlan>
+                <vlan id="if2.20">
+                    <options>
+                        <option name="vlan_tci" value="20" />
+                    </options>
+                    <slaves>
+                        <slave id="if2"/>
+                    </slaves>
+                </vlan>
+
+                <bridge id="br">
+                    <slaves>
+                        <slave id="if1.20"/>
+                        <slave id="if2.20"/>
+                    </slaves>
+                </bridge>
+            </interfaces>
+        </host>
+    </network>
+    <task python="ipip-006-gre-decap.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 12/13] recipes: switchdev: Test GRE migration

[Petr Machata]

- When a bound netdevice of a GRE tunnel is moved to a different VRF,
  the already-existing offload needs to be updated. Test that it is.

- Also test that when a tunnel is created and offloaded, and moves to
  default VRF, that the offload is correctly updated.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-007-gre-migration.py  | 96 ++++++++++++++++++++++++++++
 recipes/switchdev/ipip-007-gre-migration.xml | 12 ++++
 2 files changed, 108 insertions(+)
 create mode 100644 recipes/switchdev/ipip-007-gre-migration.py
 create mode 100644 recipes/switchdev/ipip-007-gre-migration.xml

diff --git a/recipes/switchdev/ipip-007-gre-migration.py
b/recipes/switchdev/ipip-007-gre-migration.py
new file mode 100644
index 0000000..415d14e
--- /dev/null
+++ b/recipes/switchdev/ipip-007-gre-migration.py
@@ -0,0 +1,96 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m1_if1.add_nhs_route(ipv6(test_ip(2, 0)), [ipv6(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 1))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    logging.info("=== UL migration")
+    # - Test underlay migration: create a dummy in one VRF, then offload a
+    #   tunnel and move the dummy to another VRF.
+    logging.info("--- Simple")
+    with vrf(sw) as vrf_u, \
+         vrf(sw) as vrf_o:
+        connect_host_ifaces(sw, sw_if1, vrf_o, sw_if2, vrf_u)
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf_u, "1.2.3.5")
+
+        with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+             encap_route(m2, vrf_None, 1, "gre1", ip=ipv6), \
+             dummy(sw, vrf_o, ip=["1.2.3.4/32"]) as d, \
+             gre(sw, d, vrf_o,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5") as g, \
+             encap_route(sw, vrf_o, 2, g, ip=ipv4), \
+             encap_route(sw, vrf_o, 2, g, ip=ipv6):
+
+            sw.run("ip l set dev %s master %s" % (d.get_devname(), vrf_u))
+
+            sleep(15)
+            ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                    ipv6=True)
+            ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+    logging.info("=== OL migration")
+    with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6):
+
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf_None, "1.2.3.5")
+
+        # N.B. overlay migration to non-default is tested implicitly by many,
+        # many tests as the device is first created in default VRF, and only
+        # then moved to the right VRF. So just test migration back outside.
+        logging.info("--- To default")
+        with vrf(sw) as vrf1, \
+             gre(sw, None, vrf1,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5",
+                 ip=["1.2.3.4/32"]) as g:
+
+            sleep(5)
+            sw.run("ip link set dev %s nomaster" % g.get_devname())
+
+            with encap_route(sw, vrf_None, 2, g, ip=ipv4), \
+                 encap_route(sw, vrf_None, 2, g, ip=ipv6):
+                sleep(15)
+                ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                          ipv6=True)
+                ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-007-gre-migration.xml
b/recipes/switchdev/ipip-007-gre-migration.xml
new file mode 100644
index 0000000..f73ca20
--- /dev/null
+++ b/recipes/switchdev/ipip-007-gre-migration.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-007-gre-migration.py" />
+</lnstrecipe>
-- 
2.4.11

[PATCH lnst 13/13] recipes: switchdev: Test a conflicting tunnel

[Petr Machata]

Several GRE tunnels can share the same local address, provided that
they differ by a tunnel key (or lack thereof) or a remote address (or
lack thereof). Linux handles such situations in a well-defined manner.
Test that the driver deals with such configurations gracefully.

Signed-off-by: Petr Machata <petrm(a)mellanox.com&gt;
---

Notes:
    Changes from v1 to v2:
    
    - Split out this code to patch of its own.
    - Replace manual route handling with add_nhs_route() call

 recipes/switchdev/ipip-008-gre-conflict.py  | 82 +++++++++++++++++++++++++++++
 recipes/switchdev/ipip-008-gre-conflict.xml | 12 +++++
 2 files changed, 94 insertions(+)
 create mode 100644 recipes/switchdev/ipip-008-gre-conflict.py
 create mode 100644 recipes/switchdev/ipip-008-gre-conflict.xml

diff --git a/recipes/switchdev/ipip-008-gre-conflict.py
b/recipes/switchdev/ipip-008-gre-conflict.py
new file mode 100644
index 0000000..78d7de8
--- /dev/null
+++ b/recipes/switchdev/ipip-008-gre-conflict.py
@@ -0,0 +1,82 @@
+"""
+Copyright 2017 Mellanox Technologies. All rights reserved.
+Licensed under the GNU General Public License, version 2 as
+published by the Free Software Foundation; see COPYING for details.
+"""
+
+__author__ = """
+petrm(a)mellanox.com (Petr Machata)
+"""
+
+from lnst.Controller.Task import ctl
+from TestLib import TestLib, vrf, dummy, gre
+from ipip_common import ping_test, encap_route, \
+                        add_forward_route, connect_host_ifaces, \
+                        test_ip, ipv4, ipv6
+from time import sleep
+import logging
+
+def do_task(ctl, hosts, ifaces, aliases):
+    m1, m2, sw = hosts
+    m1_if1, m2_if1, sw_if1, sw_if2 = ifaces
+
+    m1_if1.add_nhs_route(ipv4(test_ip(2, 0)), [ipv4(test_ip(1, 1, []))])
+    m1_if1.add_nhs_route(ipv6(test_ip(2, 0)), [ipv6(test_ip(1, 1, []))])
+    m2_if1.add_nhs_route("1.2.3.4/32", [ipv4(test_ip(99, 1, []))])
+
+    vrf_None = None
+    tl = TestLib(ctl, aliases)
+    sw_if1.reset(ip=test_ip(1, 1))
+    sw_if2.reset(ip=test_ip(99,1))
+
+    # Check the behavior when two tunnels with conflicting local addresses are
+    # used.
+    logging.info("=== Conflict in GRE local endpoint")
+    with encap_route(m2, vrf_None, 1, "gre1", ip=ipv4), \
+         encap_route(m2, vrf_None, 1, "gre1", ip=ipv6), \
+         vrf(sw) as vrf1, \
+         dummy(sw, vrf1, ip=["1.2.3.4/32"]) as d, \
+         gre(sw, None, vrf1,
+             tos="inherit",
+             local_ip="1.2.3.4",
+             remote_ip="1.2.3.5") as g, \
+         encap_route(sw, vrf1, 2, g, ip=ipv4), \
+         encap_route(sw, vrf1, 2, g, ip=ipv6):
+
+        connect_host_ifaces(sw, sw_if1, vrf1, sw_if2, vrf1)
+        sw_if1.reset()
+        sw_if2.reset()
+        add_forward_route(sw, vrf1, "1.2.3.5")
+
+        # Now create another tunnel whose local address conflicts with this one.
+        # The original tunnel should keep working, even if it has to be
+        # temporarily brought to slow path.
+        with gre(sw, None, vrf1,
+                 tos="inherit",
+                 local_ip="1.2.3.4",
+                 remote_ip="1.2.3.5",
+                 key=3333) as g2, \
+             encap_route(sw, vrf1, 4, g2, ip=ipv4), \
+             encap_route(sw, vrf1, 4, g2, ip=ipv6):
+
+            sleep(15)
+            ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                      ipv6=True, require_fastpath=False)
+            ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g,
+                      require_fastpath=False)
+
+        # After the conflicting tunnel is gone, the traffic should again go
+        # through fast path.
+        sleep(15)
+        ping_test(tl, m1, sw, ipv6(test_ip(2, 33, [])), m1_if1, g,
+                  ipv6=True)
+        ping_test(tl, m1, sw, ipv4(test_ip(2, 33, [])), m1_if1, g)
+
+do_task(ctl, [ctl.get_host("machine1"),
+              ctl.get_host("machine2"),
+              ctl.get_host("switch")],
+        [ctl.get_host("machine1").get_interface("if1"),
+         ctl.get_host("machine2").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if1"),
+         ctl.get_host("switch").get_interface("if2")],
+        ctl.get_aliases())
diff --git a/recipes/switchdev/ipip-008-gre-conflict.xml
b/recipes/switchdev/ipip-008-gre-conflict.xml
new file mode 100644
index 0000000..5c95a28
--- /dev/null
+++ b/recipes/switchdev/ipip-008-gre-conflict.xml
@@ -0,0 +1,12 @@
+<lnstrecipe xmlns:xi="http://www.w3.org/2003/XInclude">
+    <xi:include href="default_aliases.xml" />
+    <define>
+        <alias name="onet1" value="192.168.1"/>
+        <alias name="onet2" value="192.168.2"/>
+        <alias name="o6net1" value="2002:1"/>
+        <alias name="o6net2" value="2002:2"/>
+        <alias name="unet" value="192.168.99"/>
+    </define>
+    <xi:include href="ipip_common_topology.xml" />
+    <task python="ipip-008-gre-conflict.py" />
+</lnstrecipe>
-- 
2.4.11

[Ondrej Lichtner]

On Mon, Oct 09, 2017 at 11:59:57PM +0200, Petr Machata wrote:
>  Hi,
>  
>  the goal of this patch set is to provide test coverage to offloading of L3
>  tunnels, with the emphasis on GRE in particular.
>  
>  The first patch is a small improvement in how routes are parsed, so that later
>  on I can ask about IPv6 route flags and have tests about that.
>  
>  Then there are three patches that introduce support for several netdevices
>  pertaining to IP-in-IP setups: dummy device, which serves as an underlay anchor
>  for many tests, and GRE and IPIP netdevices for tunnels themselves.
>  
>  Finally there's a suite of patches that introduce the tests. First several
>  context managers for TestLib, and then eight patches, one per test recipe. Each
>  recipe then holds several actual tests to exercise the feature in a variety of
>  scenarios.
>  
>  Regarding the context managers, those allow one to structure netdevice lifetimes
>  (and other artifacts) in a nicely scoped manner, such as:
>  
>          with vrf(sw) as vrf_u, \
>               vrf(sw) as vrf_o:
>  
>              # Do stuff with the VRFs.
>              with dummy(sw, vrf_u) as d, \
>                   gre(sw, d, vrf_o,
>                       local_ip="1.2.3.4", remote_ip="1.2.3.5") as g:
>  
>                  # Do stuff with D and G.
>                  ping_test(...)
>  
>              # Here, D and G are gone again, but the VRFs are still around for
>              # more tests.
>  
>  Not all tests map nicely to that paradigm. E.g. often, routes exhibit this
>  nested lifetime, but sometimes one wants to shuffle a route around mid-operation
>  to test some corner case. But most of the time, resources tend to have nested
>  lifetime like this, and there the "with" statement is a natural fit.
>  
>  Thanks,
>  Petr
>  
>  Petr Machata (13):
>    HostAPI: Make SlaveMethods.get_routes() IPv6-aware
>    Support dummy devices
>    Support GRE devices
>    Support ipip devices
>    recipes: switchdev: TestLib: Add context managers
>    recipes: switchdev: Test GRE tunnels
>    recipes: switchdev: Test IPIP tunnels
>    recipes: switchdev: Test GRE in flat scenario
>    recipes: switchdev: Test alien traffic in GRE tunnel
>    recipes: switchdev: Test offload flag in IPIP routes
>    recipes: switchdev: Test decap-only GRE tunnels
>    recipes: switchdev: Test GRE migration
>    recipes: switchdev: Test a conflicting tunnel
>  
>   lnst/Controller/RecipeParser.py                |   8 +-
>   lnst/Controller/Task.py                        |  47 ++++++
>   lnst/Slave/NetConfigDevice.py                  |  79 +++++++++-
>   lnst/Slave/NetTestSlave.py                     |   3 +-
>   recipes/switchdev/TestLib.py                   | 152 +++++++++++++++++++
>   recipes/switchdev/ipip-001-gre-hier-basic.py   | 197 +++++++++++++++++++++++++
>   recipes/switchdev/ipip-001-gre-hier-basic.xml  |  12 ++
>   recipes/switchdev/ipip-002-ipip-hier-basic.py  |  60 ++++++++
>   recipes/switchdev/ipip-002-ipip-hier-basic.xml |  57 +++++++
>   recipes/switchdev/ipip-003-gre-flat.py         | 134 +++++++++++++++++
>   recipes/switchdev/ipip-003-gre-flat.xml        |  12 ++
>   recipes/switchdev/ipip-004-gre-traps.py        |  69 +++++++++
>   recipes/switchdev/ipip-004-gre-traps.xml       |  12 ++
>   recipes/switchdev/ipip-005-offload-flag.py     |  63 ++++++++
>   recipes/switchdev/ipip-005-offload-flag.xml    |  12 ++
>   recipes/switchdev/ipip-006-gre-decap.py        |  93 ++++++++++++
>   recipes/switchdev/ipip-006-gre-decap.xml       | 136 +++++++++++++++++
>   recipes/switchdev/ipip-007-gre-migration.py    |  96 ++++++++++++
>   recipes/switchdev/ipip-007-gre-migration.xml   |  12 ++
>   recipes/switchdev/ipip-008-gre-conflict.py     |  82 ++++++++++
>   recipes/switchdev/ipip-008-gre-conflict.xml    |  12 ++
>   recipes/switchdev/ipip_common.py               |  72 +++++++++
>   recipes/switchdev/ipip_common_topology.xml     |  58 ++++++++
>   schema-recipe.rng                              |  24 +++
>   24 files changed, 1496 insertions(+), 6 deletions(-)
>   create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.py
>   create mode 100644 recipes/switchdev/ipip-001-gre-hier-basic.xml
>   create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.py
>   create mode 100644 recipes/switchdev/ipip-002-ipip-hier-basic.xml
>   create mode 100644 recipes/switchdev/ipip-003-gre-flat.py
>   create mode 100644 recipes/switchdev/ipip-003-gre-flat.xml
>   create mode 100644 recipes/switchdev/ipip-004-gre-traps.py
>   create mode 100644 recipes/switchdev/ipip-004-gre-traps.xml
>   create mode 100644 recipes/switchdev/ipip-005-offload-flag.py
>   create mode 100644 recipes/switchdev/ipip-005-offload-flag.xml
>   create mode 100644 recipes/switchdev/ipip-006-gre-decap.py
>   create mode 100644 recipes/switchdev/ipip-006-gre-decap.xml
>   create mode 100644 recipes/switchdev/ipip-007-gre-migration.py
>   create mode 100644 recipes/switchdev/ipip-007-gre-migration.xml
>   create mode 100644 recipes/switchdev/ipip-008-gre-conflict.py
>   create mode 100644 recipes/switchdev/ipip-008-gre-conflict.xml
>   create mode 100644 recipes/switchdev/ipip_common.py
>   create mode 100644 recipes/switchdev/ipip_common_topology.xml
>  
>  -- 
>  2.4.11
>  _______________________________________________
>  LNST-developers mailing list -- lnst-developers(a)lists.fedorahosted.org
>  To unsubscribe send an email to lnst-developers-leave(a)lists.fedorahosted.org 
set applied, thanks

-Ondrej