ovn-nb: Add per-port IP addresses to routers.

A router needs one IP address per port, not just one for the whole router.

Reported-by: Gal Sagie <gal.sagie@gmail.com>
Reported-at: http://openvswitch.org/pipermail/dev/2015-July/057242.html
Signed-off-by: Ben Pfaff <blp@nicira.com>

diff --git a/ovn/ovn-nb.ovsschema b/ovn/ovn-nb.ovsschema
index 8fe378aaebaa88e9c19eb90bb94af5bc6b0d0d7d..40bba9782cab5664e5371bcc3ca2c2b1273cab6c 100644 (file)
--- a/ovn/ovn-nb.ovsschema
+++ b/ovn/ovn-nb.ovsschema
@@ -65,7 +65,6 @@
                                            "refType": "weak"},
                                    "min": 0,
                                    "max": "unlimited"}},
-                "ip": {"type": "string"},
                 "default_gw": {"type": {"key": "string", "min": 0, "max": 1}},
                 "external_ids": {
                     "type": {"key": "string", "value": "string",

diff --git a/ovn/ovn-nb.xml b/ovn/ovn-nb.xml
index 266e6a481c3a4e61f215e3b67647320e6f8e0d50..59ec3d204c27d6f864c472024b975cddd0c981d0 100644 (file)
--- a/ovn/ovn-nb.xml
+++ b/ovn/ovn-nb.xml
@@ -281,13 +281,6 @@
       table="Logical_Router_Port"/> or it will automatically be deleted.
     </column>
 
-    <column name="ip">
-      The logical router's own IP address.  The logical router uses this
-      address for ICMP replies (e.g. network unreachable messages) and other
-      traffic that it originates and responds to traffic destined to this
-      address (e.g. ICMP echo requests).
-    </column>
-
     <column name="default_gw">
       IP address to use as default gateway, if any.
     </column>
@@ -316,8 +309,10 @@
     </p>
 
     <column name="network">
-      The IP network and netmask of the network on the router port.  Used for
-      routing.
+      The IP address of the router and the netmask.  For example,
+      <code>192.168.0.1/24</code> indicates that the router's IP address is
+      192.168.0.1 and that packets destined to 192.168.0.<var>x</var> should be
+      routed to this port.
     </column>
 
     <column name="mac">