Deprecate referring to ports by name in ovs-ofctl.

This is a necessary step toward supporting full 32-bit OF1.1+ port numbers
in a later version of OVS.

Signed-off-by: Ben Pfaff <blp@nicira.com>
Acked-by: Ethan Jackson <ethan@nicira.com>

diff --git a/NEWS b/NEWS
index 38e512976819caa8c92b7f96ca6b6abf76ba583e..29fd9f37dd335fcb0bef5d03681339f99656ffca 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -28,12 +28,13 @@ post-v1.8.0
       program was not included in distribution packaging.)
     - ovsdb-server now enforces the immutability of immutable columns.  This
       was not enforced in earlier versions due to an oversight.
-    - Stable bond mode is deprecated and will be removed no earlier than
-      February 2013.  Please email dev@openvswitch.org with concerns.
-    - The autopath action is deprecated and will be removed no earlier than
-      February 2013.  Please email dev@openvswitch.org with concerns.
-    - The null interface type is deprecated and will be removed no earlier
-      than February 2013.  Please email dev@openvswitch.org with concerns.
+    - The following features are now deprecated.  They will be removed no
+      earlier than February 2013.  Please email dev@openvswitch.org with
+      concerns.
+        - Stable bond mode.
+        - The autopath action.
+        - Interface type "null".
+        - Numeric values for reserved ports (see "ovs-ofctl" note above).
 
 
 v1.8.0 - xx xxx xxxx

diff --git a/lib/ofp-util.c b/lib/ofp-util.c
index 366dcae0e410d3a278f494131914bec5d889ec84..c78199f78ef780348fe073abe93e7020c98d2860 100644 (file)
--- a/lib/ofp-util.c
+++ b/lib/ofp-util.c
@@ -3569,9 +3569,9 @@ ofputil_port_from_string(const char *s)
 
             ds_init(&s);
             ofputil_format_port(port32, &s);
-            VLOG_WARN("port %u is better referred to as %s, for compatibility "
-                      "with future versions of OpenFlow",
-                      port32, ds_cstr(&s));
+            VLOG_WARN_ONCE("referring to port %s as %u is deprecated for "
+                           "compatibility with future versions of OpenFlow",
+                           ds_cstr(&s), port32);
             ds_destroy(&s);
 
             return port32;