netdev-vport: Warn users that pmtud is deprecated

This is a complementary patch to the other one I sent out previously.
The purpose of it is to make it more obvious that tunnel pmtud is
deprecated and will be removed soon.

Requested-by: Jesse Gross <jesse@nicira.com>
Signed-off-by: Ansis Atteka <aatteka@nicira.com>

diff --git a/NEWS b/NEWS
index fa0a24971478c147d6ca1d83b0a5367226c1dace..203a66239e3605b0eb6e394c9cbc245c8c3dca07 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -32,7 +32,8 @@ v1.9.0 - xx xxx xxxx
       are true, but because we do not know of any users for this
       feature it seems better on balance to remove it.  (The ovs-pki-cgi
       program was not included in distribution packaging.)
-    - Tunnel Path MTU Discovery default value was set to 'disabled'.
+    - Tunnel Path MTU Discovery default value was set to 'disabled'.  This
+      feature is deprecated and will be removed soon.
     - ovsdb-server now enforces the immutability of immutable columns.  This
       was not enforced in earlier versions due to an oversight.
     - New support for a nonstandard form of GRE that supports a 64-bit key.
@@ -43,6 +44,7 @@ v1.9.0 - xx xxx xxxx
         - The autopath action.
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
+        - Tunnel Path MTU Discovery.
 
 
 v1.8.0 - xx xxx xxxx

diff --git a/debian/changelog b/debian/changelog
index 9ac3d5d00d9852be19ca80e93a55589257e458e0..39673c6499db135942f409f93a9d0bbbb552a87b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -36,6 +36,8 @@ openvswitch (1.9.0-1) unstable; urgency=low
       are true, but because we do not know of any users for this
       feature it seems better on balance to remove it.  (The ovs-pki-cgi
       program was not included in distribution packaging.)
+    - Tunnel Path MTU Discovery default value was set to 'disabled'.  This
+      feature is deprecated and will be removed soon.
     - ovsdb-server now enforces the immutability of immutable columns.  This
       was not enforced in earlier versions due to an oversight.
     - New support for a nonstandard form of GRE that supports a 64-bit key.
@@ -46,6 +48,7 @@ openvswitch (1.9.0-1) unstable; urgency=low
         - The autopath action.
         - Interface type "null".
         - Numeric values for reserved ports (see "ovs-ofctl" note above).
+        - Tunnel Path MTU Discovery.
 
  -- Open vSwitch team <dev@openvswitch.org>  Wed, 24 Oct 2012 16:10:39 -0700
 

diff --git a/lib/netdev-vport.c b/lib/netdev-vport.c
index 41689596377ef29150465170a8170cccd77fc02e..ee9cb0426a318ea31333efa6c71124b30350c166 100644 (file)
--- a/lib/netdev-vport.c
+++ b/lib/netdev-vport.c
@@ -648,6 +648,10 @@ parse_tunnel_config(const char *name, const char *type,
             }
         } else if (!strcmp(node->key, "pmtud")) {
             if (!strcmp(node->value, "true")) {
+                VLOG_WARN_ONCE("%s: The tunnel Path MTU discovery is "
+                               "deprecated and may be removed in February "
+                               "2013. Please email dev@openvswitch.org with "
+                               "concerns.", name);
                 flags |= TNL_F_PMTUD;
             }
         } else if (!strcmp(node->key, "header_cache")) {

diff --git a/utilities/ovs-save b/utilities/ovs-save
index 01e57914e6ff8760ccf89baf357902a60bfd8f30..2f7022138773d272049deb856524715620164c0c 100755 (executable)
--- a/utilities/ovs-save
+++ b/utilities/ovs-save
@@ -199,7 +199,7 @@ save_datapaths () {
             # lookups: hit:0 missed:0 lost:0
             # flows: 0
             # port 0: br1 (internal)
-            # port 2: gre2886795521 (ipsec_gre: key=flow, pmtud=false, remote_ip=172.17.1.1, tos=inherit)
+            # port 2: gre2886795521 (ipsec_gre: key=flow, remote_ip=172.17.1.1, tos=inherit)
             # port 3: gre1 (ipsec_gre: remote_ip=192.168.113.1)
             # port 14: gre2 (gre: remote_ip=192.168.115.1)
             # port 15: gre3 (gre64: remote_ip=192.168.116.1)

diff --git a/vswitchd/vswitch.xml b/vswitchd/vswitch.xml
index 0bc4ccdc86a6c4e56f59f12b35712596e1ea2c61..f486d6afd431c681da33b235d3457812127b3729 100644 (file)
--- a/vswitchd/vswitch.xml
+++ b/vswitchd/vswitch.xml
@@ -1366,7 +1366,8 @@
         of the tunnel headers.  Note that this option causes behavior that is
         typically reserved for routers and therefore is not entirely in
         compliance with the IEEE 802.1D specification for bridges.  Default is
-        disabled; set to <code>true</code> to enable.
+        disabled; set to <code>true</code> to enable.  This feature is
+        deprecated and will be removed soon.
       </column>
 
       <group title="Tunnel Options: gre only">