Thanks, applied.
On Mon, Jun 15, 2015 at 03:33:34PM -0700, Alex Wang wrote: > Acked-by: Alex Wang <[email protected]> > > On Mon, Jun 15, 2015 at 3:28 PM, Ben Pfaff <[email protected]> wrote: > > > The keys in the Chassis table's "gateway_ports" column report the same > > information as the Gateway table's "attached_port" column, so this commit > > removes the latter. > > > > Signed-off-by: Ben Pfaff <[email protected]> > > --- > > ovn/ovn-sb.ovsschema | 3 +-- > > ovn/ovn-sb.xml | 9 ++------- > > 2 files changed, 3 insertions(+), 9 deletions(-) > > > > diff --git a/ovn/ovn-sb.ovsschema b/ovn/ovn-sb.ovsschema > > index a688e76..f255006 100644 > > --- a/ovn/ovn-sb.ovsschema > > +++ b/ovn/ovn-sb.ovsschema > > @@ -26,8 +26,7 @@ > > "max": "unlimited"}}, > > "ip": {"type": "string"}}}, > > "Gateway": { > > - "columns": {"attached_port": {"type": "string"}, > > - "vlan_map": {"type": {"key": {"type": "integer", > > + "columns": {"vlan_map": {"type": {"key": {"type": "integer", > > "minInteger": 0, > > "maxInteger": 4095}, > > "value": {"type": "string"}, > > diff --git a/ovn/ovn-sb.xml b/ovn/ovn-sb.xml > > index fdf59f0..6d74c9f 100644 > > --- a/ovn/ovn-sb.xml > > +++ b/ovn/ovn-sb.xml > > @@ -146,8 +146,8 @@ > > </p> > > > > <column name="gateway_ports"> > > - Maps from the name of a gateway port, which is typically a > > physical > > - port (e.g. <code>eth1</code>) or an Open vSwitch patch port, to a > > <ref > > + Maps from the name of a port attached to the OVN integration > > bridge > > + (typically a physical port or an Open vSwitch patch port) to a > > <ref > > table="Gateway"/> record that describes the details of the > > gatewaying > > function. > > </column> > > @@ -196,11 +196,6 @@ > > Maps from a VLAN ID to a logical port name. Thus, each named > > logical > > port corresponds to one VLAN on the gateway port. > > </column> > > - > > - <column name="attached_port"> > > - The name of the gateway port in the chassis's Open vSwitch > > integration > > - bridge. > > - </column> > > </table> > > > > <table name="Pipeline" title="Logical Network Pipeline"> > > -- > > 2.1.3 > > > > _______________________________________________ > > dev mailing list > > [email protected] > > http://openvswitch.org/mailman/listinfo/dev > > _______________________________________________ dev mailing list [email protected] http://openvswitch.org/mailman/listinfo/dev
